From aadc935fea134441a607c56b3bb5fedefb8aeec9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 九月 2023 15:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 092ab2d..f865672 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -138,7 +138,7 @@
       let value=''
       formItemList.forEach((formItem) => {
         formItem = this.resetFormConfig(formItem);
-        // console.log('formItem',formItem)
+        console.log('formItem',formItem)
         // console.log('formItem.dicData.value',formItem.dicData)
         if (formItem.type === "line") {
           group.push({
@@ -187,7 +187,7 @@
           field: formItem.field,
           type: this.columnType[formItem.type],
           dicData: this.getDataList(formItem.type, formItem.data),
-          disabled: this.type === "detail" ? true : formItem.readOnly,
+          disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ?true : false) ,
           prepend: this.preOrSufFixShow("text", formItem.prefix),
           append: this.preOrSufFixShow("text", formItem.suffix),
           prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
@@ -199,7 +199,7 @@
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
-          // readonly:true,
+          // readonly:formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ?true : false ,
           display: !formItem.hidden,
           maxlength: formItem.maxlength,
           filterable: true,
@@ -364,6 +364,7 @@
       );
     },
     setReferValue(data) {
+      console.log(data)
       if (data.field) {
         this.form[data.field] = data.value || "";
         this.form[data.showField] = data.text || "";

--
Gitblit v1.9.3