From a19d26e88360c9760b2286bac4dfb1710fd2fa21 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 12 八月 2023 13:33:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 5a94682..1745425 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,12 +1,12 @@
<template>
<el-container>
<el-aside>
- <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
+ <basic-container style="overflow: hidden;">
<!-- 鏍戠粍浠�-->
<master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize"
:currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas"
@tableHeadBttoms="tableHeadBttoms" @total="totals" @nodeClick="nodeClick"
- @tableHeadFindData="tableHeadFindDatas"></master-tree>
+ @tableHeadFindData="tableHeadFindDatas" @Treedata="TreedataList"></master-tree>
</basic-container>
</el-aside>
<el-main>
@@ -14,7 +14,7 @@
<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"></VciMasterCrud>
+ :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList" :Treedata="Treedata"></VciMasterCrud>
</el-main>
</el-container>
</template>
@@ -35,6 +35,7 @@
currentPage: "1",
codeClassifyOid: "",
coderuleoid: "",
+ Treedata:[],
templateOid: "",
tableDataArray: [],
masterVrBtnList: [],
@@ -52,6 +53,9 @@
},
coderuleoidList(val) {
this.coderuleoid = val;
+ },
+ TreedataList(val){
+ this.Treedata=val
},
pageSizes(val) {
this.pageSize = val
@@ -85,4 +89,11 @@
}
</script>
-<style scoped></style>
+<style scoped>
+.el-aside {
+ height: calc(100% - 30px);
+}
+.el-main {
+ height: calc(100% - 30px);
+}
+</style>
--
Gitblit v1.9.3