From a9ef002fbfe2207071d604f55b36bbb74204a7a0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 06 九月 2023 14:33:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index e516be0..1f4e6a3 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -84,7 +84,7 @@
trendsSpan: {
type: Number,
default: 8,
- },
+ }
},
data() {
return {
@@ -130,14 +130,20 @@
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
templateRender(formItemList) {
- console.log(formItemList, "formItemList");
// 鏃犻渶鍒嗙粍鏁版嵁
let column = [];
let group = [];
let dictKeys = [];
let slotColumnList = [];
+ let value=''
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
+ if( formItem.type === "combox" && formItem.dicData){
+ value=formItem.dicData[0].key
+ }
+ // console.log('formItem',formItem)
+ // console.log('formItem.dicData[0].value',formItem.dicData[0].key)
+ // console.log('formItem.dicData[0].value',formItem.dicData[0].id)
if (formItem.type === "line") {
group.push({
label: formItem.text,
@@ -190,13 +196,14 @@
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
- valueFormat: formItem.dateFormate,
+ valueFormat:formItem.dateFormate,
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
- value: formItem.defaultValue,
+ value: value,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
+ readonly:true,
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
@@ -219,7 +226,7 @@
rules: [
{
required: formItem.required,
- message: `璇�${message}${formItem.text}`,
+ message: `${message}${formItem.text}`,
trigger,
},
{
@@ -234,6 +241,10 @@
value: "key",
},
};
+ // if(columnItem.type == "select"){
+ // columnItem.value=value
+ // }
+ // console.log('columnItem',columnItem)
slotColumnList.push(columnItem);
if (group.length === 0) {
column.push(columnItem);
@@ -242,7 +253,6 @@
}
});
this.slotColumnList = slotColumnList;
- console.log(column, "column");
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
this.updateIndex++;
@@ -252,6 +262,7 @@
this.geDictData(dictKeys);
this.getFormDetail();
+
},
// 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
resetFormConfig(formItem) {
--
Gitblit v1.9.3