From 379317b8221ff63fffccb78ebc01b8858d75a4de Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 12 十月 2023 10:39:32 +0800
Subject: [PATCH] 主数据-排序字段不一致Bug

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |    9 ++++++---
 Source/UBCS-WEB/src/components/Master/MasterTree.vue        |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 735ac38..a620696 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -149,7 +149,7 @@
           List.forEach(item => {
             let columnItem = {
               label: item.title,
-              prop: item.field,
+              prop: item.queryField,
               // type: this.columnType[item.type],
               sortable: item.sort,
               width: item.minWidth
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 61ebc48..e3a85a7 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -319,8 +319,9 @@
     },
     tableHeadFindData: {
       handler(newval, oldval) {
+        console.log('new',newval)
         newval.forEach((record, _index) => {
-          if (record.field == 'id' && validatenull(record.templet)) {
+          if (record.queryField == 'id' && validatenull(record.templet)) {
             //浼佷笟缂栫爜鐨勯粯璁ゆ坊鍔犺秴閾炬帴,鏆傛湭瀹炵幇
             record.formatter = '';
           } else {
@@ -335,10 +336,11 @@
           }
 
           if (_index == 0) {
-            this.keyWordFind = record.field
+            this.keyWordFind = record.queryField
           }
         })
         this.tableHeadFindDatas = newval;
+        // console.log('new',newval)
         this.WupinFindValue = ''
       },
     },
@@ -677,7 +679,7 @@
           this.List.forEach((item) => {
             let columnItem = {
               label: item.title,
-              prop: item.field,
+              prop: item.queryField,
               type: this.columnType[item.type],
               sortable: item.sort,
               width: item.minWidth,
@@ -705,6 +707,7 @@
     },
     // 鎺掑簭
     sortChange(val) {
+      console.log(val)
       this.isLoading = true;
       let order = "";
       if (val.order == "ascending") {

--
Gitblit v1.9.3