From 02d6ac5bc723b3001d559a87eb8959f6e0e2abba Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 07 十一月 2023 10:37:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/views/MasterData/items.vue | 52 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 14 deletions(-) diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue index 83996ca..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" @Treedata="TreedataList" @TreeValue="TreeValueEmit"></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" :Treedata="Treedata" :TreeValue="TreeValue"></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> @@ -35,7 +59,7 @@ currentPage: "1", codeClassifyOid: "", coderuleoid: "", - Treedata:[], + Treedata: [], templateOid: "", tableDataArray: [], masterVrBtnList: [], @@ -43,14 +67,14 @@ total: "", isLoading: false, tableHeadFindData: {}, - TreeValue:'' + TreeValue: '' } }, created() { }, methods: { - TreeValueEmit(val){ - this.TreeValue=val + TreeValueEmit(val) { + this.TreeValue = val }, codeClassifyOidList(val) { this.codeClassifyOid = val; @@ -58,8 +82,8 @@ coderuleoidList(val) { this.coderuleoid = val; }, - TreedataList(val){ - this.Treedata=val + TreedataList(val) { + this.Treedata = val }, pageSizes(val) { this.pageSize = val -- Gitblit v1.9.3