From 8616910b789f2614a3532b1da0c91e819e0dabed Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 11 九月 2023 14:44:05 +0800
Subject: [PATCH] 参照数据显示

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue   |   23 +++++++++--
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |   36 ++++++++++++++++--
 Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue    |   26 +++++++++++-
 3 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 727d79a..8422b43 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -158,22 +158,34 @@
           label: '鑻辨枃鍚嶇О',
           sortable: true,
           width: 150,
-          search: true
+          search: true,
+          formatter:function (d){
+            return d.id || d.data.id
+          }
         }, {
           prop: 'name',
           label: '涓枃鍚嶇О',
           sortable: true,
           width: 150,
-          search: true
+          search: true,
+          formatter:function (d){
+            return d.name || d.data.name
+          }
         }, {
           prop: 'description',
           label: '鎻忚堪',
-          width: 250
+          width: 250,
+          formatter:function (d){
+            return d.description || d.data.description
+          }
         }, {
           prop: 'secretGradeText',
           label: '瀵嗙骇',
           width: 60,
-          hidden: (!this.controllerSecret)
+          hidden: (!this.controllerSecret),
+          formatter:function (d){
+            return d.secretGradeText || d.data.secretGradeText
+          }
         }];
       } else {
         this.option.column = this.options.tableConfig.cols.map(item => {
@@ -181,6 +193,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,
@@ -295,6 +317,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=>{
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 93ed5ef..522df5b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -202,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,
@@ -252,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,
@@ -362,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=>{
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
index 3000eba..16756d9 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
@@ -123,10 +123,23 @@
       this.params=queryParams;
 
     },
-    getTree(){
-      getTree(this.params,this.treeUrl).then(res => {
-          this.treeData=res.data
+    getTree() {
+      getTree(this.params, this.treeUrl).then(res => {
+        res.data.map(item => {
+          if (!item.attribute) {
+            item.attribute = {
+              data: {}
+            }
+          } else {
+            item.attribute.data = item.attribute.data || {}
+          }
+          return {
+            ...item,
+            leaf: !item.hasChildren
+          }
         })
+        this.treeData = res.data
+      })
     },
     treeLoad: function (treeNode, resolve) {
       const parentOid = (treeNode.level === 0) ? 0 : treeNode.data.oid;
@@ -142,6 +155,13 @@
       }
       getLazyTree(this.params,this.treeUrl).then(res => {
         resolve(res.data.data.map(item => {
+          if(!item.attribute){
+            item.attribute={
+              data:{}
+            }
+          }else{
+            item.attribute.data=item.attribute.data || {}
+          }
           return {
             ...item,
             leaf: !item.hasChildren

--
Gitblit v1.9.3