修改了委托单管理的显示问题

pages/meter-entrust/client-online/MeterGoOutTestEdit.vue

@@ -10,8 +10,8 @@
             </Radio-group>
           </Form-item>
           <Form-item label="委托单位" prop="client" class="width-48">
-            <AutoComplete :value="formObj.client" :down-data="customerData" name="client"
-                          placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
+            <AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
+                          name="client" placeholder="请输入或选择委托单位"
             ></AutoComplete>
           </Form-item>
           <Form-item label="联系人" prop="operation.person" class="width-48">
@@ -24,7 +24,7 @@
             <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入传真"/>
           </Form-item>
           <Form-item label="省、市、区" prop="testedCityData" class="width-48">
-            <CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult">
+            <CityNameCascader v-model="testedCityData" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">
@@ -38,12 +38,15 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Date-picker type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
-                         @on-change="_ctimeChange"></Date-picker>
+            <Date-picker v-model="formObj.edate"  @on-change="_ctimeChange"  type="date" split-panels style="width:100%;"
+                         placeholder="请选择委托日期"></Date-picker>
           </Form-item>
           <Form-item label="合同号：" prop="contractCode" class="width-48">
             <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
           </Form-item>
+          <Form-item label="委托费用：" prop="cost" class="width-48">
+            <Input @keydown.native="channelInputLimit" v-model="formObj.cost" type="number" name="cost" placeholder="请输入委托费用"/>
+          </Form-item>
           <Form-item label="备注：" prop="remark" style="width: 99.8%">
             <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
                    placeholder="请输入备注"/>
@@ -52,7 +55,7 @@
         <Col span="24">
           <!--          <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
           <!--                    class="contHide"></btn-list>-->
-          <Button type="success" @click="_add()">添加</Button>
+          <Button @click="_add()" type="success">添加</Button>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -74,7 +77,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange"  @click.native="_selectjudgeBasis(scope.$rowIndex)"
+                  <el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur  placeholder="请输入或选择样品名称"
                   ></el-input>
                 </div>
                 <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
@@ -95,9 +98,25 @@
                 <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
                   <el-input
                     v-model="scope.row.quantity"
+                    @keydown.native="channelInputLimit"
                     type="number"
                     placeholder="请输入或选择数量"
+                  />
+                </div>
+                <div v-if="item.key==='price'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.price"
+                    @keydown.native="channelInputLimit"
+                    type="number"
+                    placeholder="请输入单价"
+                  />
+                </div>
+                <div v-if="item.key==='totalPrice'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.totalPrice"
                     @keydown.native="channelInputLimit"
+                    type="number"
+                    placeholder="请输入总价"
                   />
                 </div>
               </template>
@@ -108,7 +127,7 @@
       <div slot="footer">
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
-      <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+      <EditModal ref="EditModal" @on-result-change="_backData" is-change />
     </Modal>
   </div>
 </template>
@@ -155,7 +174,9 @@ export default {
         { title: '型号规格', key: 'spec' },
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type' },
-        { title: '数量', key: 'quantity' }
+        { title: '数量', key: 'quantity' },
+        { title: '单价/元', key: 'price' },
+        { title: '总价/元', key: 'totalPrice' }
         // {title: '限制范围或说明', key: 'limitDescription'},
       ],
       options: [
@@ -175,6 +196,7 @@ export default {
       subcontractorId: '',
       formObj: {
         firsted: 1,
+        cost: 0,
         client: '',
         linkman: '',
         tel: '',
@@ -211,6 +233,13 @@ export default {
         }
       },
       ruleValidate: {
+        cost: [
+          {
+            required: true,
+            message: '委托费用不能为空',
+            trigger: 'blur'
+          }
+        ],
         testedCityData: [
           {
             required: true,
@@ -525,6 +554,11 @@ export default {
       this._showAddress(formObj)
       this.getPage.records = formObj.sampleList
       console.log(this.formObj)
+      if (this.formObj.edate === undefined) {
+        this.formObj.edate = ''
+      } else {
+        this.formObj.edate = new Date(formObj.edate)
+      }
     },
     _getList: async function() {
       const result = await meterEntrust.pageList()

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

@@ -41,13 +41,10 @@
             <Date-picker v-model="formObj.edate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
                          placeholder="请选择委托日期"></Date-picker>
           </Form-item>
-
           <Form-item label="要求完成日期：" prop="odate" class="width-48">
             <Date-picker v-model="formObj.odate" @on-change="_odateChange" type="date" split-panels style="width:100%;"
                          placeholder="请选择要求完成"></Date-picker>
           </Form-item>
-
-
           <Form-item label="合同号：" prop="contractCode" class="width-48">
             <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
           </Form-item>
@@ -592,6 +589,9 @@ export default {
         this.formObj.operation.person = result[0].contact
         this.formObj.operation.tel = result[0].mobile
         this.formObj.operation.fax = result[0].fax
+        this.formObj.operation.email = result[0].email
+        this.formObj.street = result[0].street
+        this.formObj.operation.postcode = result[0].postcode
         this.testedCityData = [
           result[0].province,
           result[0].city,

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

@@ -250,7 +250,7 @@ export default {
             required: true,
             message: '委托单位不能为空',
             validator: validateClient,
-            trigger: 'blur'
+            trigger: ['blur', 'change']
           }
         ],
         edate: [
@@ -621,9 +621,12 @@ export default {
       console.log(result)
       if (result) {
         this.formObj.client = data
+        this.formObj.street = result[0].street
         this.formObj.operation.person = result[0].contact
+        this.formObj.operation.postcode = result[0].postcode
         this.formObj.operation.tel = result[0].mobile
         this.formObj.operation.fax = result[0].fax
+        this.formObj.operation.email = result[0].email
         this.testedCityData = [
           result[0].province,
           result[0].city,