From 39f59f013c74c4a2a5b35df4f4b389659610a219 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 04 十二月 2023 10:12:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 396b601..35947ca 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>
@@ -90,14 +90,14 @@
<!-- 鐢宠-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
- :visible.sync="applyvisible"
+ :visible.sync="applyvisible" status="apply"
type="add"
@submit="applySumbit">
</FormTemplateDialog>
<!-- 淇-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
- :visible.sync="amendvisible"
+ :visible.sync="amendvisible" status="amend"
type="edit" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -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>
<!-- 鎵归噺缂栬緫-->
@@ -455,8 +455,6 @@
}
}
this.isReferPushed = true;
- console.log('new', this.referArray)
- console.log('ss', newval.find(item => Object.keys(item.referConfig).length > 0))
this.WupinFindValue = ''
},
},
@@ -586,16 +584,29 @@
},
//鏍囧噯淇
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 ;
+ }
}
},
//鎵归噺缂栬緫
bulkEditHandler(type) {
- console.log(this.nodeClickList)
+ // console.log(this.nodeClickList)
if (this.nodeClickList.children.length >= 1) {
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
--
Gitblit v1.9.3