委托单完善

api/meter/meter-entrust.js

@@ -21,6 +21,7 @@ export default {
       .post('meter/v1/entrust/page_subpackage_entrust', data)
       .then(res => res),
   getById: data => http.get('meter/v1/entrust/' + data).then(res => res),
+  getVOById: data => http.get('meter/v1/entrust/vo/' + data).then(res => res),
   deleteById: data =>
     http.delete('meter/v1/entrust/?ids=' + data).then(res => res),
   // 保存
@@ -32,6 +33,10 @@ export default {
     https
       .post('meter/v1/entrust/add_out_entrust', JSON.stringify(data))
       .then(res => res),
+  editDTO: data =>
+    https
+      .post('meter/v1/entrust/edit_entrust', JSON.stringify(data))
+      .then(res => res),
   // 提交
   submit: data =>
     https

components/base/CityNameCascader.vue

@@ -16,7 +16,7 @@
       transfer
       change-on-select>
       <Input
-        v-model="value.join(' ')"
+        v-model="value"
         @on-change="_clear"
         placeholder="请选择省、市、区"
         readonly

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

@@ -50,7 +50,7 @@
   </div>
 </template>
 <script>
-import { meterEntrust, meterSubcontractor } from '../../../api'
+import { meterEntrust } from '../../../api'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
 export default {
   components: { MeterSubcontractorEdit },
@@ -232,7 +232,6 @@ export default {
     _editModal(edit, id) {
       if (edit) {
         // 编辑
-        // this.$refs.editSubcontractorModal._open(id)
         this._getById(id)
       } else {
         // 添加
@@ -249,13 +248,13 @@ export default {
       this.$refs.refModal._open(id, 'subcontractorId')
     },
     _getById: async function(id) {
-      const result = await meterSubcontractor.getById(id)
+      const result = await meterEntrust.getVOById(id)
       if (result) {
-        this.$refs.editSubcontractorModal._open(result)
+        this.$refs.editSubcontractorModal._openEdit(result)
       }
     },
     _delete: async function(ids) {
-      const result = await meterSubcontractor.deleteById(ids)
+      const result = await meterEntrust.deleteById(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

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

 <template>
   <div>
-    <Modal v-model="showModal" :mask-closable="false" width="1000">
+    <Modal v-model="showModal" :mask-closable="false" width="1230">
       <p slot="header">{{modalTitle}}</p>
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
@@ -81,8 +81,6 @@
                   ></el-input>
                 </div>
                 <div v-if="item.key==='type'" @click.stop="_handleRow(scope)">
-<!--&lt;!&ndash;                  <el-input v-model="scope.row.type" blur placeholder="请输入或选择检测类型"&ndash;&gt;-->
-<!--&lt;!&ndash;                  ></el-input>&ndash;&gt;-->
                   <Select v-model="scope.row.type">
                     <Option v-for="(item,index) in options" :key="item.name" :value="index">
                       {{ item.name }}
@@ -90,8 +88,6 @@
                   </Select>
                 </div>
                 <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
-<!--                  <el-input v-model="scope.row.quantity" blur placeholder="请输入或选择数量"-->
-<!--                  ></el-input>-->
                   <el-input
                     v-model="scope.row.quantity"
                     type="number"
@@ -321,16 +317,14 @@ export default {
           Object.assign(this.formObj, data)
           if (this.$string(this.id).isEmpty()) {
             // 添加
-            console.log('data', data)
-            console.log('this.formObj', this.formObj)
-            console.log(this.getPage.records)
             const saveData = this.formObj
             saveData.sampleList = this.getPage.records
-            console.log('----------', saveData)
             this._save(saveData)
           } else {
+            const saveData = this.formObj
+            saveData.sampleList = this.getPage.records
             // 编辑
-            this._edit({ id: this.formObj.id, obj: data })
+            this._edit(saveData)
           }
         } else {
           this.$Message.error('表单验证失败!')
@@ -361,22 +355,26 @@ export default {
     _cancel() {
       this.showModal = false
     },
-    _open(formObj) {
+    _open() {
       this.showModal = true
       this.$refs.formObj.resetFields()
       this._hideLoading()
-      this._getAptitudeList()
-      if (this.$string(formObj).isEmpty()) {
       this.getPage.records = []
       this.id = ''
-        this.formObj.aptitude = []
-        this.modalTitle = '分包商管理新增'
-      } else {
+      this.modalTitle = '出检委托单登记'
+    },
+
+    _openEdit(formObj) {
+      this.getPage.records = []
+      this.showModal = true
+      this.$refs.formObj.resetFields()
+      this._hideLoading()
+      this.id = ''
+      this.modalTitle = '出检委托单编辑'
       this.id = formObj.id
       this.formObj = formObj
-        this.modalTitle = '分包商管理编辑'
       this._showTime(formObj)
-      }
+      this.getPage.records = formObj.sampleList
     },
     _getAptitudeList: async function() {
       const result = await lmsBaseDict.getItem('subcontractorAptitude')
@@ -386,11 +384,11 @@ export default {
     },
     _showTime(formObj) {
       // 回显资质类型
-      if (formObj.aptitude !== undefined || '') {
-        this.formObj.aptitude = formObj.aptitude.split(',')
-      } else {
-        this.formObj.aptitude = []
-      }
+      // if (formObj.aptitude !== undefined || '') {
+      //   this.formObj.aptitude = formObj.aptitude.split(',')
+      // } else {
+      //   this.formObj.aptitude = []
+      // }
     },
     _save: async function(data) {
       const result = await meterEntrust.saveOutEntrust(data)
@@ -400,7 +398,7 @@ export default {
       }
     },
     _edit: async function(data) {
-      const result = await meterEntrust.edit(data)
+      const result = await meterEntrust.editDTO(data)
       if (result) {
         this._resultChange('编辑成功!')
       }

pages/meter-entrust/send-test/MeterSendTestEdit.vue

 <template>
   <div>
-    <Modal v-model="showModal" :mask-closable="false" width="1000">
+    <Modal v-model="showModal" :mask-closable="false" width="1250">
       <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">-->
-<!--            <Input v-model="formObj.firsted" name="firsted" placeholder="委托方是否第一次送检"/>-->
-<!--          </Form-item>-->
           <Form-item label="委托方是否第一次送检" prop="firsted" class="width-48">
             <Radio-group v-model="formObj.firsted">
               <Radio v-for="item in judgeType" :label="item.value" :key="item.value">{{item.name}}</Radio>
@@ -26,7 +22,6 @@
             <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/>
           </Form-item>
           <Form-item label="省、市、区" prop="name" class="width-48">
-<!--            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
             <CityNameCascader :value="testedCityData" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
@@ -170,6 +165,9 @@ export default {
         email: '',
         address: '',
         remark: '',
+        province: '',
+        city: '',
+        county: '',
         street: '',
         aptitude: [],
         assessFormSn: '',
@@ -269,11 +267,18 @@ export default {
         this.formObj.tested.testedProvince = ''
         this.formObj.tested.testedCity = ''
         this.formObj.tested.testedCounty = ''
+        this.formObj.province = ''
+        this.formObj.city = ''
+        this.formObj.county = ''
         this.testedCityData = []
       } else {
         this.formObj.tested.testedProvince = data.value[0]
         this.formObj.tested.testedCity = data.value[1]
         this.formObj.tested.testedCounty = data.value[2]
+
+        this.formObj.province = data.value[0]
+        this.formObj.city = data.value[1]
+        this.formObj.county = data.value[2]
         this.testedCityData = [data.value[0], data.value[1], data.value[2]]
       }
     },
@@ -341,7 +346,7 @@ export default {
             console.log('data', data)
             console.log('this.formObj', this.formObj)
             console.log(this.getPage.records)
-            // this._save(this.formObj)
+            this._save(this.formObj)
           } else {
             // 编辑
             this._edit({ id: this.formObj.id, obj: data })