From c0e4323f851c5216d1b020bc4177a8566e77bfd2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 30 十一月 2023 18:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index be13f12..c0a80c0 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,20 +1,46 @@
 <template>
   <el-container>
-    <el-aside>
-      <basic-container style="overflow: hidden;">
+    <el-aside style="width:250px">
+      <basic-container>
         <!--          鏍戠粍浠�-->
-        <master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize"
-          :currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas"
-          @tableHeadBttoms="tableHeadBttoms" @total="totals" @nodeClick="nodeClick"
-          @tableHeadFindData="tableHeadFindDatas" @Treedata="TreedataList"></master-tree>
+        <master-tree
+          :currentPage="this.currentPage"
+          :pageSize="this.pageSize"
+          @TreeValue="TreeValueEmit"
+          @Treedata="TreedataList"
+          @codeClassifyOid="codeClassifyOidList"
+          @coderuleoid="coderuleoidList"
+          @nodeClick="nodeClick"
+          @tableDataArray="tableDataArrays"
+          @tableHeadBttoms="tableHeadBttoms"
+          @tableHeadDataFateher="tableHeadDatas"
+          @tableHeadFindData="tableHeadFindDatas"
+          @nodeClickList="nodeClickLists"
+          @total="totals"
+        >
+        </master-tree>
       </basic-container>
     </el-aside>
     <el-main>
       <!--        琛ㄦ牸缁勪欢-->
-      <VciMasterCrud :page="this.page" :codeClassifyOid="this.codeClassifyOid" :coderuleoid="this.coderuleoid"
-        @pageSize="pageSizes" @currentPage="currentPages" :tableDataArray="tableDataArray" :total="this.total"
-        :tableHeadDataFateher="this.tableHeadDataFateher" :isLoading="isLoading" :templateOid="templateOid"
-        :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList" :Treedata="Treedata"></VciMasterCrud>
+      <VciMasterCrud
+        :TreeValue="TreeValue"
+        :Treedata="Treedata"
+        :codeClassifyOid="this.codeClassifyOid"
+        :coderuleoid="this.coderuleoid"
+        :isLoading="isLoading"
+        :page="this.page"
+        :tableDataArray="tableDataArray"
+        :tableHeadBtnData="masterVrBtnList"
+        :tableHeadDataFateher="this.tableHeadDataFateher"
+        :tableHeadFindData="tableHeadFindData"
+        :templateOid="templateOid"
+        :total="this.total"
+        :nodeClickList="this.nodeClickList"
+        @currentPage="currentPages"
+        @pageSize="pageSizes"
+      >
+      </VciMasterCrud>
     </el-main>
   </el-container>
 </template>
@@ -35,27 +61,35 @@
       currentPage: "1",
       codeClassifyOid: "",
       coderuleoid: "",
-      Treedata:[],
+      Treedata: [],
       templateOid: "",
       tableDataArray: [],
       masterVrBtnList: [],
       tableHeadDataFateher: [],
       total: "",
       isLoading: false,
-      tableHeadFindData: {}
+      tableHeadFindData: {},
+      TreeValue: '',
+      nodeClickList:[]
     }
   },
   created() {
   },
   methods: {
+    nodeClickLists(val){
+      this.nodeClickList=val;
+    },
+    TreeValueEmit(val) {
+      this.TreeValue = val
+    },
     codeClassifyOidList(val) {
       this.codeClassifyOid = val;
     },
     coderuleoidList(val) {
       this.coderuleoid = val;
     },
-    TreedataList(val){
-      this.Treedata=val
+    TreedataList(val) {
+      this.Treedata = val
     },
     pageSizes(val) {
       this.pageSize = val
@@ -90,10 +124,5 @@
 </script>
 
 <style scoped>
-.el-aside {
-  height: calc(100% - 30px);
-}
-.el-main {
-  height: calc(100% - 30px);
-}
+
 </style>

--
Gitblit v1.9.3