Browse Source

Merge remote-tracking branch 'origin/master'

gongyb 4 years ago
parent
commit
6a7f26a59b
1 changed files with 5 additions and 6 deletions
  1. 5 6
      src/dashoo.cn/frontend_animal/src/pages/biobank/source/animal.vue

+ 5 - 6
src/dashoo.cn/frontend_animal/src/pages/biobank/source/animal.vue

@@ -878,12 +878,12 @@ export default {
       let showcolumnarr = []
       let showcolumnnamearr = []
       let id = ''
-      /* for (var i = 0; i < _this.showcolumn.length; i++) {
+      for (var i = 0; i < _this.showcolumn.length; i++) {
         if (_this.showcolumn[i].show) {
           showcolumnarr.push(_this.showcolumn[i].filed)
           showcolumnnamearr.push(_this.showcolumn[i].name.replace(/,/g, ','))
         }
-      } */
+      }
       let params = {
         currentPage: this.currentPage,
         size: this.size,
@@ -897,10 +897,9 @@ export default {
         Name: this.Name,
         AuditorStatus: this.AuditorStatus,
         AuditorName: this.AuditorName,
-        showcolumnarr: showcolumnarr + '',
-        showcolumnnamearr: showcolumnnamearr + '',
-        ExportFlag: 'stored',
-        Type: 'SampleType'
+        showColumn: showcolumnarr + '',
+        showColumnName: showcolumnnamearr + '',
+        Type: 'SampleSource'
       }
       /*    if (this.CreateOn && this.CreateOn.length === 2) {
         let params2 = {