From ec3add985f600fe56a7232484bbe89a11b73c23b Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期四, 21 十二月 2023 12:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/MasterData/items.vue |   49 +++++++++++++++++++++++++++++++------------------
 1 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 49816c3..fc9d781 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container>
-    <el-aside>
-      <basic-container style="overflow: hidden;">
+    <el-aside style="width:250px">
+      <basic-container>
         <!--          鏍戠粍浠�-->
         <master-tree
           :currentPage="this.currentPage"
@@ -10,12 +10,14 @@
           @Treedata="TreedataList"
           @codeClassifyOid="codeClassifyOidList"
           @coderuleoid="coderuleoidList"
-          @nodeClick="nodeClick"
+          @nodeClickTemplateOids="nodeClickTem"
           @tableDataArray="tableDataArrays"
           @tableHeadBttoms="tableHeadBttoms"
           @tableHeadDataFateher="tableHeadDatas"
           @tableHeadFindData="tableHeadFindDatas"
+          @nodeClickList="nodeClickLists"
           @total="totals"
+          @loading="loadingHandler"
         >
         </master-tree>
       </basic-container>
@@ -35,8 +37,10 @@
         :tableHeadFindData="tableHeadFindData"
         :templateOid="templateOid"
         :total="this.total"
+        :nodeClickList="this.nodeClickList"
         @currentPage="currentPages"
         @pageSize="pageSizes"
+        ref="vciMasterCrud"
       >
       </VciMasterCrud>
     </el-main>
@@ -67,14 +71,24 @@
       total: "",
       isLoading: false,
       tableHeadFindData: {},
-      TreeValue: ''
+      TreeValue: '',
+      nodeClickList:[]
     }
   },
   created() {
   },
   methods: {
+    nodeClickLists(val){
+      this.nodeClickList=val;
+      // 鐐瑰嚮鏍戣妭鐐规椂閲嶇疆褰撳墠椤靛拰椤垫暟
+      this.page.pageSize = 100;
+      this.page.currentPage = 1;
+      // 閲嶇疆淇濆瓨鐨勯珮绾ф煡璇㈡煡璇㈡潯浠跺拰蹇�熸煡璇㈡潯浠�
+      const childComponent = this.$refs.vciMasterCrud;
+      childComponent.conditionMap = {}; // 淇敼瀛愮粍浠剁殑data涓殑灞炴��
+    },
     TreeValueEmit(val) {
-      this.TreeValue = val
+      this.TreeValue = val;
     },
     codeClassifyOidList(val) {
       this.codeClassifyOid = val;
@@ -83,36 +97,35 @@
       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;
     },
+    loadingHandler(val) {
+      this.isLoading = val;
+    }
   }
 }
 </script>

--
Gitblit v1.9.3