From 97480831ac23a506b5f98fe357ae6246939ae6cd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 22 八月 2023 23:55:58 +0800
Subject: [PATCH] 本地提交

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

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index b16a962..cc0b644 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -5,7 +5,7 @@
                :visible.sync="visible"
                top="0"
                class="avue-dialog avue-dialog--top"
-               :width="referConfig.options.width|| '80%'">
+               :width="options.width|| '80%'">
       <avue-crud :option="option"
                  :table-loading="loading"
                  :data="data"
@@ -15,6 +15,7 @@
                  @search-change="searchChange"
                  @search-reset="searchReset"
                  @selection-change="selectionChange"
+                 @row-click="rowClick"
                  @current-change="currentChange"
                  @size-change="sizeChange"
                  @refresh-change="refreshChange"
@@ -24,7 +25,7 @@
         </template>
       </avue-crud>
       <div class="avue-dialog__footer">
-        <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }}</div>
+        <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }} </div>
         <el-button @click="visible=false">鍙� 娑�</el-button>
         <el-button @click="setValue" type="primary">纭� 瀹�</el-button>
       </div>
@@ -45,7 +46,7 @@
   data() {
     return {
       visible: false,
-      options: this.referConfig.options,
+      options: this.referConfig.options || {},
       isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
       props: {
         value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
@@ -75,6 +76,7 @@
         border: true,
         index: true,
         selection: true,
+        reserveSelection:true,
         dialogClickModal: false,
         highlightCurrentRow: true,
         rowKey:'oid',
@@ -85,8 +87,8 @@
   },
   created() {
     this.getParams();
-    console.log('referConfig:')
-    console.log(this.referConfig)
+    // console.log('referConfig:')
+    // console.log(this.referConfig)
   },
   mounted() {
     if(this.referConfig.options.page){
@@ -245,7 +247,9 @@
                 label: item.title,
                 prop: item.field,
                 formatter:item.template,
-                search: true
+                search: this.options.tableConfig.queryColumns.some(qItem=>{
+                  return qItem.field==item.field
+                })
               }
             }
           })
@@ -301,7 +305,7 @@
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page);
       done();
     },
     currentChange(currentPage){
@@ -309,6 +313,11 @@
     },
     sizeChange(pageSize){
       this.page.pageSize = pageSize;
+    },
+    rowClick (row) {
+      this.$refs.referCrud.toggleSelection();
+      this.$refs.referCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+      this.selectionList=[row]
     },
     selectionChange(list) {
       if (!this.isMuti && list.length > 1) {
@@ -319,20 +328,28 @@
     },
     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,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+          this.data = res.data.records;
+          this.page.total=res.data.total
           this.loading = false;
           this.selectionClear();
+        }).catch(error=>{
+          this.$message.error(error);
+          this.loading = false;
         });
       }
 

--
Gitblit v1.9.3