From 2bfad65f3f4ed0282f53e3ae01fc10c879a734bc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 10:03:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index e3b674b..49816c3 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -3,18 +3,42 @@
<el-aside>
<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>
+ <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"
+ @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"></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"
+ @currentPage="currentPages"
+ @pageSize="pageSizes"
+ >
+ </VciMasterCrud>
</el-main>
</el-container>
</template>
@@ -28,30 +52,38 @@
page: {
total: 0,
currentPage: 1,
- pageSize: 10,
+ pageSize: 100,
pageSizes: [10, 30, 50, 100, 200],
},
- pageSize: "10",
+ pageSize: "100",
currentPage: "1",
codeClassifyOid: "",
coderuleoid: "",
+ Treedata: [],
templateOid: "",
tableDataArray: [],
masterVrBtnList: [],
tableHeadDataFateher: [],
total: "",
isLoading: false,
- tableHeadFindData: {}
+ tableHeadFindData: {},
+ TreeValue: ''
}
},
created() {
},
methods: {
+ TreeValueEmit(val) {
+ this.TreeValue = val
+ },
codeClassifyOidList(val) {
this.codeClassifyOid = val;
},
coderuleoidList(val) {
this.coderuleoid = val;
+ },
+ TreedataList(val) {
+ this.Treedata = val
},
pageSizes(val) {
this.pageSize = val
@@ -86,10 +118,5 @@
</script>
<style scoped>
-.el-aside {
- height: calc(100% - 30px);
-}
-.el-main {
- height: calc(100% - 30px);
-}
+
</style>
--
Gitblit v1.9.3