Merge branch 'master' of http://code.dashoo.cn/dashoo/biobank

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

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

@@ -28,7 +28,8 @@
           </el-form-item>
         </el-form>
           <el-dropdown split-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
-            @command="handleExportsamplesCommand">
+                       @click="handleExportsamplesCommand('exportall')"
+                       @command="handleExportsamplesCommand">
             导出
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item style="color:black;" command="exportchosen">导出所选样本</el-dropdown-item>
@@ -333,10 +334,10 @@ export default {
         name: '并且',
         value: 'and'
       },
-        {
-          name: '或者',
-          value: 'or'
-        }
+      {
+        name: '或者',
+        value: 'or'
+      }
       ],
       searchTableData: [],
       searchcolumn: [], // 搜索列
@@ -580,7 +581,7 @@ export default {
       })
     },
     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
@@ -1156,7 +1157,7 @@ export default {
         d_item: this.DItem,
         equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
         stnote_value: this.Stnotevalue,
-        stnote_field: this.STNoteField,
+        stnote_field: this.STNoteField == '' ? [] : this.STNoteField,
         create_by: this.CreateBy,
         source_name: this.SourceName,
         name: this.Name,
@@ -1217,7 +1218,7 @@ export default {
       console.log('filename', name)
       // 样本来源相关导出
       service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
-      _this.clearSearch()
+      _this.SampleType = ''
       _this.sampleExportVisible = false
     },
     exportSampleTypeInfo () {

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

@@ -29,7 +29,9 @@
           <router-link :to="'/samples/prerecorded/new/unhumanpre'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="acc !='ssqOy' && acc != 'saB4v'">分装预录入</el-button>
           </router-link>
-          <el-dropdown split-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @command="handleExportsamplesCommand">
+          <el-dropdown split-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
+                       @click="handleExportsamplesCommand('exportall')"
+                       @command="handleExportsamplesCommand">
             导出
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item style="color:black;" command="exportchosen">导出所选样本</el-dropdown-item>
@@ -778,7 +780,7 @@
           d_item: this.DItem,
           equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           stnote_value: this.Stnotevalue,
-          stnote_field: this.STNoteField,
+          stnote_field: this.STNoteField == '' ? [] : this.STNoteField,
           create_by: this.CreateBy,
           source_name: this.SourceName,
           name: this.Name,
@@ -840,7 +842,7 @@
         console.log('filename', name)
         // 样本来源相关导出
         service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
-        _this.clearSearch()
+        _this.SampleType = ''
         _this.sampleExportVisible = false
       },
       exportSampleTypeInfo () {

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

@@ -32,6 +32,7 @@
           </el-form-item>
         </el-form>
           <el-dropdown split-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
+                       @click="handleExportsamplesCommand('exportall')"
                        @command="handleExportsamplesCommand">
             导出
             <el-dropdown-menu slot="dropdown">
@@ -1002,7 +1003,7 @@
           d_item: this.DItem,
           equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           stnote_value: this.Stnotevalue,
-          stnote_field: this.STNoteField,
+          stnote_field: this.STNoteField == '' ? [] : this.STNoteField,
           create_by: this.CreateBy,
           source_name: this.SourceName,
           name: this.Name,
@@ -1062,7 +1063,7 @@
         console.log('filename', name)
         // 样本来源相关导出
         service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
-        _this.clearSearch()
+        _this.SampleType = ''
         _this.sampleExportVisible = false
       },
       exportSampleTypeInfo () {

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

@@ -26,7 +26,9 @@
             </el-dropdown>
           </el-form-item>
         </el-form>
-          <el-dropdown split-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @command="handleExportsamplesCommand">
+          <el-dropdown split-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
+                       @click="handleExportsamplesCommand('exportall')"
+                       @command="handleExportsamplesCommand">
             导出
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item style="color:black;" command="exportchosen">导出所选样本</el-dropdown-item>
@@ -569,7 +571,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
@@ -1157,7 +1159,7 @@
           d_item: this.DItem,
           equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           stnote_value: this.Stnotevalue,
-          stnote_field: this.STNoteField,
+          stnote_field: this.STNoteField == '' ? [] : this.STNoteField,
           create_by: this.CreateBy,
           source_name: this.SourceName,
           name: this.Name,
@@ -1217,8 +1219,8 @@
         const name = dateInfo + '样本来源.xlsx'
         console.log('filename', name)
         // 样本来源相关导出
-        service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', name, params)
-        _this.clearSearch()
+        service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
+        _this.SampleType = ''
         _this.sampleExportVisible = false
       },
       exportSampleTypeInfo () {