修改了导出样品抽样单模板

pages/soil-sample-manage/sample-alone-keep/entrust-sample-manage/WaitReceive.vue

@@ -5,10 +5,10 @@
       <Row>
         <!--查询-->
         <Col span="24" style="padding-bottom: 5px">
-          <Form v-show="searchOpen" id="search-wait" :label-width="100" inline onsubmit="return false">
+          <Form id="search-wait" v-show="searchOpen" :label-width="100" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试样编号:" class="search-item">
-              <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch"></Input>
+              <Input v-model="formObj.sampleCode" @on-enter="_formSearch" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
             </Form-item>
             <Form-item label="是否有试验项目:" class="search-item">
               <Select v-model="formObj.haveExp" clearable name="groupId" style="width:150px" placeholder="请选择是否有试验项目">
@@ -16,10 +16,10 @@
               </Select>
             </Form-item>
             <Form-item label="筛选试样:" class="search-item">
-              <Input v-model="formObj.experimentNames" name="experimentNames" placeholder="请输入试验项目" clearable @on-enter="_formSearch"></Input>
+              <Input v-model="formObj.experimentNames" @on-enter="_formSearch" name="experimentNames" placeholder="请输入试验项目" clearable></Input>
             </Form-item>
             <Form-item label="试验科室:" class="search-item">
-                <el-select v-model="formObj.groupId" placeholder="请选择" clearable style="width: 100%" @change="_selGroup">
+                <el-select v-model="formObj.groupId" @change="_selGroup" placeholder="请选择" clearable style="width: 100%">
                   <el-option
                     v-for="(item,index) in groupoptions"
                     :key="index"
@@ -29,12 +29,12 @@
                 </el-select>
             </Form-item>
             <Form-item class="search-btn">
-              <Button type="primary" @click="_formSearch">搜索</Button>
+              <Button @click="_formSearch" type="primary">搜索</Button>
             </Form-item>
           </Form>
         </Col>
         <Col span="24">
-          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" @on-result-change="_btnClick">
+          <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick" class="contHide">
           </btn-list>
         </Col>
         <Col span="24">
@@ -43,8 +43,8 @@
             :table-height="tableHeight"
             :get-page="getPage"
             :icon-msg="iconMsg"
-            select-data
-            @on-result-change="_tableResultChange">
+            @on-result-change="_tableResultChange"
+            select-data>
             <vxe-table-column
               v-for="item in pageColumns"
               :key="item.key"
@@ -71,13 +71,15 @@
     <storageSelect ref="locationModal" @on-result-change="_page()"></storageSelect>
     <SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
     <KeepAdress ref="keepAdressModal" @on-result-change="_page"></KeepAdress>
-    <SampleItemSelect ref="sampleItemSelectModal" is-change @on-result-change="_itemImportBack" />
-    <SeniorSampleEdit ref="seniorSampleEditModal" is-change @on-result-change="_page" />
+    <SampleItemSelect ref="sampleItemSelectModal" @on-result-change="_itemImportBack" is-change />
+    <SeniorSampleEdit ref="seniorSampleEditModal" @on-result-change="_page" is-change />
   </div>
 </template>
 <script>
 import { soilAptitude, soilEntrust, soilSample } from '../../../../api'
 import storageSelect from '../storageSelect'
+import global from '../../../../api/config'
+// import http from '../../../../api/http'
 import SampleItemSelect from './SampleItemSelect'
 import SoilSampleItemManage from './SoilSampleItemManage'
 import SeniorSampleEdit from './SeniorSampleEdit'
@@ -95,7 +97,12 @@ export default {
       btn: [
         { type: 'primary', id: '', name: '调出' },
         { type: 'primary', id: '', name: '编辑' },
-        { type: 'primary', id: '', name: '导入试验项目' }
+        { type: 'primary', id: '', name: '导入试验项目' },
+        {
+          type: 'primary',
+          id: '',
+          name: '导出样品抽样单模板'
+        }
       ],
       groupoptions: [],
       selectIds: [],
@@ -275,6 +282,9 @@ export default {
           case '添加':
             this._editModal(false)
             break
+          case '导出样品抽样单模板':
+            this._exportTemplate()
+            break
           case '接收并发放':
             this._submitSend()
             break
@@ -320,6 +330,29 @@ export default {
         }
       })
     },
+    _exportTemplate() {
+      const data = {
+        downloadUrl:
+          '/soil/v1/sample/export_sampling_list?ids=' + this.selectIds.join(',')
+        // downloadUrl: '/soil/v1/sample/export_sampling_list'
+      }
+      console.log(data)
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定要导出该模板？',
+        onOk: () => {
+          this._download(data)
+        }
+      })
+    },
+    _download(data) {
+      window.open(global.baseURL + data.downloadUrl, '_blank')
+      // http.open(
+      //   '/soil/v1/sample/export_sampling_list',
+      //   { ids: this.selectIds.join(',') },
+      //   '_blank'
+      // )
+    },
     _importItem() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请选择至少一条数据！')

pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue

@@ -116,13 +116,7 @@ export default {
         { title: '检验类别', key: 'testType', width: 120 }
       ],
       searchOpen: false,
-      btn: [
-        {
-          type: 'primary',
-          id: '',
-          name: '导出样品抽样单模板'
-        }
-      ],
+      btn: [],
       selectIds: [],
       currentComponent: '',
       acceptSelectUserValue: ''
@@ -160,8 +154,13 @@ export default {
       })
     },
     _exportTemplate() {
+      // const data = {
+      //   downloadUrl: '/soil/v1/excel/template_soil/YangPinChouYangDan.docx'
+      // }
       const data = {
-        downloadUrl: '/soil/v1/excel/template_soil/YangPinChouYangDan.docx'
+        // downloadUrl:
+        //   '/soil/v1/sample/export_sampling_list?ids=' + this.selectIds
+        downloadUrl: '/soil/v1/sample/export_sampling_list'
       }
       this.$Modal.confirm({
         title: '提示',
@@ -173,6 +172,7 @@ export default {
     },
     _download(data) {
       window.open(global.baseURL + data.downloadUrl, '_blank')
+      console.log(data.downloadUrl)
     },
     _iconClick(res, data, currentComponent) {
       this.currentComponent = currentComponent