From df4dd05a63b8253f5556d34aeeab8c3b66dc783b Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 11:47:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index a626aee..4551c28 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){
@@ -240,12 +242,18 @@
           //璇存槑浼犻�掍簡鐨�
           this.option.column= this.options.tableConfig.cols.map(item => {
             if (item.field != 'LAY_TABLE_INDEX' && item.field != 'LAY_CHECKED') {
+              let formatter=item.template || item.templet;
+              if(typeof formatter == "string" && formatter !=''){
+                formatter=eval("(" + formatter + ")")
+              }
               return {
                 ...item,
                 label: item.title,
                 prop: item.field,
-                formatter:item.template,
-                search: true
+                formatter:formatter,
+                search: this.options.tableConfig.queryColumns.some(qItem=>{
+                  return qItem.field==item.field
+                })
               }
             }
           })
@@ -291,7 +299,7 @@
 
       this.value=value.join(',');
       this.text=text.join(',')
-      this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList});
+      this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:this.referConfig.fieldMap});
       this.visible=false;
     },
     searchReset() {
@@ -309,6 +317,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) {
@@ -333,12 +346,19 @@
             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;
+        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+          if(res.data.records){
+            this.data = res.data.records
+            this.page.total=res.data.total ;
+          }else{
+            this.data = res.data.data.records;
+            this.page.total=res.data.data.total;
+          }
           this.loading = false;
           this.selectionClear();
+        }).catch(error=>{
+          this.$message.error(error);
+          this.loading = false;
         });
       }
 

--
Gitblit v1.9.3