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

pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue

@@ -736,6 +736,13 @@ export default {
         if (valid) {
           const data = this.$serialize('MeterSendTestEdit')
           console.log(this.getPage.records)
+          for (let i = 0; i < this.getPage.records.length; i++) {
+            if (this.getPage.records[i].siteNo === '') {
+              this.$Message.error('有未填写现场编号的样品')
+              this._hideLoading()
+              return
+            }
+          }
           if (this.$string(this.id).isEmpty()) {
             // 添加
             data.sampleList = this.getPage.records
@@ -746,6 +753,7 @@ export default {
               data.projectLeader = undefined
               data.projectLeaderId = undefined
             }
+            // alert('添加')
             this._save(data)
           } else {
             data.id = this.id
@@ -758,6 +766,7 @@ export default {
               data.projectLeader = undefined
               data.projectLeaderId = undefined
             }
+            // alert('编辑')
             this._edit(data)
           }
         } else {

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue

@@ -13,7 +13,6 @@
               </Form-item>
               <Form-item class="search-item" label="库房号:">
                 <Input @on-enter="_formSearch" v-model="formObj.warehouse" name="warehouse" placeholder="请输入库房号" clearable/>
-                {{currentTime}}
               </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManageHis.vue

@@ -38,8 +38,8 @@
           </Col>
           <!--表格 -->
           <Col span="24">
-            <PTVXETable ref="pageTable" :tableHeight="tableHeight"
-                        @on-result-change="_tableResultChange" :getPage="getPage">
+            <PTVXETable id="sampleTable" ref="pageTable"
+                        :tableHeight="tableHeight" @on-result-change="_tableResultChange" :getPage="getPage" select-data>
               <vxe-table-column
                 :field="item.key"
                 :title="item.title"
@@ -107,7 +107,13 @@ export default {
         entrustCode: undefined,
         sampleCode: undefined
       },
-      btn: [],
+      btn: [
+        {
+          type: 'success',
+          id: '',
+          name: '导出'
+        }
+      ],
       // 表格
       pageColumns: [
         { title: '委托商', key: 'client', width: 170 },
@@ -119,7 +125,7 @@ export default {
         { title: '项目名称', key: 'projectName' },
         { title: '库房号', key: 'warehouse' },
         { title: '架位号', key: 'receiveLocation' },
-        { title: '进度', key: 'progress' }
+        { title: '进度', key: 'progress', status: true }
       ],
       // 操作
       iconMsg: [
@@ -144,7 +150,8 @@ export default {
       searchOpen: false,
       getPage: {},
       // 选中的内容
-      selectIds: []
+      selectIds: [],
+      selectData: []
     }
   },
   computed: {
@@ -182,7 +189,7 @@ export default {
           })
           break
         case '导出':
-          // this._export()
+          this._export()
           break
         //  收起搜索
         case 'search':
@@ -190,6 +197,27 @@ export default {
           break
       }
     },
+    _export() {
+      let result = []
+      if (this.selectData.length === 0) {
+        this.$Message.warning('至少选择一条数据')
+      } else {
+        // 只导出选中的数据
+        result = this.selectData
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定导出这' + result.length + ' 条数据？',
+          onOk: () => {
+            this.$exportExcelNew(
+              'sampleTable',
+              '样品信息',
+              this.pageColumns,
+              result
+            )
+          }
+        })
+      }
+    },
     _outstock() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据')
@@ -353,6 +381,13 @@ export default {
         case 'selectIds':
           this.selectIds = data
           break
+        case 'selectData':
+          this.selectData = data
+          this.selectIds = []
+          for (let i = 0; i < this.selectData.length; i++) {
+            this.selectIds.push(this.selectData[i].id)
+          }
+          break
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)
           break