From c8cdec5a84e86c35fbe7d18ca8eefbe5cbf11ba7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 08 八月 2023 18:11:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 3023328..471114a 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -5,6 +5,7 @@
     <avue-form
       v-model="form"
       :option="option"
+      v-loading="loading"
       ref="form"
       :style="{ minHeight: loading ? '300px' : '' }"
       :key="updateIndex"
@@ -49,7 +50,7 @@
     // 榛樿绂佺敤鍏冪礌
     disabledProp: {
       type: Array,
-      default: () => ["id"],
+      default: () => ["id","lcstatus"],
     },
     templateOid: {
       type: String,
@@ -530,6 +531,10 @@
         if (this.disabledProp.includes(formItem.field)) {
           formItem.readOnly = true;
         }
+        if(formItem.field=='lcstatus'){
+          formItem.field=formItem.field+'_text';
+          formItem.readOnly=true;
+        }
         // 璁剧疆琛ㄥ崟鏍¢獙鐨勮鍒欙紝鏂囨湰
         let message = "璇烽�夋嫨";
         let trigger = "change";
@@ -557,11 +562,12 @@
           value: formItem.defaultValue,
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
+          tip: formItem.tooltips,
           display: !formItem.hidden,
           maxlength: formItem.maxlength,
           filterable: true,
           referConfig:
-            formItem.type == "refer" 
+            formItem.type == "refer"
               ? {
                   title: formItem.text,
                   showField: formItem.showField || formItem.field,
@@ -603,7 +609,7 @@
       if (this.type === "add") {
         this.loading = false;
       }
-      
+
       this.geDictData(dictKeys);
       this.getFormDetail();
     },

--
Gitblit v1.9.3