From 235560b9d7cff1d7dce1f90a08df56d6ef8dd682 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 10:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/items.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index 02ff88b..33241d3 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -9,7 +9,8 @@
:currentPage="this.currentPage"
:templateOid="this.templateOid"
@tableDataArray="tableDataArrays"
-
+ @tableHeadDataFateher="tableHeadDatas"
+ @total="totals"
></master-tree>
</basic-container>
</el-aside>
@@ -22,6 +23,8 @@
@currentPage="currentPages"
@templateOid="templateOids"
:tableDataArray="tableDataArray"
+ :total="this.total"
+ :tableHeadDataFateher="this.tableHeadDataFateher"
></TableCrud>
</el-main>
</el-container>
@@ -44,7 +47,9 @@
codeClassifyOid:"",
coderuleoid:"",
templateOid:"",
- tableDataArray:[]
+ tableDataArray:[],
+ tableHeadDataFateher:[],
+ total:""
}
},
created() {
@@ -68,6 +73,12 @@
},
tableDataArrays(val){
this.tableDataArray=val
+ },
+ totals(val){
+ this.total=val
+ },
+ tableHeadDatas(val){
+ this.tableHeadDataFateher=val
}
}
}
--
Gitblit v1.9.3