From 27ade5103889fc1dec072c0327b747dc679513af Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 17 八月 2023 10:51:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index ce30279..e7fe577 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -523,13 +523,17 @@
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 });
}
// 绂佺敤閮ㄥ垎灞炴�э紙澶栭儴浼犲�肩鐢ㄥ拰鍙傜収绂佺敤锛�
if (this.disabledProp.includes(formItem.field)) {
formItem.readOnly = true;
+ }
+ if(formItem.field=='lcstatus'){
+ formItem.field=formItem.field+'_text';
+ formItem.readOnly=true;
}
// 璁剧疆琛ㄥ崟鏍¢獙鐨勮鍒欙紝鏂囨湰
let message = "璇烽�夋嫨";
@@ -558,6 +562,7 @@
value: formItem.defaultValue,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
+ tip: formItem.tooltips,
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
--
Gitblit v1.9.3