From 36eb2ab2a0c61455c8cc12788b304c02381fd292 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 11 九月 2023 23:03:21 +0800
Subject: [PATCH] 代码提交

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

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index cec6ded..522df5b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -87,14 +87,19 @@
   },
   created() {
     this.getParams();
+
     // console.log('referConfig:')
     // console.log(this.referConfig)
   },
   mounted() {
+    console.log('referrTable')
     if(this.referConfig.options.page){
       this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
       this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
     }
+    this.$nextTick(() => {
+      this.$refs.referCrud.doLayout()
+    })
   },
 
   computed:{
@@ -161,6 +166,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)){
@@ -196,10 +202,9 @@
                     message: "璇疯緭鍏�" + item.field,
                     trigger: "blur"
                   }];
-                  /*item.formatter=function(d,thisItem){
-                    var vciWebComboxStore = layui.vciWebComboxStore;
-                    return vciWebComboxStore.getComboxText(thisItem.enumCode,d[thisItem.field]);
-                  };*/
+                  item.formatter=function(d){
+                    return d.field || d.data.field
+                  };
                 }
                 return {
                   ...item,
@@ -246,6 +251,16 @@
               let formatter=item.template || item.templet;
               if(typeof formatter == "string" && formatter !=''){
                 formatter=eval("(" + formatter + ")")
+              }else{
+                formatter=function (d){
+                  if(d[item.field]!=undefined){
+                    return d[item.field]
+                  }else if(d.data[item.field] !=undefined){
+                    return d.data[item.field]
+                  }else {
+                    return ''
+                  }
+                }
               }
               return {
                 ...item,
@@ -266,6 +281,7 @@
       this.params=paramsData;
     },
     setValue(){
+      console.log('纭畾')
       if(this.selectionList.length==0){
         this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
         return false;
@@ -282,19 +298,19 @@
       this.selectionList.forEach((item,_index) =>{
         if(isMutiValue){
           var valueFieldArray = _that.props.value.split(",");
-          valueFieldArray.forEach((_indexField,_itemField)=>{
-            value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+          valueFieldArray.forEach((_itemField,_indexFiel)=>{
+            value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
           })
         }else {
-          value.push(item[_that.props.value]);
+          value.push(item[_that.props.value] || item['data'][_that.props.value]);
         }
         if(isMutiRaw) {
           var rawFieldArray = _that.props.label.split(",");
-          rawFieldArray.forEach((_indexField,_itemField)=>{
-            text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+          rawFieldArray.forEach((_itemField,_indexField)=>{
+            text.push((item[_itemField] || item['data'][_itemField]) + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
           })
         }else{
-          text.push(item[_that.props.label]);
+          text.push(item[_that.props.label] || item['data'][_that.props.label]);
         }
       })
 
@@ -355,6 +371,12 @@
             this.data = res.data.data.records;
             this.page.total=res.data.data.total;
           }
+          this.data=this.data.map(item => {
+            item.data=item.data || {}
+            return {
+              ...item
+            }
+          })
           this.loading = false;
           this.selectionClear();
         }).catch(error=>{

--
Gitblit v1.10.0