From 337e31425546e46c543409e520e3b11cacaccc2a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 04 十二月 2023 17:00:00 +0800
Subject: [PATCH] 主题库switch展示bug
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 2 +-
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 4 ++--
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 561cb91..65b2559 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -250,7 +250,7 @@
},
methods: {
openDialog() {
- //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
+ //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�(鏈夋敼鍔� 涓嶉渶瑕佸湪浣跨敤edit锛屾柟娉曟病浠�涔堝奖鍝�)
this.getFormTemplate();
if (this.type === "add" || (this.type !== "add" && this.status === "amend")) {
this.getCodeRule();
@@ -473,7 +473,7 @@
secValue: this.codeApplyForm[item.oid],
};
});
- //鏍囧噯鐗瑰畾
+ //鏍囧噯鐗瑰畾瀛楁鏄犲皠
const mappings = {
codeStandardEditType: 'operationType',
reviseSeries: 'series',
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index df6a0b6..fa46eca 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -99,9 +99,9 @@
</FormTemplateDialog>
<!-- 淇-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :disabledProp="disabledProp" :templateOid="templateOid" :title="'鏁版嵁淇'"
:visible.sync="amendvisible" status="amend"
- type="edit" @submit="amendSumbit"></FormTemplateDialog>
+ type="add" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
@@ -113,7 +113,7 @@
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
- rowOid="rowOid"
+ :rowOid="rowOid"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
<!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -598,13 +598,13 @@
if (foundItem) {
this.amendvisible = true;
- this.rowOid = this.selectRow[0].oid;
} else {
- if (this.selectRow.length !== 1) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
} else {
+ console.log(this.selectRow)
this.amendvisible = true;
- this.rowOid = this.selectRow[0].oid;
+
}
}
},
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 3ee51de..0f83ebf 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -376,7 +376,7 @@
</el-option>
</el-select>
<el-switch
- v-if="item.edit === 'switch'" v-model="row[item.prop]" :disabled="!editOpenFlag" active-value="true" v-show="!AddCellFlag"
+ v-if="item.edit === 'switch'" v-model="row[item.prop]" :disabled="!editOpenFlag" active-value="true"
inactive-value="false">
</el-switch>
<span v-else>{{ row[item.prop] }}</span>
--
Gitblit v1.9.3