修改了出检送检委托单添加页面

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

@@ -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" name="tested" @on-result-change="_cascaderResult">
+            <CityNameCascader :value="testedCityData" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">
@@ -41,7 +41,9 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>
+<!--            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>-->
+            <Date-picker @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="请输入联系人"/>
@@ -54,7 +56,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
@@ -76,7 +78,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)">
@@ -97,9 +99,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 +112,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>
@@ -199,7 +201,14 @@ export default {
       ruleValidate: {
         client: [
           { required: true, message: '委托单位不能为空', trigger: 'blur' }
-        ]
+        ],
+        'operation.person': [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        'operation.tel': [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        name: [{ required: true, message: '省市区不能为空', trigger: 'blur' }]
       },
       clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
       clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况（）'],
@@ -219,6 +228,10 @@ export default {
     )
   },
   methods: {
+    _ctimeChange(data) {
+      console.log('时间', data)
+      this.formObj.edate = data
+    },
     _backData(data) {
       console.log(typeof this.index)
       this.getPage.records[this.index].name = data.name

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

@@ -9,7 +9,7 @@
               <Radio v-for="item in judgeType" :label="item.value" :key="item.value">{{item.name}}</Radio>
             </Radio-group>
           </Form-item>
-          <Form-item label="委托单位" prop="client" class="width-48">
+          <Form-item  label="委托单位" prop="client" class="width-48">
             <Input v-model="formObj.client" name="client" placeholder="请输入委托单位"/>
           </Form-item>
           <Form-item label="联系人" prop="operation.person" class="width-48">
@@ -37,7 +37,9 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>
+<!--            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>-->
+            <Date-picker @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="请输入联系人"/>
@@ -201,8 +203,16 @@ export default {
       ruleValidate: {
         client: [
           { required: true, message: '委托单位不能为空', trigger: 'blur' }
-        ]
+        ],
+        'operation.person': [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        'operation.tel': [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        name: [{ required: true, message: '省市区不能为空', trigger: 'blur' }]
       },
+
       clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
       clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况（）'],
       showModal: false,
@@ -221,6 +231,12 @@ export default {
     )
   },
   methods: {
+    _ctimeChange(data) {
+      console.log('时间', data)
+      this.formObj.edate = data
+      // this.formObj.ctimeBegin = data[0]
+      // this.formObj.ctimeEnd = data[1]
+    },
     _judgeBasisChange(msg, data) {
       switch (msg) {
         case 'select':