Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pages/meter-entrust/send-test/MeterSendEntrust.vue

pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue

@@ -306,10 +306,12 @@ export default {
             this._cusNameQuery(data)
             break
         }
-      } else {
+      } else if (this.customerData.indexOf(data) !== -1) {
+        this._getQueryList(data)
         // 编辑的时候选择单位(互不影响)
         // this.cusName = data
         // this.formObj.customer.cname = data
+      } else {
       }
     },
     _customerMatch(data) {
@@ -644,6 +646,7 @@ export default {
       this.modalTitle = '报价单编辑'
       this.id = formObj.id
       this.formObj = formObj
+      this.formObj.client = formObj.client
       this._showAddress(formObj)
       this._showTime(formObj)
       this.getPage.records = formObj.sampleList
@@ -651,10 +654,8 @@ export default {
     _getList: async function() {
       const result = await meterEntrust.pageList()
       const list = []
-      console.log('result', result)
       if (result) {
         for (let i = 0; i < result.length; i++) {
-          console.log(result[i].cname)
           list.push(result[i].cname)
         }
         console.log('委托单位名单', list)

pages/meter-certificate/check/MeterCertificateCheck.vue

@@ -294,7 +294,7 @@ export default {
       switch (msg) {
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)
-          console.log('操作按钮点击后的值', data)
+          // console.log('操作按钮点击后的值', data)
           break
         // case 'selectIds':
         //   this.selectIds = data

pages/meter-contract/MeterSampleQuoteManage.vue

@@ -214,7 +214,6 @@ export default {
       }
     },
     _open(id) {
-      alert(id)
       this.formObj.contractId = id
       this.showModal = true
       this._page()

pages/meter-contract/contract-register/MeterContractRegisterEdit.vue

@@ -6,8 +6,8 @@
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
 
           <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="person" class="width-48">
@@ -20,7 +20,7 @@
             <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
           </Form-item>
           <Form-item label="省、市、区" prop="testedCityData" class="width-48">
-            <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
+            <CityNameCascader :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
 
@@ -28,8 +28,8 @@
             <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
           </Form-item>
           <Form-item label="要求完成时间：" prop="odate" class="width-48">
-            <Date-picker type="date" v-model="formObj.odate" split-panels style="width:100%;" placeholder="请选择要求完成时间"
-                         @on-change="_ctimeChange"></Date-picker>
+            <Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择要求完成时间"></Date-picker>
           </Form-item>
           <Form-item label="折扣：" prop="discount" class="width-48">
             <Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
@@ -48,8 +48,8 @@
         <!--操作-->
         <Col span="24">
 
-          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                    @on-result-change="_btnClick"></btn-list>
+          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                    class="contHide"></btn-list>
         </Col>
         <Col span="24">
           <PTVXETable
@@ -71,7 +71,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)">
@@ -92,9 +92,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>
                 <div v-else-if="item.date">
@@ -112,8 +112,8 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
-    <EditModal ref="EditModal" is-change @on-result-change="_backData" />
-    <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
+    <EditModal ref="EditModal" @on-result-change="_backData" is-change />
+    <importModal ref="importModal" @on-result-change="_inputBack"   aptitude-item></importModal>
   </div>
 </template>
 <script>
@@ -276,11 +276,13 @@ export default {
             this._cusNameQuery(data)
             break
         }
-      } else {
+      } else if (this.customerData.indexOf(data) !== -1) {
+        this._getQueryList(data)
         // 编辑的时候选择单位(互不影响)
-        alert('编辑')
         // this.cusName = data
         // this.formObj.customer.cname = data
+      } else {
+        console.log(data)
       }
     },
     _customerMatch(data) {
@@ -564,6 +566,7 @@ export default {
       this.id = ''
       this.modalTitle = '报价单编辑'
       this.id = formObj.id
+      this.formObj.client = formObj.client
       this.formObj = formObj
       this._showAddress(formObj)
       this._showTime(formObj)

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

@@ -41,7 +41,7 @@
                      {{scope.row[item.key].display}}
                   </span>
 
-                  <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  <span v-else-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
                   </span>
                   <span v-else-if="item.key==='type'">
                      <span v-if="scope.row[item.key]===0">

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

@@ -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" @on-result-change="_cascaderResult" name="tested">
+            <CityNameCascader :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">

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

@@ -40,6 +40,8 @@
                   <span v-if="item.status">
                      {{scope.row[item.key].display}}
                   </span>
+                  <span v-else-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
@@ -267,6 +269,7 @@ export default {
       console.log('this.formObj', this.formObj)
       const result = await meterEntrust.pageGoOutEntrust(this.formObj)
       if (result) {
+        console.log(result)
         this.$refs.pageTable._hideLoading()
         this.getPage = result
       }

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

@@ -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 :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">

pages/meter-out/task-distribute/MeterOutTaskDistribute.vue

@@ -37,7 +37,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>

pages/meter-review/MeterEntrustDetail.vue

@@ -35,7 +35,7 @@
             <th>地址</th>
             <td>{{obj.province}}&nbsp;{{obj.city}}&nbsp;{{obj.county}}</td>
             <th>委托日期</th>
-            <td>{{obj.edate}}</td>
+            <td>{{obj.edate?$dateformat(obj.edate,'yyyy-mm-dd'):''}}</td>
           </tr>
           <tr>
             <th>合同号</th>

pages/meter-review/MeterReviewEntrust.vue

@@ -37,7 +37,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>

pages/meter-send/receive-sample/MeterEntrustDetail.vue

@@ -35,7 +35,7 @@
             <th>地址</th>
             <td>{{obj.province}}&nbsp;{{obj.city}}&nbsp;{{obj.county}}</td>
             <th>委托日期</th>
-            <td>{{obj.edate}}</td>
+            <td>{{obj.edate?$dateformat(obj.edate,'yyyy-mm-dd'):''}}</td>
           </tr>
           <tr>
             <th>合同号</th>

pages/meter-send/receive-sample/MeterReceiveEntrust.vue

@@ -37,7 +37,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>

pages/meter-send/task-distribute/MeterTestEdit.vue

@@ -17,13 +17,13 @@
             <Input v-model="formObj.client" name="client" placeholder="请输入委托单位"/>
           </Form-item>
           <Form-item label="联系人" prop="operation.person" class="width-48">
-            <Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入委托单位"/>
+            <Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入联系人"/>
           </Form-item>
           <Form-item label="联系电话" prop="operation.tel" class="width-48">
-            <Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入委托单位"/>
+            <Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入联系电话"/>
           </Form-item>
           <Form-item label="传真" prop="operation.fax" class="width-48">
-            <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/>
+            <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="请输入委托单位"/>-->
@@ -31,20 +31,20 @@
             </CityNameCascader>
           </Form-item>
           <Form-item label="街道" prop="street" class="width-48">
-            <Input v-model="formObj.street" name="street" placeholder="请输入委托单位"/>
+            <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
           </Form-item>
           <Form-item label="邮编" prop="operation.postcode" class="width-48">
-            <Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入委托单位"/>
+            <Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入邮编"/>
           </Form-item>
 
           <Form-item label="E-mail" prop="operation.email" class="width-48">
-            <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
+            <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
           </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="请选择委托日期"/>
           </Form-item>
           <Form-item label="合同号：" prop="contractCode" class="width-48">
-            <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入联系人"/>
+            <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
           </Form-item>
           <Form-item label="备注：" prop="remark" style="width: 99.8%">
             <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"

pages/meter-subcontract/subpackage-input/MeterSubpackageInput.vue

@@ -34,7 +34,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>

pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue

@@ -37,7 +37,9 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                  <span>{{scope.row[item.key]}}</span>
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
             </PTVXETable>