修改了委托评审查看详情

pages/meter-certificate/check/MeterCertificateCheck.vue

@@ -45,12 +45,14 @@
         </Row>
       </div>
     </div>
+    <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
   </div>
 </template>
 <script>
 import { meterSample } from '../../../api'
+import Reason from '../../../components/base/Reason'
 export default {
-  components: {},
+  components: { Reason },
   data() {
     return {
       currentComponent: '',
@@ -61,13 +63,18 @@ export default {
           type: 'success',
           id: '',
           name: '提交'
+        },
+        {
+          type: 'error',
+          id: '',
+          name: '退回'
         }
       ],
       iconMsg: [
         {
-          type: 'md-create',
+          type: 'ios-book',
           id: '',
-          name: '编辑'
+          name: '预览'
         },
         {
           type: 'md-car',
@@ -123,6 +130,20 @@ export default {
     this._page()
   },
   methods: {
+    _reasonResult(data) {
+      console.log(data)
+      // this.$store
+      //   .dispatch('FoodContract/customerBack', {
+      //     ids: this.selectIds.join(','),
+      //     remark: data
+      //   })
+      //   .then(() => {
+      //     if (this.$store.state.FoodContract.success) {
+      //       this.$Message.success('退回成功')
+      //       this._page()
+      //     }
+      //   })
+    },
     _modalResult() {
       if (this.currentComponent === 'FoodSubcontracterEdit') {
         this._page()
@@ -141,12 +162,23 @@ export default {
           case '提交':
             this._submitToReview()
             break
+          case '退回':
+            this._goBack()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _goBack() {
+      // 退回
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条委托！')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
     _submitToReview() {
       this._submitByContractIds('委托评审')
     },
@@ -180,7 +212,7 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
-          case '编辑':
+          case '预览':
             // this._editModal(true, data.id)
             this._personModal(data)
             break
@@ -201,7 +233,19 @@ export default {
     },
     _personModal(data) {
       console.log(data)
-      this.$refs.personModal._open(data.id)
+      // this.$refs.personModal._open(data.id)
+      this._previewEdit(data.id)
+    },
+    // 预览编辑
+    async _previewEdit(id) {
+      const result = await meterSample.reportPreview(id)
+      if (result) {
+        this.$openWindowModeless({
+          objectKey: result.objectKey,
+          id: id,
+          isReport: 0
+        })
+      }
     },
     _record(id) {
       this.$refs.refModal._open(id)

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

@@ -25,9 +25,9 @@
           <Form-item label="传真" prop="operation.fax" class="width-48">
             <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/>
           </Form-item>
-          <Form-item label="省、市、区" prop="name" class="width-48">
+          <Form-item label="省、市、区" prop="testedCityData" class="width-48">
 <!--            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
-            <CityNameCascader :value="testedCityData" @on-result-change="_cascaderResult" name="tested">
+            <CityNameCascader v-model="testedCityData" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">
@@ -127,22 +127,20 @@ import EditModal from './EditModal'
 export default {
   components: { EditModal, CityNameCascader },
   data() {
+    const validateRemark = (rule, value, callback) => {
+      if (this.testedCityData.length === 0) {
+        callback(new Error('内容不能为空'))
+      } else {
+        callback()
+      }
+    }
     return {
       formId: 'meterSendTestEditFormId',
       getPage: {
         records: []
       },
       testedCityData: [],
-      testedTemp: {
-        testedName: '',
-        testedContactor: '',
-        testedContactorTel: '',
-        testedTel: '',
-        testedProvince: '',
-        testedCity: '',
-        testedCounty: '',
-        testedStreet: ''
-      },
+
       judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
       iconMsg: [
         { type: 'ios-clock', id: '', name: '编辑' },
@@ -196,9 +194,27 @@ export default {
           postcode: '',
           email: '',
           fee: ''
+        },
+        testedTemp: {
+          testedName: '',
+          testedContactor: '',
+          testedContactorTel: '',
+          testedTel: '',
+          testedProvince: '',
+          testedCity: '',
+          testedCounty: '',
+          testedStreet: ''
         }
       },
       ruleValidate: {
+        testedCityData: [
+          {
+            required: true,
+            message: '省市区不能为空',
+            validator: validateRemark,
+            trigger: 'blur'
+          }
+        ],
         client: [
           { required: true, message: '委托单位不能为空', trigger: 'blur' }
         ],
@@ -207,8 +223,10 @@ export default {
         ],
         'operation.tel': [
           { required: true, message: '联系电话不能为空', trigger: 'blur' }
-        ],
-        name: [{ required: true, message: '省市区不能为空', trigger: 'blur' }]
+        ]
+        // testedCityData: [
+        //   { required: true, message: '省市区不能为空', trigger: 'blur' }
+        // ]
       },
       clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
       clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况（）'],
@@ -220,13 +238,13 @@ export default {
       aptitudeData: []
     }
   },
-  created() {
-    this.$set(
-      this.formObj,
-      'tested',
-      JSON.parse(JSON.stringify(this.testedTemp))
-    )
-  },
+  // created() {
+  //   this.$set(
+  //     this.formObj,
+  //     'tested',
+  //     JSON.parse(JSON.stringify(this.testedTemp))
+  //   )
+  // },
   methods: {
     _ctimeChange(data) {
       console.log('时间', data)
@@ -258,32 +276,42 @@ export default {
     _emptyProvince() {
       this.cityData = []
       this.testedCityData = []
-      this.formObj.tested.testedProvince = ''
-      this.formObj.tested.testedCity = ''
-      this.formObj.tested.testedCounty = ''
+      // this.formObj.tested.testedProvince = ''
+      // this.formObj.tested.testedCity = ''
+      // this.formObj.tested.testedCounty = ''
+      this.formObj.testedTemp.testedProvince = ''
+      this.formObj.testedTemp.testedCity = ''
+      this.formObj.testedTemp.testedCounty = ''
     },
     _testedChange(data, msg) {
       // 省、市、区
       console.log('数据')
       console.log(data)
-      console.log(msg)
+      console.log('msg', msg)
       if (msg === 'clear') {
-        this.formObj.tested.testedProvince = ''
-        this.formObj.tested.testedCity = ''
-        this.formObj.tested.testedCounty = ''
+        // this.formObj.tested.testedProvince = ''
+        // this.formObj.tested.testedCity = ''
+        // this.formObj.tested.testedCounty = ''
+        this.formObj.testedTemp.testedProvince = ''
+        this.formObj.testedTemp.testedCity = ''
+        this.formObj.testedTemp.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.tested.testedProvince = data.value[0]
+        // this.formObj.tested.testedCity = data.value[1]
+        // this.formObj.tested.testedCounty = data.value[2]
+        // this.formObj.testedTemp.testedProvince = data.value[0]
+        // this.formObj.testedTemp.testedCity = data.value[1]
+        // this.formObj.testedTemp.testedCounty = data.value[0]
 
         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]]
+        console.log('地址', this.testedCityData)
       }
     },
     _getJudgeBasisList(data) {
@@ -447,6 +475,8 @@ export default {
       this.getPage.records = []
       this.id = ''
       this.modalTitle = '出检委托单登记'
+      this.testedCityData = []
+      console.log('098765', this.testedCityData.length)
     },
 
     _openEdit(formObj) {
@@ -460,6 +490,7 @@ export default {
       this.formObj = formObj
       this._showAddress(formObj)
       this.getPage.records = formObj.sampleList
+      console.log(this.formObj)
     },
     _getAptitudeList: async function() {
       const result = await lmsBaseDict.getItem('subcontractorAptitude')