From e581891072a36f0d0f7f57246366ded965e2ab8a Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期四, 25 一月 2024 10:11:17 +0800
Subject: [PATCH] 获取集团分类根节点前端传null传入后端直接改为空字符串bug修复
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 99 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 73 insertions(+), 26 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 5a94682..fc9d781 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,20 +1,48 @@
<template>
<el-container>
- <el-aside>
- <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
+ <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"></master-tree>
+ <master-tree
+ :currentPage="this.currentPage"
+ :pageSize="this.pageSize"
+ @TreeValue="TreeValueEmit"
+ @Treedata="TreedataList"
+ @codeClassifyOid="codeClassifyOidList"
+ @coderuleoid="coderuleoidList"
+ @nodeClickTemplateOids="nodeClickTem"
+ @tableDataArray="tableDataArrays"
+ @tableHeadBttoms="tableHeadBttoms"
+ @tableHeadDataFateher="tableHeadDatas"
+ @tableHeadFindData="tableHeadFindDatas"
+ @nodeClickList="nodeClickLists"
+ @total="totals"
+ @loading="loadingHandler"
+ >
+ </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"
+ :nodeClickList="this.nodeClickList"
+ @currentPage="currentPages"
+ @pageSize="pageSizes"
+ ref="vciMasterCrud"
+ >
+ </VciMasterCrud>
</el-main>
</el-container>
</template>
@@ -28,61 +56,80 @@
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: '',
+ 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;
+ },
codeClassifyOidList(val) {
this.codeClassifyOid = val;
},
coderuleoidList(val) {
this.coderuleoid = val;
},
+ TreedataList(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>
-<style scoped></style>
+<style scoped>
+
+</style>
--
Gitblit v1.9.3