样本导出 关闭后请空列表

src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

@@ -210,7 +210,7 @@
         </span>
     </el-dialog>
 
-    <el-dialog title="样本导出" :visible.sync="sampleExportVisible" width = "800px">
+    <el-dialog title="样本导出" :visible.sync="sampleExportVisible" @close="exportSampleTypeInfo" width = "800px">
       <el-form>
         <el-form-item label="样本类型">
           <el-select v-model="SampleType" placeholder="请选择样本类型">
@@ -222,7 +222,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-          <el-button size="mini" @click="sampleExportVisible = false">取 消</el-button>
+          <el-button size="mini" @click="exportSampleTypeInfo">取 消</el-button>
           <el-button size="mini" type="primary" @click="exportsamples">导 出</el-button>
         </span>
     </el-dialog>
@@ -1215,18 +1215,12 @@ export default {
       console.log('filename', name)
       // 样本来源相关导出
       service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', name, params)
-      // _this.$axios.get('/sampleinput/exportexcel', {
-      //   params
-      // })
-      //   .then(res => {
-      //     _this.exportloading = false
-      //     // window.location = 'http://' + res.data
-      //   })
-      //   .catch(err => {
-      //     _this.exportloading = false
-      //     // handle error
-      //     console.error(err)
-      //   })
+      _this.clearSearch()
+      _this.sampleExportVisible = false
+    },
+    exportSampleTypeInfo () {
+      this.sampleExportVisible = false
+      this.SampleType = ''
     },
     formatExportDate (date) {
       var y = date.getFullYear()

src/dashoo.cn/frontend_animal/src/pages/samples/prerecorded/index.vue

@@ -208,7 +208,7 @@
           <el-button size="mini" type="primary" @click="seachdata">查 询</el-button>
         </span>
     </el-dialog>
-    <el-dialog title="样本导出" :visible.sync="sampleExportVisible" width = "800px">
+    <el-dialog  title="样本导出" :visible.sync="sampleExportVisible" @close="exportSampleTypeInfo" width = "800px">
       <el-form>
         <el-form-item label="样本类型">
           <el-select v-model="SampleType" placeholder="请选择样本类型">
@@ -220,7 +220,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-          <el-button size="mini" @click="sampleExportVisible = false">取 消</el-button>
+          <el-button size="mini" @click="exportSampleTypeInfo">取 消</el-button>
           <el-button size="mini" type="primary" @click="exportsamples">导 出</el-button>
         </span>
     </el-dialog>
@@ -767,7 +767,7 @@
           }
         }
         let params = {
-          currentPage: this.exportType == 'exportall' ? 0 : this.currentPage,
+          current_page: this.exportType == 'exportall' ? 0 : this.currentPage,
           size: this.exportType == 'exportall' ? 0 : this.size,
           bar_code: this.BarCode,
           sample_code: this.SampleCode,
@@ -838,6 +838,12 @@
         console.log('filename', name)
         // 样本来源相关导出
         service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', name, params)
+        _this.clearSearch()
+        _this.sampleExportVisible = false
+      },
+      exportSampleTypeInfo () {
+        this.sampleExportVisible = false
+        this.SampleType = ''
       },
       formatExportDate (date) {
         var y = date.getFullYear()

src/dashoo.cn/frontend_animal/src/pages/samples/stored/index.vue

@@ -252,7 +252,7 @@
         </span>
       </el-dialog>
 
-      <el-dialog title="样本导出" :visible.sync="sampleExportVisible" width = "800px">
+      <el-dialog title="样本导出" :visible.sync="sampleExportVisible"  @close="exportSampleTypeInfo" width = "800px">
         <el-form>
           <el-form-item label="样本类型">
             <el-select v-model="SampleType" placeholder="请选择样本类型">
@@ -264,7 +264,7 @@
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button size="mini" @click="sampleExportVisible = false">取 消</el-button>
+          <el-button size="mini" @click="exportSampleTypeInfo">取 消</el-button>
           <el-button size="mini" type="primary" @click="exportsamples">导 出</el-button>
         </span>
       </el-dialog>
@@ -666,7 +666,7 @@
           })
       },
       GetEquipmentInfos () {
-        if (this.DItem != ''){
+        if (this.DItem != '') {
           service.postRequest('dashoo.biobank.bee-0.1', 'Equipment', 'GetEquipmentInfos', {DItem: this.DItem})
             .then(res => {
               this.EquipmentInfosList = res.data
@@ -991,7 +991,7 @@
           }
         }
         let params = {
-          currentPage: this.exportType == 'exportall' ? 0 : this.currentPage,
+          current_page: this.exportType == 'exportall' ? 0 : this.currentPage,
           size: this.exportType == 'exportall' ? 0 : this.size,
           bar_code: this.BarCode,
           sample_code: this.SampleCode,
@@ -1060,11 +1060,14 @@
         console.log('filename', name)
         // 样本来源相关导出
         service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel'
-          , name, params).then({
-        })
+          , name, params)
         _this.clearSearch()
         _this.sampleExportVisible = false
       },
+      exportSampleTypeInfo () {
+        this.sampleExportVisible = false
+        this.SampleType = ''
+      },
       formatExportDate (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1

src/dashoo.cn/frontend_animal/src/pages/samples/waitingstore/index.vue

@@ -213,7 +213,7 @@
           <el-button size="mini" type="primary" @click="seachdata">查 询</el-button>
         </span>
     </el-dialog>
-    <el-dialog title="样本导出" :visible.sync="sampleExportVisible" width = "800px">
+    <el-dialog title="样本导出" :visible.sync="sampleExportVisible" @close="exportSampleTypeInfo" width = "800px">
       <el-form>
         <el-form-item label="样本类型">
           <el-select v-model="SampleType" placeholder="请选择样本类型">
@@ -225,7 +225,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-          <el-button size="mini" @click="sampleExportVisible = false">取 消</el-button>
+          <el-button size="mini" @click="exportSampleTypeInfo">取 消</el-button>
           <el-button size="mini" type="primary" @click="exportsamples">导 出</el-button>
         </span>
     </el-dialog>
@@ -1216,18 +1216,12 @@
         console.log('filename', name)
         // 样本来源相关导出
         service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', name, params)
-        // _this.$axios.get('/sampleinput/exportexcel', {
-        //   params
-        // })
-        //   .then(res => {
-        //     _this.exportloading = false
-        //     // window.location = 'http://' + res.data
-        //   })
-        //   .catch(err => {
-        //     _this.exportloading = false
-        //     // handle error
-        //     console.error(err)
-        //   })
+        _this.clearSearch()
+        _this.sampleExportVisible = false
+      },
+      exportSampleTypeInfo () {
+        this.sampleExportVisible = false
+        this.SampleType = ''
       },
       formatExportDate (date) {
         var y = date.getFullYear()