委托单优化

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

@@ -10,7 +10,7 @@
 <!--          </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>
+              <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">
@@ -27,7 +27,7 @@
           </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 :value="testedCityData" name="tested" @on-result-change="_cascaderResult">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">
@@ -54,7 +54,7 @@
         <Col span="24">
           <!--          <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
           <!--                    class="contHide"></btn-list>-->
-          <Button @click="_add()" type="success">添加</Button>
+          <Button type="success" @click="_add()">添加</Button>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -76,7 +76,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur  placeholder="请输入或选择样品名称"
+                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange"  @click.native="_selectjudgeBasis(scope.$rowIndex)"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
@@ -97,9 +97,9 @@
                 <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
                   <el-input
                     v-model="scope.row.quantity"
-                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入或选择数量"
+                    @keydown.native="channelInputLimit"
                   />
                 </div>
               </template>
@@ -110,7 +110,7 @@
       <div slot="footer">
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
-      <EditModal ref="EditModal" @on-result-change="_backData" is-change />
+      <EditModal ref="EditModal" is-change @on-result-change="_backData" />
     </Modal>
   </div>
 </template>
@@ -178,6 +178,9 @@ export default {
         address: '',
         remark: '',
         street: '',
+        province: '',
+        city: '',
+        county: '',
         aptitude: [],
         assessFormSn: '',
         subArea: '',
@@ -442,7 +445,7 @@ export default {
       this.modalTitle = '出检委托单编辑'
       this.id = formObj.id
       this.formObj = formObj
-      this._showTime(formObj)
+      this._showAddress(formObj)
       this.getPage.records = formObj.sampleList
     },
     _getAptitudeList: async function() {
@@ -459,6 +462,17 @@ export default {
       //   this.formObj.aptitude = []
       // }
     },
+    _showAddress(formObj) {
+      if (
+        formObj.province !== undefined &&
+        formObj.city !== undefined &&
+        formObj.county !== undefined
+      ) {
+        this.testedCityData.push(formObj.province)
+        this.testedCityData.push(formObj.city)
+        this.testedCityData.push(formObj.county)
+      }
+    },
     _save: async function(data) {
       const result = await meterEntrust.saveOutEntrust(data)
       console.log(result)