From b9fbda4915fc018b4ac5ec69c9018a1b7ad60230 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 16 八月 2023 10:11:11 +0800
Subject: [PATCH] 修改枚举注入和申请页面bug
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 35 ++++++++++++++---------------------
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2 +-
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 471114a..e7fe577 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -523,7 +523,7 @@
if (
formItem.type === "combox" &&
formItem.comboxKey &&
- (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0)
+ (!Array.isArray(formItem.dicData) || formItem.dicData.length === 0) &&(!Array.isArray(formItem.data) || formItem.data.length === 0)
) {
dictKeys.push({ dictKey: formItem.comboxKey, field: formItem.field });
}
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 9237072..12f27cd 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -71,19 +71,19 @@
size="small"
@click="editOpen">寮�鍚紪杈�
</el-button>
+ <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue" placeholder="璇烽�夋嫨"
+ size="small">
+ <el-option
+ v-for="item in selectoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <el-switch v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="switchvalue"
+ active-value="true" style="margin:6px 0 0 10px" @change="batchSetFlag">
+ </el-switch>
</el-button-group>
- <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="selectvalue" placeholder="璇烽�夋嫨"
- size="small">
- <el-option
- v-for="item in selectoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <el-switch v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" v-model="switchvalue"
- active-value="true" style="margin:6px 0 0 10px" @change="batchSetFlag">
- </el-switch>
</div>
<!-- 寮圭獥-->
<div>
@@ -1749,7 +1749,6 @@
this.ProData.forEach((item, index) => {
if ((item.requireFlag && item.requireFlag.toString() == 'true') && (item.readOnlyFlag && item.readOnlyFlag.toString() == 'true')) {
this.$message.warning(item.name + "(" + item.id + ")蹇呰緭鐨勫睘鎬т笉鑳芥槸鍙");
- console.log(item)
ischeck = false;
return;
}
@@ -1757,29 +1756,23 @@
if (item.componentRule) {
//缁勫悎瑙勫垯
num++
- console.log('componentRule', num)
}
if (item.enumString || item.enumId) {
//鏋氫妇
num++
- console.log('enumString', num)
}
if (item.referConfig || item.referBtmId) {
//鍙傜収
num++
- console.log('referConfig', num)
}
if (item.codeDateFormat) {
//鏃堕棿鏍煎紡
num++
- console.log('codeDateFormat', num)
}
//濡傛灉绌哄悗鍙拌繑鍥瀗one
if (item.classifyInvokeLevel && item.classifyInvokeLevel != 'none') {
//鍒嗙被娉ㄥ叆
num++
- console.log('classifyInvokeLevel', num)
- console.log(item.classifyInvokeLevel)
}
if (num > 1 && ischeck) {
this.$message({
@@ -1853,8 +1846,8 @@
this.isShowformulaEdit = true;
} else if (column.property == 'enumString') {
this.enumVisible = true;
- if (this.attrSelectList[0].enumString != "") {
- this.tableData = JSON.parse(this.attrSelectList[0].enumString)
+ if (this.CurrentCell.enumString != "") {
+ this.tableData = JSON.parse(this.CurrentCell.enumString)
return
}
} else if (column.property == 'parentCode') {
--
Gitblit v1.9.3