From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 33241d3..0ca87ed 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -7,25 +7,28 @@
@coderuleoid="coderuleoidList"
:pageSize="this.pageSize"
:currentPage="this.currentPage"
- :templateOid="this.templateOid"
@tableDataArray="tableDataArrays"
@tableHeadDataFateher="tableHeadDatas"
@total="totals"
+ @nodeClick="nodeClick"
+ @tableHeadFindData="tableHeadFindDatas"
></master-tree>
</basic-container>
</el-aside>
<el-main>
<!-- 琛ㄦ牸缁勪欢-->
- <TableCrud :page="this.page"
+ <VciMasterCrud :page="this.page"
:codeClassifyOid="this.codeClassifyOid"
:coderuleoid="this.coderuleoid"
@pageSize="pageSizes"
@currentPage="currentPages"
- @templateOid="templateOids"
:tableDataArray="tableDataArray"
:total="this.total"
:tableHeadDataFateher="this.tableHeadDataFateher"
- ></TableCrud>
+ :isLoading="isLoading"
+ :templateOid="templateOid"
+ :tableHeadFindData="tableHeadFindData"
+ ></VciMasterCrud>
</el-main>
</el-container>
</template>
@@ -49,7 +52,9 @@
templateOid:"",
tableDataArray:[],
tableHeadDataFateher:[],
- total:""
+ total:"",
+ isLoading: false,
+ tableHeadFindData:{}
}
},
created() {
@@ -57,7 +62,6 @@
methods:{
codeClassifyOidList(val){
this.codeClassifyOid=val;
- console.log(val)
},
coderuleoidList(val){
this.coderuleoid=val;
@@ -68,9 +72,6 @@
currentPages(val){
this.currentPage=val
},
- templateOids(val){
- this.templateOid=val
- },
tableDataArrays(val){
this.tableDataArray=val
},
@@ -79,7 +80,17 @@
},
tableHeadDatas(val){
this.tableHeadDataFateher=val
- }
+ },
+ tableHeadFindDatas(val){
+ this.tableHeadFindData=val
+ },
+ nodeClick(val){
+ this.templateOid=val;
+ this.isLoading=true;
+ setTimeout(() => {
+ this.isLoading = false;
+ }, 2000);
+}
}
}
</script>
--
Gitblit v1.9.3