Merge remote-tracking branch 'origin/master'

src/dashoo.cn/frontend_animal/src/pages/biobank/source/animal.vue

@@ -886,7 +886,7 @@ export default {
         }
       }
       let params = {
-        currentPage: this.currentPage,
+        current_page: this.currentPage,
         size: this.size,
         name: this.searchform.Name,
         inner_no: this.InnerNo,
@@ -925,7 +925,7 @@ export default {
           }
         }
         let paramsid = {
-          Id: id
+          id: id
         }
         params = Object.assign(params, paramsid)
       }

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

@@ -1049,7 +1049,7 @@
             }
           }
           let paramsid = {
-            Id: id
+            id: id
           }
           params = Object.assign(params, paramsid)
         }
@@ -1057,19 +1057,11 @@
         const name = dateInfo + '样本来源.xlsx'
         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)
-        //   })
+        service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel'
+          , name, params).then({
+        })
+        _this.clearSearch()
+        _this.sampleExportVisible = false
       },
       formatExportDate (date) {
         var y = date.getFullYear()
@@ -1401,6 +1393,7 @@
         this.DItem = ''
         this.EquipmentIds = ''
         this.SampleCode = ''
+        this.SampleType = ''
         this.SourceName = ''
         this.InnerCode = ''
         this.Name = ''