3 Commits 8582fe4cf1 ... 10ba7366ed

Autor SHA1 Mensaje Fecha
  gongyb 10ba7366ed 修复样本导出 导出按钮会全部置空的bug hace 4 años
  gongyb 51daf3a26e Merge remote-tracking branch 'origin/master' hace 4 años
  gongyb b59097a6aa 修复样本导出 导出按钮会全部置空的bug hace 4 años

+ 8 - 8
src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

@@ -333,10 +333,10 @@ export default {
         name: '并且',
         value: 'and'
       },
-        {
-          name: '或者',
-          value: 'or'
-        }
+      {
+        name: '或者',
+        value: 'or'
+      }
       ],
       searchTableData: [],
       searchcolumn: [], // 搜索列
@@ -565,7 +565,7 @@ export default {
         .then(res => {
           this.EquipmentList = res.data
         })
-      /*this.$refs.multipleTable.doLayout()*/
+      /* this.$refs.multipleTable.doLayout() */
       // 获取样本扩展列表
       service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
         .then(res => {
@@ -578,7 +578,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
@@ -1154,7 +1154,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,
@@ -1215,7 +1215,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 () {

+ 2 - 2
src/dashoo.cn/frontend_animal/src/pages/samples/prerecorded/index.vue

@@ -776,7 +776,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,
@@ -838,7 +838,7 @@
         console.log('filename', name)
         // 样本来源相关导出
         service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
-        _this.clearSearch()
+        _this.SampleType = ''
         _this.sampleExportVisible = false
       },
       exportSampleTypeInfo () {

+ 4 - 3
src/dashoo.cn/frontend_animal/src/pages/samples/stored/index.vue

@@ -1000,7 +1000,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,
@@ -1059,8 +1059,9 @@
         const name = dateInfo + '样本来源.xlsx'
         console.log('filename', name)
         // 样本来源相关导出
-        service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel', params)
-        _this.clearSearch()
+        service.downloadExcel('dashoo.biobank.bee-0.1', 'SampleRelated', 'ExportExcel'
+          , params)
+        _this.SampleType = ''
         _this.sampleExportVisible = false
       },
       exportSampleTypeInfo () {

+ 4 - 4
src/dashoo.cn/frontend_animal/src/pages/samples/waitingstore/index.vue

@@ -567,7 +567,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
@@ -1155,7 +1155,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,
@@ -1215,8 +1215,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 () {