From dedbadd96ab7e1533572b25511fd201678c64dad Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index d87f292..f969265 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,5 +1,5 @@
<template>
- <el-container v-loading="isLoading">
+ <el-container>
<el-aside style="width:250px">
<basic-container>
<!-- 鏍戠粍浠�-->
@@ -10,14 +10,14 @@
@Treedata="TreedataList"
@codeClassifyOid="codeClassifyOidList"
@coderuleoid="coderuleoidList"
+ @loading="loadingHandler"
+ @nodeClickList="nodeClickLists"
@nodeClickTemplateOids="nodeClickTem"
@tableDataArray="tableDataArrays"
@tableHeadBttoms="tableHeadBttoms"
@tableHeadDataFateher="tableHeadDatas"
@tableHeadFindData="tableHeadFindDatas"
- @nodeClickList="nodeClickLists"
@total="totals"
- :isLoading="isLoading"
>
</master-tree>
</basic-container>
@@ -25,11 +25,13 @@
<el-main>
<!-- 琛ㄦ牸缁勪欢-->
<VciMasterCrud
+ ref="vciMasterCrud"
:TreeValue="TreeValue"
:Treedata="Treedata"
:codeClassifyOid="this.codeClassifyOid"
:coderuleoid="this.coderuleoid"
:isLoading="isLoading"
+ :nodeClickList="this.nodeClickList"
:page="this.page"
:tableDataArray="tableDataArray"
:tableHeadBtnData="masterVrBtnList"
@@ -37,7 +39,6 @@
:tableHeadFindData="tableHeadFindData"
:templateOid="templateOid"
:total="this.total"
- :nodeClickList="this.nodeClickList"
@currentPage="currentPages"
@pageSize="pageSizes"
>
@@ -71,14 +72,20 @@
isLoading: false,
tableHeadFindData: {},
TreeValue: '',
- nodeClickList:[]
+ nodeClickList: []
}
},
created() {
},
methods: {
- nodeClickLists(val){
- this.nodeClickList=val;
+ 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;
@@ -116,6 +123,9 @@
tableHeadBttoms(val) {
this.masterVrBtnList = val;
},
+ loadingHandler(val) {
+ this.isLoading = val;
+ }
}
}
</script>
--
Gitblit v1.9.3