中间人-字段调整

src/views/cuspCode/Intermediator/CuspIntermediator.data.ts

@@ -6,64 +6,59 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '状态(1-启用,0-停用)',
-    align: "center",
-    dataIndex: 'status_dictText'
-  },
-  {
-    title: '编码',
+    title: '编码(code)',
     align: "center",
     dataIndex: 'code'
   },
   {
-    title: '名称',
+    title: '名称(name)',
     align: "center",
     dataIndex: 'name'
   },
   {
-    title: '简称',
+    title: '简称(abbreviation)',
     align: "center",
     dataIndex: 'abbreviation'
   },
   {
-    title: '税号',
+    title: '税号(dutyParagraph)',
     align: "center",
     dataIndex: 'dutyParagraph'
   },
   {
-    title: '法人',
+    title: '法人(legalPerson)',
     align: "center",
     dataIndex: 'legalPerson'
   },
   {
-    title: '联系人',
+    title: '联系人(contacts)',
     align: "center",
     dataIndex: 'contacts'
   },
   {
-    title: '联系电话',
+    title: '联系电话(phone)',
     align: "center",
     dataIndex: 'phone'
   },
   {
-    title: '办公地址',
-    align: "center",
-    dataIndex: 'address'
-  },
-  {
-    title: '邮箱',
-    align: "center",
-    dataIndex: 'email'
-  },
-  {
-    title: '国家',
+    title: '国家(country)',
     align: "center",
     dataIndex: 'country'
   },
   {
-    title: '备注',
-    align: "center",
-    dataIndex: 'notes'
+    title: '状态(status)',
+    key: 'status',
+    dataIndex: 'status',
+    align:"center",
+    customRender:function (t, r, index) {
+      if(t.text==1){
+        return '启用(enable)'
+      }else if(t.text==0){
+        return '停用(disable)'
+      }else{
+        return ''
+      } 
+    }
   },
 ];
 

src/views/cuspCode/Intermediator/CuspIntermediatorList.vue

@@ -6,59 +6,58 @@
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item name="code">
-              <template #label><span title="编码">编码</span></template>
-              <a-input placeholder="请输入编码" v-model:value="queryParam.code" allow-clear ></a-input>
+              <template #label><span title="编码">编码(code)</span></template>
+              <a-input placeholder="请输入" v-model:value="queryParam.code" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="name">
-              <template #label><span title="名称">名称</span></template>
+              <template #label><span title="名称">名称(name)</span></template>
               <a-input placeholder="请输入名称" v-model:value="queryParam.name" allow-clear ></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :lg="6">
-              <a-form-item name="abbreviation">
-                <template #label><span title="简称">简称</span></template>
+              <a-form-item name="abbreviation" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                <template #label><span title="简称">简称(abbreviation)</span></template>
                 <a-input placeholder="请输入简称" v-model:value="queryParam.abbreviation" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
-              <a-form-item name="dutyParagraph">
-                <template #label><span title="税号">税号</span></template>
+              <a-form-item name="dutyParagraph" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                <template #label><span title="税号">税号(dutyParagraph)</span></template>
                 <a-input placeholder="请输入税号" v-model:value="queryParam.dutyParagraph" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
-              <a-form-item name="legalPerson">
-                <template #label><span title="法人">法人</span></template>
-                <a-input placeholder="请输入法人" v-model:value="queryParam.legalPerson" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="contacts">
-                <template #label><span title="联系人">联系人</span></template>
+              <a-form-item name="contacts" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                <template #label><span title="联系人">联系人(contacts)</span></template>
                 <a-input placeholder="请输入联系人" v-model:value="queryParam.contacts" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
-              <a-form-item name="phone">
-                <template #label><span title="联系电话">联系电话</span></template>
+              <a-form-item name="phone" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+                <template #label><span title="联系电话">联系电话(phone)</span></template>
                 <a-input placeholder="请输入联系电话" v-model:value="queryParam.phone" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="country">
-                <template #label><span title="国家">国家</span></template>
-                <a-input placeholder="请输入国家" v-model:value="queryParam.country" allow-clear ></a-input>
+                <template #label><span title="国家">国家(country)</span></template>
+                <JDictSelectTag v-model:value="queryParam.country" placeholder="请选择" dictCode="country" />
               </a-form-item>
             </a-col>
+            <a-col :lg="6">
+               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status" label="状态(status)">
+                  <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="valid_status" stringToNumber/>
+               </a-form-item>
+             </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询(search)</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置(reset)</a-button>
                 <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -70,12 +69,12 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'cuspCode:cusp_intermediator:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'cuspCode:cusp_intermediator:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'cuspCode:cusp_intermediator:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" v-auth="'cuspCode:cusp_intermediator:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
+        <a-button  type="primary" v-auth="'cuspCode:cusp_intermediator:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
+        <!-- <j-upload-button  type="primary" v-auth="'cuspCode:cusp_intermediator:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -90,7 +89,7 @@
           </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -113,6 +112,7 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import CuspIntermediatorModal from './components/CuspIntermediatorModal.vue'
   import { useUserStore } from '/@/store/modules/user';
+  import { JDictSelectTag} from '/@/components/Form';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -128,7 +128,7 @@
       canResize:false,
       useSearchForm: false,
       actionColumn: {
-        width: 120,
+        width: 200,
         fixed: 'right',
       },
       beforeFetch: async (params) => {
@@ -146,15 +146,21 @@
 	  },
   });
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-  const labelCol = reactive({
-    xs:24,
-    sm:4,
-    xl:6,
-    xxl:4
+  const labelCol = ref({
+    xs: { span: 24 },
+    sm: { span: 6 },
+    });
+  const wrapperCol = ref({
+    xs: { span: 24 },
+    sm: { span: 18 },
   });
-  const wrapperCol = reactive({
-    xs: 24,
-    sm: 20,
+  const labelCol1 = ref({
+    xs: { span: 24 },
+    sm: { span: 9 },
+    });
+  const wrapperCol1 = ref({
+    xs: { span: 24 },
+    sm: { span: 15 },
   });
 
   // 高级查询配置
@@ -221,7 +227,7 @@
   function getTableAction(record) {
     return [
       {
-        label: '编辑',
+        label: '编辑(edit)',
         onClick: handleEdit.bind(null, record),
         auth: 'cuspCode:cusp_intermediator:edit'
       },
@@ -234,10 +240,10 @@
   function getDropDownAction(record) {
     return [
       {
-        label: '详情',
+        label: '详情(detail)',
         onClick: handleDetail.bind(null, record),
       }, {
-        label: '删除',
+        label: '删除(delete)',
         popConfirm: {
           title: '是否确认删除',
           confirm: handleDelete.bind(null, record),
@@ -287,11 +293,14 @@
       text-align: center
     }
     .ant-form-item:not(.ant-form-item-with-help){
-      margin-bottom: 16px;
-      height: 32px;
+      margin-bottom: 8px;
+      // height: 32px;
     }
     :deep(.ant-picker),:deep(.ant-input-number){
       width: 100%;
     }
   }
+  /deep/.jeecg-basic-table-form-container .table-page-search-submitButtons{
+    margin-bottom: 2px !important;
+  }
 </style>

src/views/cuspCode/Intermediator/components/CuspIntermediatorForm.vue

@@ -5,65 +5,65 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="CuspIntermediatorForm">
           <a-row>
 						<a-col :span="12">
-							<a-form-item label="状态(1-启用,0-停用)" v-bind="validateInfos.status" id="CuspIntermediatorForm-status" name="status">
-								<j-dict-select-tag v-model:value="formData.status" dictCode="" placeholder="请选择状态(1-启用,0-停用)"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="12">
-							<a-form-item label="编码" v-bind="validateInfos.code" id="CuspIntermediatorForm-code" name="code">
+							<a-form-item label="编码(code)" v-bind="validateInfos.code" id="CuspIntermediatorForm-code" name="code">
 								<a-input v-model:value="formData.code" placeholder="请输入编码" disabled allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="名称" v-bind="validateInfos.name" id="CuspIntermediatorForm-name" name="name">
+							<a-form-item label="名称(name)" v-bind="validateInfos.name" id="CuspIntermediatorForm-name" name="name">
 								<a-input v-model:value="formData.name" placeholder="请输入名称"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="简称" v-bind="validateInfos.abbreviation" id="CuspIntermediatorForm-abbreviation" name="abbreviation">
+							<a-form-item label="简称(abbreviation)" v-bind="validateInfos.abbreviation" id="CuspIntermediatorForm-abbreviation" name="abbreviation">
 								<a-input v-model:value="formData.abbreviation" placeholder="请输入简称"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="税号" v-bind="validateInfos.dutyParagraph" id="CuspIntermediatorForm-dutyParagraph" name="dutyParagraph">
+							<a-form-item label="税号(duty paragraph)" v-bind="validateInfos.dutyParagraph" id="CuspIntermediatorForm-dutyParagraph" name="dutyParagraph">
 								<a-input v-model:value="formData.dutyParagraph" placeholder="请输入税号"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="法人" v-bind="validateInfos.legalPerson" id="CuspIntermediatorForm-legalPerson" name="legalPerson">
+							<a-form-item label="法人(legal person)" v-bind="validateInfos.legalPerson" id="CuspIntermediatorForm-legalPerson" name="legalPerson">
 								<a-input v-model:value="formData.legalPerson" placeholder="请输入法人"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="联系人" v-bind="validateInfos.contacts" id="CuspIntermediatorForm-contacts" name="contacts">
+							<a-form-item label="联系人(contacts)" v-bind="validateInfos.contacts" id="CuspIntermediatorForm-contacts" name="contacts">
 								<a-input v-model:value="formData.contacts" placeholder="请输入联系人"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="联系电话" v-bind="validateInfos.phone" id="CuspIntermediatorForm-phone" name="phone">
+							<a-form-item label="联系电话(phone)" v-bind="validateInfos.phone" id="CuspIntermediatorForm-phone" name="phone">
 								<a-input v-model:value="formData.phone" placeholder="请输入联系电话"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="办公地址" v-bind="validateInfos.address" id="CuspIntermediatorForm-address" name="address">
+							<a-form-item label="办公地址(address)" v-bind="validateInfos.address" id="CuspIntermediatorForm-address" name="address">
 								<a-input v-model:value="formData.address" placeholder="请输入办公地址"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="邮箱" v-bind="validateInfos.email" id="CuspIntermediatorForm-email" name="email">
+							<a-form-item label="邮箱(email)" v-bind="validateInfos.email" id="CuspIntermediatorForm-email" name="email">
 								<a-input v-model:value="formData.email" placeholder="请输入邮箱"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="国家" v-bind="validateInfos.country" id="CuspIntermediatorForm-country" name="country">
-								<a-input v-model:value="formData.country" placeholder="请输入国家"  allow-clear ></a-input>
+							<a-form-item label="国家(country)" v-bind="validateInfos.country" id="CuspIntermediatorForm-country" name="country">
+                <JDictSelectTag v-model:value="formData.country" placeholder="请选择" dictCode="country" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="备注" v-bind="validateInfos.notes" id="CuspIntermediatorForm-notes" name="notes">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="CuspIntermediatorForm-notes" name="notes">
 								<a-input v-model:value="formData.notes" placeholder="请输入备注"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
+            <a-col :span="12">
+               <a-form-item  label="状态(status)" v-bind="validateInfos.status" id="CuspIntermediatorForm-status" name="status">
+                  <JDictSelectTag v-model:value="formData.status" placeholder="请选择" dictCode="valid_status" stringToNumber/>
+               </a-form-item>
+             </a-col>
           </a-row>
         </a-form>
       </template>

src/views/cuspCode/Intermediator/components/CuspIntermediatorModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <j-modal maxHeight="370px" :title="title"  :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
     <CuspIntermediatorForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CuspIntermediatorForm>
   </j-modal>
 </template>
@@ -10,7 +10,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(800);
+  const width = ref<number>(1200);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();