From d74e1672af99afd7e6a24327deb22b308dd5fc88 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 04 十二月 2023 08:38:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index a8121e9..36ca0b3 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -40,7 +40,7 @@
border class="cus-table"
@select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
@select-all="handleSelectionAll" @selection-change="handleSelectionChange"
- @sort-change="sortChange">
+ @sort-change="sortChange" :header-cell-style="{background:'#FAFAFA',color:'#505050'}">
<el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
<el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
</el-table-column>
@@ -108,7 +108,7 @@
</FormTemplateDialog>
<!-- 淇敼-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :disabledProp="disabledProp" rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
@@ -584,11 +584,24 @@
},
//鏍囧噯淇
codeAMENDHandler() {
- if (this.selectRow.length !== 1) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else {
+ let foundItem = false;
+
+ this.tableHeadFindData.forEach(item => {
+ if (item.field === "oldcode" && Object.keys(item.referConfig).length >= 1) {
+ foundItem = true;
+ }
+ });
+
+ if (foundItem) {
this.amendvisible = true;
- this.rowOid = this.selectRow[0].oid;
+ this.rowOid = this.selectRow[0].oid ;
+ } else {
+ if (this.selectRow.length !== 1) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }else {
+ this.amendvisible = true;
+ this.rowOid = this.selectRow[0].oid ;
+ }
}
},
//鎵归噺缂栬緫
--
Gitblit v1.9.3