From 84b83aca7adb18249ea5bd5c7d35ced4b056c98a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 10:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index d1cf586..7bc31f2 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -5,7 +5,8 @@
                :visible.sync="visible"
                top="0"
                class="avue-dialog avue-dialog--top"
-               :width="options.width|| '80%'">
+               :width="options.width|| '80%'"
+               :height="options.height|| 'auto'">
       <avue-crud :option="option"
                  :table-loading="loading"
                  :data="data"
@@ -87,14 +88,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:{
@@ -197,11 +203,16 @@
                     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){
+                  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,
                   label: item.title,
@@ -247,12 +258,24 @@
               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,
                 label: item.title,
                 prop: item.field,
                 formatter:formatter,
+                sortable:item.sort,
+                hide:item.hidden,
                 search: this.options.tableConfig.queryColumns.some(qItem=>{
                   return qItem.field==item.field
                 })
@@ -283,19 +306,19 @@
       this.selectionList.forEach((item,_index) =>{
         if(isMutiValue){
           var valueFieldArray = _that.props.value.split(",");
-          valueFieldArray.forEach((_itemField,_indexFiel)=>{
-            value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+          valueFieldArray.forEach((_itemField,_indexField)=>{
+            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((_itemField,_indexField)=>{
-            text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+            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]);
         }
       })
 
@@ -349,13 +372,20 @@
           }
         }
         getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+          let data=[]
           if(res.data.records){
-            this.data = res.data.records
+            data = res.data.records
             this.page.total=res.data.total ;
           }else{
-            this.data = res.data.data.records;
+            data = res.data.data.records;
             this.page.total=res.data.data.total;
           }
+          this.data=data.map(item => {
+            item.data=item.data || {}
+            return {
+              ...item
+            }
+          })
           this.loading = false;
           this.selectionClear();
         }).catch(error=>{

--
Gitblit v1.9.3