瀏覽代碼

样本管理 已存储样本 自定义查询 样本来源基础字段bug修改

gongyb 4 年之前
父節點
當前提交
8c42cb303e

文件差異過大導致無法顯示
+ 52 - 904
src/dashoo.cn/frontend_animal/src/components/samples/samplesearchdialog.vue


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

@@ -767,16 +767,16 @@
       },
       // ----------------------------------------------------------------
       // 自定义查询
-      handleSearchCommand (command) {
+      /* handleSearchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         } else if (command == '编辑') {
-          /* this.searchDialogVisible = true
+          /!* this.searchDialogVisible = true
           this.searchcolumn = this.showcolumn.filter(function (e) {
             return e.filed != "Location"
-          }) */
+          }) *!/
           this.$refs.samplesearchdialog.creatpage()
           this.$refs.samplesearchdialog.samplesearchdialogVisable = true
         } else {
@@ -787,6 +787,41 @@
           store.set('samplearchivedseach', searchmodel)
           this.searchWithTemplate(command)
         }
+      }, */
+      handleSearchCommand (command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        } else if (command == '编辑') {
+          // this.$refs.customsearchdialog.creatpage()
+          // this.$refs.customsearchdialog.customsearchdialogVisable = true
+          // this.searchcolumn = this.showcolumn.filter(function (e) {
+          //   return e.filed !== 'PositionInfo'
+          // })
+
+          /*          this.searchDialogVisible = true
+            this.searchcolumn = this.showcolumn.filter(function (e) {
+              return e.filed != "Location"
+            }) */
+
+          this.$refs.samplesearchdialog.creatpage()
+          this.$refs.samplesearchdialog.samplesearchdialogVisable = true
+        } else {
+          let params = {
+            currentPage: 1,
+            size: 200,
+            template: command,
+            isDelete: 0,
+            type: 'Sample'
+          }
+          console.log(params)
+          service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'SampleSearchByTemplate', params).then(res => {
+            this.donorsList = res.data.list
+            this.currentItemCount = res.data.total
+          })
+          this.currentSearchTemplate = command
+        }
       },
       // 添加自定义搜索
       addSearchTab (name) {

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

@@ -826,19 +826,33 @@
         } else if (command == 'clear') {
           this.clearSearch()
         } else if (command == '编辑') {
-          /* this.searchDialogVisible = true
-          this.searchcolumn = this.showcolumn.filter(function (e) {
-            return e.filed != 'Location'
-          }) */
+          // this.$refs.customsearchdialog.creatpage()
+          // this.$refs.customsearchdialog.customsearchdialogVisable = true
+          // this.searchcolumn = this.showcolumn.filter(function (e) {
+          //   return e.filed !== 'PositionInfo'
+          // })
+
+          /*          this.searchDialogVisible = true
+            this.searchcolumn = this.showcolumn.filter(function (e) {
+              return e.filed != "Location"
+            }) */
+
           this.$refs.samplesearchdialog.creatpage()
           this.$refs.samplesearchdialog.samplesearchdialogVisable = true
         } else {
-          this.currentSearchTemplate = command
-          let searchmodel = {
-            searchWithTemplate: command
+          let params = {
+            currentPage: 1,
+            size: 200,
+            template: command,
+            isDelete: 0,
+            type: 'Sample'
           }
-          store.set('sampleprerecordedseach', searchmodel)
-          this.searchWithTemplate(command)
+          console.log(params)
+          service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'SampleSearchByTemplate', params).then(res => {
+            this.donorsList = res.data.list
+            this.currentItemCount = res.data.total
+          })
+          this.currentSearchTemplate = command
         }
       },
       // 添加自定义搜索

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

@@ -1374,7 +1374,7 @@
             type: 'Sample'
           }
           console.log(params)
-          service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'SearchByTemplate', params).then(res => {
+          service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'SampleSearchByTemplate', params).then(res => {
             this.donorsList = res.data.list
             this.currentItemCount = res.data.total
           })

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

@@ -643,19 +643,33 @@
         } else if (command == 'clear') {
           this.clearSearch()
         } else if (command == '编辑') {
-        /*  this.searchDialogVisible = true
-          this.searchcolumn = this.showcolumn.filter(function (e) {
-            return e.filed != "Location"
-          }) */
+          // this.$refs.customsearchdialog.creatpage()
+          // this.$refs.customsearchdialog.customsearchdialogVisable = true
+          // this.searchcolumn = this.showcolumn.filter(function (e) {
+          //   return e.filed !== 'PositionInfo'
+          // })
+
+          /*          this.searchDialogVisible = true
+            this.searchcolumn = this.showcolumn.filter(function (e) {
+              return e.filed != "Location"
+            }) */
+
           this.$refs.samplesearchdialog.creatpage()
           this.$refs.samplesearchdialog.samplesearchdialogVisable = true
         } else {
-          this.currentSearchTemplate = command
-          let searchmodel = {
-            searchWithTemplate: command
+          let params = {
+            currentPage: 1,
+            size: 200,
+            template: command,
+            isDelete: 0,
+            type: 'Sample'
           }
-          store.set('samplewaitstoreseach', searchmodel)
-          this.searchWithTemplate(command)
+          console.log(params)
+          service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'SampleSearchByTemplate', params).then(res => {
+            this.donorsList = res.data.list
+            this.currentItemCount = res.data.total
+          })
+          this.currentSearchTemplate = command
         }
       },
       // 添加自定义搜索

部分文件因文件數量過多而無法顯示