From 454c4109aa2a8b5bd7340ac0e1cf5baa26fa96e5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 12 九月 2023 14:54:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 549156e..70ccbae 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -87,15 +87,21 @@
   },
   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:{
     valueInfo:function (){
       return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]"): '鏈缃��'
@@ -160,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)){
@@ -195,11 +202,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,
@@ -242,11 +254,27 @@
           //璇存槑浼犻�掍簡鐨�
           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 + ")")
+              }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:item.template,
+                formatter:formatter,
+                sortable:item.sort,
+                hide:item.hidden,
                 search: this.options.tableConfig.queryColumns.some(qItem=>{
                   return qItem.field==item.field
                 })
@@ -277,19 +305,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]);
         }
       })
 
@@ -343,8 +371,19 @@
           }
         }
         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
+          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.data=this.data.map(item => {
+            item.data=item.data || {}
+            return {
+              ...item
+            }
+          })
           this.loading = false;
           this.selectionClear();
         }).catch(error=>{

--
Gitblit v1.9.3