From 4cd479485aded3de0b52abe37097a04105bad3ed Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 11 九月 2023 15:01:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index c4e0e13..6e24287 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -47,6 +47,7 @@
:prop="item.prop" :show-overflow-tooltip="true"
:sortable="item.sortable"
:width="item.width"
+ v-if="!item.hidden"
align="center">
</el-table-column>
</el-table>
@@ -92,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">
@@ -800,32 +801,32 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
- this.addvisible = false;
addSaveCode(val).then(res => {
this.$nextTick(() => {
- this.$message.warning("淇濆瓨鎴愬姛");
+ this.addvisible = false;
+ this.$message.success("淇濆瓨鎴愬姛");
this.onLoad()
})
})
},
//淇敼鍥炶皟
EditSumbit(val) {
- this.editvisible = false;
editSaveCode(val).then(res => {
this.$nextTick(() => {
- this.$message.warning("淇濆瓨鎴愬姛");
+ this.editvisible = false;
+ this.$message.success("淇濆瓨鎴愬姛");
this.onLoad()
})
})
},
//鏁版嵁鏇存敼鍥炶皟
updataSumbit(val) {
- this.DataVisible = false;
val.copyFromVersion = this.rowOid;
val.oid = '';
upSaveCode(val).then(res => {
this.$nextTick(() => {
- this.$message.warning("淇濆瓨鎴愬姛");
+ this.DataVisible = false;
+ this.$message.success("淇濆瓨鎴愬姛");
this.onLoad()
})
})
--
Gitblit v1.9.3