Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue
#	src/dashoo.cn/frontend_animal/src/pages/samples/prerecorded/index.vue
#	src/dashoo.cn/frontend_animal/src/pages/samples/stored/index.vue

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

@@ -899,15 +899,14 @@ export default {
         project_name: this.searchform.ProjectName,
         auditor_status: this.searchform.AuditorStatus,
         auditor_name: this.searchform.AuditorName,
-        create_on: this.CreateOn[0] / 1000 + ',' + this.CreateOn[1] / 1000,
+        create_on: this.create_on,
         show_column: showcolumnarr + '',
         show_column_name: showcolumnnamearr + '',
         type: 'SampleSource'
       }
-      /*    if (this.CreateOn && this.CreateOn.length === 2) {
+      if (this.CreateOn && this.CreateOn.length === 2) {
         let params2 = {
-          CreateOnstart: this.CreateOn[0] / 1000,
-          CreateOnend: this.CreateOn[1] / 1000
+          create_on: this.CreateOn[0] / 1000 + ',' + this.CreateOn[1] / 1000
         }
         params = Object.assign(params, params2)
       }
@@ -917,7 +916,7 @@ export default {
           Validityend: _this.Validity[1] / 1000
         }
         params = Object.assign(params, params3)
-      } */
+      }
       // 导出所选样本
       if (val === 'exportchosen') {
         for (var i = 0; i < _this.$refs.tableData.selection.length; i++) {
@@ -947,14 +946,11 @@ export default {
         params = Object.assign(params, paramsid)
       }
       if (val === 'exportall') {
-        params.currentPage = 0
+        params.current_page = 0
         params.size = 0
       }
-      const dateInfo = this.formatExportDate(new Date())
-      const name = dateInfo + '样本来源.xlsx'
-      console.log('filename', name)
       // 样本来源相关导出
-      service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', name, params)
+      service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
     },
     exportSamples () {
       const dateInfo = this.formatExportDate(new Date())

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

@@ -1214,7 +1214,7 @@ export default {
       const name = dateInfo + '样本来源.xlsx'
       console.log('filename', name)
       // 样本来源相关导出
-      service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', name, params)
+      service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
       _this.SampleType = ''
       _this.sampleExportVisible = false
     },

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

@@ -837,7 +837,7 @@
         const name = dateInfo + '样本来源.xlsx'
         console.log('filename', name)
         // 样本来源相关导出
-        service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', name, params)
+        service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
         _this.SampleType = ''
         _this.sampleExportVisible = false
       },

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

@@ -1060,7 +1060,7 @@
         console.log('filename', name)
         // 样本来源相关导出
         service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel'
-          , name, params)
+          , params)
         _this.SampleType = ''
         _this.sampleExportVisible = false
       },

src/dashoo.cn/frontend_animal/src/utils/micro_request.js

@@ -125,10 +125,7 @@ service.postRequest = function postRequest(basePath, srvName, funcName, data) {
 }
 
 // Excel文件下载（服务端生成文件流）
-service.downloadExcel = function downloadExcel(basePath, srvName, funcName, fileName, data) {
-  if (fileName == undefined) {
-    fileName = 'data.xlsx'
-  }
+service.downloadExcel = function downloadExcel(basePath, srvName, funcName, data) {
   if (data == undefined) {
     let nullParam = {"nullparam": 0}
     data = nullParam