From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index bce1993..61ebc48 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -47,14 +47,14 @@
:prop="item.prop" :show-overflow-tooltip="true"
:sortable="item.sortable"
:width="item.width"
- v-if="item.tableDisplayFlag == 'true'"
+ v-if="!item.hidden"
align="center">
</el-table-column>
</el-table>
</el-row>
<!-- 鏂板-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible"
+ :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" :TreeValue="TreeValue"
type="add"
@submit="AddSumbit">
</FormTemplateDialog>
@@ -93,7 +93,7 @@
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
:templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
<div class="block" style="display: flex; justify-content: flex-end">
- <el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
+ <el-pagination :current-page="page.currentPage" :page-size="page.pageSize" :page-sizes="page.pageSizes"
:total="page.total" layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange">
@@ -155,6 +155,10 @@
tableDataArray: {
type: Array,
},
+ TreeValue:{
+ type: String,
+ default: "",
+ },
total: {
type: String,
default: "",
@@ -178,7 +182,8 @@
},
Treedata: {
type: Array
- }
+ },
+
},
data() {
return {
--
Gitblit v1.9.3