优化送检工单分页查询

src/views/module_cmms/submission/SubmissionList.vue

@@ -16,8 +16,8 @@
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="检定单位id">
-                <j-search-select-tag placeholder="请选择检定单位id" v-model="queryParam.verificateClientId" dict="base_client,client_name,id"/>
+              <a-form-item label="检定单位">
+                <j-search-select-tag placeholder="请选择检定单位" v-model="queryParam.verificateClientId" dict="base_client,client_name,id"/>
               </a-form-item>
             </a-col>
           </template>
@@ -160,11 +160,21 @@
             dataIndex: 'verificateMethod_dictText'
           },
           {
-            title:'检定单位id',
+            title:'检定单位',
             align:"center",
             dataIndex: 'verificateClientId_dictText'
           },
           {
+            title:'送检设备数量',
+            align:"center",
+            dataIndex: 'totalNum'
+          },
+          {
+            title:'返回设备数量',
+            align:"center",
+            dataIndex: 'returnNum'
+          },
+          {
             title:'备注',
             align:"center",
             dataIndex: 'remark'
@@ -205,7 +215,9 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'verificatePerson',text:'送检负责人',dictCode:''})
         fieldList.push({type:'string',value:'verificateMethod',text:'检定方式',dictCode:'verificate_method'})
-        fieldList.push({type:'sel_search',value:'verificateClientId',text:'检定单位id',dictTable:"base_client", dictText:'client_name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'verificateClientId',text:'检定单位',dictTable:"base_client", dictText:'client_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'totalNum',text:'送检设备数量',dictCode:''})
+        fieldList.push({type:'string',value:'returnNum',text:'返回设备数量',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
       }

src/views/module_cmms/submission/modules/SubmissionForm.vue

@@ -4,6 +4,11 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
+            <a-form-model-item label="检定设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentids">
+              <j-search-select-tag v-model="model.equipmentids" dict="tpm_equipment,equipmentname,id"  placeholder="请选择检定设备" mode="multiple"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
             <a-form-model-item label="送检负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verificatePerson">
               <a-input v-model="model.verificatePerson" placeholder="请输入送检负责人"  ></a-input>
             </a-form-model-item>
@@ -14,8 +19,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="检定单位id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verificateClientId">
-              <j-search-select-tag v-model="model.verificateClientId" dict="base_client,client_name,id"  />
+            <a-form-model-item label="检定单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verificateClientId">
+              <j-search-select-tag v-model="model.verificateClientId" dict="base_client,client_name,id"  placeholder="请选择检定单位" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -111,7 +116,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }