整体优化

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

@@ -10,8 +10,8 @@
             </Radio-group>
           </Form-item>
           <Form-item  label="委托单位" prop="client" class="width-48">
-            <AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
-                          name="client" placeholder="请输入或选择委托单位"
+            <AutoComplete :value="formObj.client" :down-data="customerData" name="client"
+                          placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
             ></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 :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
+            <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
             </CityNameCascader>
           </Form-item>
 
@@ -39,13 +39,13 @@
             <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
           </Form-item>
           <Form-item label="委托日期：" prop="edate" class="width-48">
-            <Date-picker v-model="formObj.edate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
-                         placeholder="请选择委托日期"></Date-picker>
+            <Date-picker v-model="formObj.edate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
+                         @on-change="_ctimeChange"></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>
+            <Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成日期"
+                         @on-change="_odateChange"></Date-picker>
           </Form-item>
 
           <Form-item label="合同号：" prop="contractCode" class="width-48">
@@ -57,9 +57,9 @@
           </Form-item>
         </Form>
         <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>
+        <btn-list :msg="btn" :open="searchOpen" :show-search-btn="false" class="contHide"
+                  @on-result-change="_btnClick"></btn-list>
+
         </Col>
         <Col span="24">
           <PTVXETable
@@ -81,7 +81,7 @@
             >
               <template slot-scope="scope">
                 <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.name" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur  placeholder="请输入或选择样品名称"
+                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称"  @click.native="_selectjudgeBasis(scope.$rowIndex)"
                   ></el-input>
                 </div>
 
@@ -107,9 +107,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>
 
@@ -119,6 +119,11 @@
                     placeholder="请输入备注"
                   />
                 </div>
+
+                <div v-else>
+                  {{scope.row[item.key]}}
+                </div>
+
               </template>
             </vxe-table-column>
           </PTVXETable>
@@ -128,7 +133,9 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
-    <EditModal ref="EditModal" @on-result-change="_backData" is-change />
+    <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+
+    <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
   </div>
 </template>
 <script>
@@ -136,12 +143,13 @@
  * 添加编辑分包商
  */
 import { lmsBaseDict, meterEntrust, meterSample } from '../../../api'
+import importModal from '../../../components/import/DownloadTemplateImport'
 import CityNameCascader from '../../../components/base/CityNameCascader'
 import AutoComplete from '../../../components/base/AutoCompletes'
 import EditModal from './EditModal'
 
 export default {
-  components: { CityNameCascader, EditModal, AutoComplete },
+  components: { CityNameCascader, EditModal, AutoComplete, importModal },
   data() {
     const validateRemark = (rule, value, callback) => {
       if (this.testedCityData.length === 0) {
@@ -178,6 +186,7 @@ export default {
       },
       customerData: [],
       cityData: [],
+      searchOpen: true,
       testedCityData: [],
       judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
       iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
@@ -188,9 +197,23 @@ export default {
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type' },
         { title: '数量', key: 'quantity' },
+        { title: '单价', key: 'price' },
+        { title: '总价', key: 'totalPrice' },
         { title: '备注', key: 'remark' }
         // {title: '限制范围或说明', key: 'limitDescription'},
       ],
+      btn: [
+        {
+          type: 'success',
+          id: '',
+          name: '添加'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '导入'
+        }
+      ],
       options: [
         {
           name: '检定'
@@ -321,6 +344,29 @@ export default {
       this.formObj.client = query
       console.log(query)
     },
+
+    _btnClick(msg) {
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._add()
+            break
+          case '导入':
+            this._importSample()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _inputBack(data) {
+      if (undefined !== data) {
+        for (let i = 0; i < data.length; i++) {
+          this.getPage.records.push(data[i])
+        }
+      }
+    },
     _ctimeChange(data) {
       console.log('时间', data)
       this.formObj.edate = data
@@ -362,8 +408,11 @@ export default {
       console.log(typeof this.index)
       this.getPage.records[this.index].name = data.name
       this.getPage.records[this.index].aptitudeId = data.id
-      console.log('返回的数据')
-      console.log(data)
+      this.getPage.records[this.index].verification = data.code + data.basis
+      this.getPage.records[this.index].price = data.price
+      this.getPage.records[this.index].totalPrice =
+        data.price * this.getPage.records[this.index].quantity
+      console.log('返回的数据', data)
       console.log(this.getPage.records)
     },
     _add() {
@@ -377,6 +426,16 @@ export default {
       }
       this.getPage.records.unshift(data)
     },
+
+    _importSample() {
+      const data = {
+        importUrl: '/meter/v1/sample/import_sample_pre',
+        downloadUrl: '/meter/v1/excel/template/MeterSampleImport',
+        title: '导入'
+      }
+      this.$refs.importModal._open(data, '样品导入')
+    },
+
     _tableResultChange(msg, data) {
       switch (msg) {
         case 'selectIds':