优化修改

pages/meter-contract/contract-register/MeterContractRegister.vue

@@ -28,7 +28,7 @@
           <!--表格-->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange">
+                        :get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -108,12 +108,14 @@ export default {
         aptitude: undefined
       },
       selectIds: [],
+      selectData: [],
       getPage: {},
       pageColumns: [
         { title: '委托单位', key: 'client', width: 200 },
         { title: '联系人', key: 'person', width: 120 },
         { title: '联系电话', key: 'tel', width: 120 },
         { title: '传真', key: 'fax', width: 120 },
+        { title: '合同编号', key: 'salesCode', width: 120 },
         { title: '要求完成时间', key: 'odate', width: 120, date: true },
         { title: '折扣', key: 'discount', width: 120 },
         { title: '总价', key: 'totalPrice', width: 120 },
@@ -185,9 +187,16 @@ export default {
     },
     _submitByContractIds(cont) {
       const ids = this.selectIds
+      const data = this.selectData
       if (ids.length === 0) {
         this.$Message.warning('请至少选择一条数据！')
       } else {
+        for (let i = 0; i < data.length; i++) {
+          if (data[i].salesCode === '' || data[i].salesCode === undefined) {
+            this.$Message.success('请填写委托编号')
+            return false
+          }
+        }
         this.$Modal.confirm({
           title: '提示',
           content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
@@ -213,8 +222,13 @@ export default {
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'selectIds':
-          this.selectIds = data
+        case 'selectData':
+          const selectIds = []
+          for (let i = 0; i < data.length; i++) {
+            selectIds.push(data[i].id)
+          }
+          this.selectIds = selectIds
+          this.selectData = data
           break
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)

pages/meter-contract/contract-register/MeterContractRegisterEdit.vue

@@ -27,6 +27,9 @@
           <Form-item label="街道" prop="street" class="width-48">
             <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
           </Form-item>
+          <Form-item label="合同编号" prop="salesCode" class="width-48">
+            <Input v-model="formObj.salesCode" name="salesCode" placeholder="请输入合同编号"/>
+          </Form-item>
           <Form-item label="要求完成时间：" prop="odate" class="width-48">
             <Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
                          placeholder="请选择要求完成时间"></Date-picker>
@@ -211,6 +214,7 @@ export default {
       formObj: {
         client: '',
         linkman: '',
+        salesCode: '',
         tel: '',
         email: '',
         address: '',
@@ -245,6 +249,9 @@ export default {
         person: [
           { required: true, message: '联系人不能为空', trigger: 'blur' }
         ],
+        salesCode: [
+          { required: true, message: '合同编号不能为空', trigger: 'blur' }
+        ],
         tel: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
         testedCityData: [
           {
@@ -296,9 +303,7 @@ export default {
       }
     },
     _customerMatch(data) {
-      // this.formObj.client = data
       this._getQueryList(data)
-      console.log(data)
     },
     _cusNameQuery(query) {
       this.formObj.client = query

pages/meter-contract/contract-review/MeterContractReview.vue

@@ -73,18 +73,18 @@ export default {
     return {
       currentComponent: '',
       formId: 'meterContractReviewFormId',
-      searchOpen: false,
+      searchOpen: true,
       btn: [
         // {
         //   type: 'success',
         //   id: '',
         //   name: '评审'
         // },
-        {
-          type: 'success',
-          id: 'meter-contract-review-back',
-          name: '驳回'
-        }
+        // {
+        //   type: 'success',
+        //   id: 'meter-contract-review-back',
+        //   name: '驳回'
+        // }
       ],
       iconMsg: [
         {
@@ -124,6 +124,7 @@ export default {
         { title: '联系人', key: 'person', width: 120 },
         { title: '联系电话', key: 'tel', width: 120 },
         { title: '传真', key: 'fax', width: 120 },
+        { title: '合同编号', key: 'salesCode', width: 120 },
         { title: '详细地址', key: 'address', width: 250 },
         { title: '要求完成时间', key: 'odate', width: 120, date: true },
         { title: '折扣', key: 'discount', width: 120 },

pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue

@@ -4,11 +4,11 @@
       <p slot="header">{{modalTitle}}</p>
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
-          <Form-item label="委托方是否第一次送检" prop="firsted" class="width-48">
-            <Radio-group v-model="formObj.firsted">
-              <Radio v-for="item in judgeType" :key="item.value" :label="item.value">{{item.name}}</Radio>
-            </Radio-group>
-          </Form-item>
+<!--          <Form-item label="委托方是否第一次送检" prop="firsted" class="width-48">-->
+<!--            <Radio-group v-model="formObj.firsted">-->
+<!--              <Radio v-for="item in judgeType" :key="item.value" :label="item.value">{{item.name}}</Radio>-->
+<!--            </Radio-group>-->
+<!--          </Form-item>-->
           <Form-item label="委托单位" prop="client" class="width-48">
             <AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
                           name="client" placeholder="请输入或选择委托单位"