From a471b20fe8075a663f32b3a2ee0cd70c1c63baf7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 21:59:42 +0800
Subject: [PATCH] 业务类型查询：树查询修改，数据列表查询接口修改（处理模板套模板情况下freemarker表达式的替换处理）。

---
 Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
index ca5e5b4..630a90e 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
@@ -1,6 +1,6 @@
 <template>
   <!--鍔ㄦ�佹ā鏉�-->
-  <avue-form ref="form" :option="option" v-model="form">
+  <avue-form ref="form" :option="option" v-model="form" v-loading="loading">
     <template v-for="item in allColumn" :slot="item.prop+ ''">
       <vciWebRefer
         v-if="item.type === 'refer'"
@@ -83,6 +83,7 @@
   },
   data() {
     return {
+      loading:false,
       form: this.formData,
       option: {
         menuBtn:false,
@@ -121,6 +122,7 @@
           Object.assign(this.form, this.initValue);
         }
       },
+      deep:true,
       immediate: true,
     },
     formData: {
@@ -184,14 +186,15 @@
     },
     initItem(item){
       const type=this.columnType[item.type] || item.type;
-      const col= {
+      item.text=item.text || item.label;
+      let col= {
         ...item,
         label: item.text,
         prop: item.field,
         showProp:item.showField,
         type: type,
         labelWidth: this.labelWidth || (item.text.length >= 6 ? 115 : 90),
-        disabled: !this.isEdit || item.readOnly || this.disabled,
+        disabled: item.readOnly || this.disabled,
         span: item.span
           ? item.span
           : item.type === "textarea"
@@ -206,25 +209,26 @@
         valueFormat: item.dateFormate || "yyyy-MM-dd HH:mm:ss",
         format: item.dateFormate,
         rules: this.isEdit?(type=="select" || type=="refer" || type=="date" || type=="datetime"?[{
-          required: item.required,
+          required: item.required || false,
           message: `璇烽�夋嫨${item.text}!`,
           trigger: "change"
         },{
-          required: item.required,
+          required: item.required|| false,
           message: `璇烽�夋嫨${item.text}!`,
           trigger: "submit"
         }]:[{
-          required: item.required,
+          required: item.required|| false,
           message: `璇疯緭鍏�${item.text}!`,
           trigger: "blur"
         },{
-          required: item.required,
+          required: item.required|| false,
           message: `璇疯緭鍏�${item.text}!`,
           trigger: "submit"
         }]):[]
       };
       if(!this.isEdit){
         col.placeholder=col.label;
+        col.disabled=true;
       }
       if(col.type === 'richText'){
         this.subitemName = col.field;
@@ -235,20 +239,20 @@
           col.display=false
         }
       }
-      if (col.type === "select") {
-        if(col.data && col.data.length>0){
+      if (col.type === "select" || col.type==='radio' || col.type==='checkbox') {
+        if (col.data && col.data.length > 0) {
           col.dicData = col.data.map((d) => {
             return {
               label: d.key,
               key: d.value,
               value: d.value,
-              attributes:d.attributes
+              attributes: d.attributes
             };
           });
-        }else if(!validatenull(col.dictCode)) {
+        } else if (!validatenull(col.dictCode)) {
           getDicts(col.dictCode).then((res) => {
-            if (res.data.success){
-              if(res.data.data && res.data.obj == null){
+            if (res.data.success) {
+              if (res.data.data && res.data.obj == null) {
                 res.data.obj = res.data.data
               }
               const dic = res.data.obj;
@@ -257,11 +261,13 @@
                   label: d.value,
                   key: d.key,
                   value: d.key,
-                  attributes:d.attributes
+                  attributes: d.attributes
                 };
               });
             }
           });
+        } else {
+          col.dicData = [];
         }
       }
       if (col.type==='refer') {
@@ -340,6 +346,9 @@
     },
     clearValidate(props){
       this.$refs.form.clearValidate(props)
+    },
+    updateDic(prop,data){
+      this.$refs.form.updateDic(prop,data)
     }
   },
 };

--
Gitblit v1.9.3