From df7873019a08bf81b03c2d1a5675c2f87ff6ca9e Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 九月 2023 11:34:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue   |   15 +++++++++++----
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |    3 +++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 8422b43..66e133e 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -183,6 +183,7 @@
           label: '瀵嗙骇',
           width: 60,
           hidden: (!this.controllerSecret),
+          hide: (!this.controllerSecret),
           formatter:function (d){
             return d.secretGradeText || d.data.secretGradeText
           }
@@ -209,6 +210,8 @@
               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
               })
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 522df5b..70ccbae 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -202,10 +202,16 @@
                     message: "璇疯緭鍏�" + item.field,
                     trigger: "blur"
                   }];
-                  item.formatter=function(d){
-                    return d.field || d.data.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,
@@ -267,6 +273,8 @@
                 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
                 })
@@ -281,7 +289,6 @@
       this.params=paramsData;
     },
     setValue(){
-      console.log('纭畾')
       if(this.selectionList.length==0){
         this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
         return false;

--
Gitblit v1.9.3