From ec3add985f600fe56a7232484bbe89a11b73c23b Mon Sep 17 00:00:00 2001
From: wanghong <309858992@qq.com>
Date: 星期四, 21 十二月 2023 12:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index f84b48b..fc9d781 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,7 +1,7 @@
<template>
<el-container>
- <el-aside>
- <basic-container style="overflow: hidden;">
+ <el-aside style="width:250px">
+ <basic-container>
<!-- 鏍戠粍浠�-->
<master-tree
:currentPage="this.currentPage"
@@ -10,13 +10,14 @@
@Treedata="TreedataList"
@codeClassifyOid="codeClassifyOidList"
@coderuleoid="coderuleoidList"
- @nodeClick="nodeClick"
+ @nodeClickTemplateOids="nodeClickTem"
@tableDataArray="tableDataArrays"
@tableHeadBttoms="tableHeadBttoms"
@tableHeadDataFateher="tableHeadDatas"
@tableHeadFindData="tableHeadFindDatas"
@nodeClickList="nodeClickLists"
@total="totals"
+ @loading="loadingHandler"
>
</master-tree>
</basic-container>
@@ -39,6 +40,7 @@
:nodeClickList="this.nodeClickList"
@currentPage="currentPages"
@pageSize="pageSizes"
+ ref="vciMasterCrud"
>
</VciMasterCrud>
</el-main>
@@ -78,9 +80,15 @@
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
+ this.TreeValue = val;
},
codeClassifyOidList(val) {
this.codeClassifyOid = val;
@@ -89,36 +97,35 @@
this.coderuleoid = val;
},
TreedataList(val) {
- this.Treedata = 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>
--
Gitblit v1.9.3