From 89a21c0eecacd040e8189faeda6f73f69167cdc9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 19 六月 2023 14:51:33 +0800
Subject: [PATCH] 合并

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index b16a962..a626aee 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -301,7 +301,7 @@
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page);
       done();
     },
     currentChange(currentPage){
@@ -319,18 +319,24 @@
     },
     selectionClear() {
       this.selectionList = [];
-      this.$refs.referCrud.clearSelection();
+      this.$refs.referCrud.toggleSelection();
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
     },
-    onLoad(page, params = this.params) {
+    onLoad(page, params={}) {
       if(this.url){
         this.loading = true;
-        getList(Object.assign(params, this.query),page.currentPage, page.pageSize, this.url).then(res => {
-          debugger;
-          this.page.total = res.total;
-          this.data = res.data;
+        var query={}
+        if (this.query) {
+          for (var key in this.query) {
+            query['conditionMap["' + key + '"]'] = this.query[key];
+          }
+        }
+        getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
+          const data = res.data;
+          this.page.total = data.total;
+          this.data = data.data;
           this.loading = false;
           this.selectionClear();
         });

--
Gitblit v1.9.3