From af0332c78a78e6501130ec483ecf4250918073b3 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 06 九月 2023 13:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index ce67db7..1f4e6a3 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -135,8 +135,15 @@
       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,
@@ -189,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,
@@ -206,7 +214,6 @@
                   showField: formItem.showField || formItem.field,
                   field: formItem.field,
                   fieldMap:formItem.fieldMap || {fieldMapKey:'id'},
-
                   placeholder: formItem.inputTip,
                   options: formItem.referConfig
                 }
@@ -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);
@@ -251,6 +262,7 @@
 
       this.geDictData(dictKeys);
       this.getFormDetail();
+
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {

--
Gitblit v1.9.3