From e90fea95905f523d278c7e10a181ddbc47e74c2b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 15:44:58 +0800
Subject: [PATCH] 集成日志bug

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

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 1572cf6..d1cf586 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -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>
@@ -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){
@@ -94,6 +96,7 @@
       this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
     }
   },
+
   computed:{
     valueInfo:function (){
       return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]"): '鏈缃��'
@@ -158,6 +161,7 @@
       if(this.options.displayTable){
         //璇存槑鏄娇鐢ㄥ钩鍙扮殑琛ㄦ牸
         getTableDefinedUrl({btmType:(this.options.referBo||this.options.referType),code:this.options.displayTable,isMuti:this.isMuti},this.tableDefinedUrl).then(result => {
+          console.log('result',result)
           if(result.success){
             var queryScheme = result.querySchema;
             if(!validatenull(queryScheme) && validatenull(this.options.queryScheme)){
@@ -240,12 +244,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
+                })
               }
             }
           })
@@ -273,7 +283,7 @@
       this.selectionList.forEach((item,_index) =>{
         if(isMutiValue){
           var valueFieldArray = _that.props.value.split(",");
-          valueFieldArray.forEach((_indexField,_itemField)=>{
+          valueFieldArray.forEach((_itemField,_indexFiel)=>{
             value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
           })
         }else {
@@ -281,7 +291,7 @@
         }
         if(isMutiRaw) {
           var rawFieldArray = _that.props.label.split(",");
-          rawFieldArray.forEach((_indexField,_itemField)=>{
+          rawFieldArray.forEach((_itemField,_indexField)=>{
             text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
           })
         }else{
@@ -291,7 +301,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 +319,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) {
@@ -334,8 +349,13 @@
           }
         }
         getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
-          this.data = res.data;
-          this.page.total=res.total
+          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=>{

--
Gitblit v1.9.3