From 1784bf06d86bdb6217ea7015189bc382edd3702e Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 10:06:38 +0800
Subject: [PATCH] 整合代码

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |    3 +--
 Source/UBCS-WEB/src/views/MasterData/items.vue              |   26 +++++++++++---------------
 Source/UBCS-WEB/src/components/Master/MasterTree.vue        |    5 ++++-
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index b34e705..6e77ae6 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -47,6 +47,7 @@
       CloneTreeAvueform: {},
       loading: false,
       Treedata: [],
+      isLoading: false,
       nodeClickList: "",
       Treeoption: {
         addBtn: false,
@@ -147,12 +148,14 @@
     },
     //琛ㄦ牸鍒锋柊
     TableRend() {
+      this.isLoading = true;
       TableData({
         templateOid: this.templateOids,
         codeClassifyOid: this.nodeClickList.oid,
         page: this.currentPage,
         limit: this.pageSize,
       }).then(res => {
+        this.isLoading = false;
         this.tableDataArray = res.data.data;
         this.$emit('tableDataArray', this.tableDataArray)
         this.$emit('total', res.data.total)
@@ -209,7 +212,7 @@
         this.tableHeadFindData = []
         await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend()
         this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
-        this.$emit('nodeClick', this.templateOids)
+        this.$emit('nodeClickTemplateOids', this.templateOids)
         this.$emit("codeClassifyOid", this.nodeClickList.oid)
         this.$emit("nodeClickList", this.nodeClickList)
       } catch (error) {
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index f8c075c..5e2b8cb 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -408,7 +408,7 @@
       handler(newval, oldval) {
         this.tableData = newval;
         this.searchResults = newval
-        this.doLayout()
+        this.doLayout();
       },
     },
     tableHeadFindData: {
@@ -565,7 +565,6 @@
     },
     //闆嗗洟鐮佸鍑�
     excelGroupCode(){
-      debugger
       this.isLoading = true;
       exportGroupCodeExcel({
         codeClassifyOid: this.codeClassifyOid,
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index c0a80c0..9398d41 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -10,7 +10,7 @@
           @Treedata="TreedataList"
           @codeClassifyOid="codeClassifyOidList"
           @coderuleoid="coderuleoidList"
-          @nodeClick="nodeClick"
+          @nodeClickTemplateOids="nodeClickTem"
           @tableDataArray="tableDataArrays"
           @tableHeadBttoms="tableHeadBttoms"
           @tableHeadDataFateher="tableHeadDatas"
@@ -80,7 +80,7 @@
       this.nodeClickList=val;
     },
     TreeValueEmit(val) {
-      this.TreeValue = val
+      this.TreeValue = val;
     },
     codeClassifyOidList(val) {
       this.codeClassifyOid = val;
@@ -89,35 +89,31 @@
       this.coderuleoid = val;
     },
     TreedataList(val) {
-      this.Treedata = val
+      this.Treedata = val;
     },
     pageSizes(val) {
-      this.pageSize = val
+      this.pageSize = val;
     },
     currentPages(val) {
-      this.currentPage = val
+      this.currentPage = val;
     },
     tableDataArrays(val) {
-      this.tableDataArray = val
+      this.tableDataArray = val;
     },
     totals(val) {
-      this.total = val
+      this.total = val;
     },
     tableHeadDatas(val) {
-      this.tableHeadDataFateher = val
+      this.tableHeadDataFateher = val;
     },
     tableHeadFindDatas(val) {
-      this.tableHeadFindData = val
+      this.tableHeadFindData = val;
     },
-    nodeClick(val) {
+    nodeClickTem(val) {
       this.templateOid = val;
-      this.isLoading = true;
-      setTimeout(() => {
-        this.isLoading = false;
-      }, 2000);
     },
     tableHeadBttoms(val) {
-      this.masterVrBtnList = val
+      this.masterVrBtnList = val;
     },
   }
 }

--
Gitblit v1.9.3