From f8fe13b6f7d8ad1ae53e7bf6a6cf83f584d52a4d Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 06 六月 2023 17:39:24 +0800
Subject: [PATCH] 动态表单组件重构

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue |   56 +++++++++++++++++++++++++-------------------------------
 1 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index ec78c2f..1c1f9bc 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -24,11 +24,11 @@
         </span>
       </template>
       <template :slot="item.prop + ''" v-for="item in slotColumnList">
-        <vciWebRefer
+        <!-- <vciWebRefer
           v-if="item.type == 'refer'"
           :value="item.value"
           :options="item.referConfig || {}"
-        ></vciWebRefer>
+        ></vciWebRefer> -->
       </template>
     </avue-form>
   </div>
@@ -197,7 +197,7 @@
           tooltips: "璇疯緭鍏ユ暟瀛�",
           type: "text",
           unique: false,
-          verify: "/[0-9]/",
+          verify: /^[0-9]+$/g,
         },
         {
           comboxKey: null,
@@ -513,8 +513,8 @@
       })
         .then((res) => {
           if (res.status === 200) {
+            this.$emit('getFormTemplateEnd', res.data)
             this.templateRender(res.data.formDefineVO.items);
-            this.$emit("getFormTemplateEnd", res.data);
           }
         })
         .catch((err) => {
@@ -575,17 +575,12 @@
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: formItem.defaultValue,
-          // tip: formItem.tooltips,
-          // tipPlacement: "right",
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           display: !formItem.hidden,
           maxlength: formItem.maxlength,
           filterable: true,
-          referConfig:formItem.referConfig,
-          change: () => {
-            this.changeFun(formItem.displayExtension, formItem.prop);
-          },
+          referConfig: formItem.referConfig,
           span: formItem.type === "textarea" ? 24 : this.trendsSpan,
           rules: [
             {
@@ -618,7 +613,7 @@
       this.formIndex++;
       this.loading = false;
       this.geDictData(dictKeys);
-      this.getFormDetail()
+      this.getFormDetail();
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {
@@ -665,11 +660,6 @@
         return val;
       }
     },
-    changeFun(displayExtension, prop) {
-      // executeCode({displayExtension, data: this.form}).then(res => {
-      //   this.form[prop] = res.data.data
-      // })
-    },
     // 鑾峰彇swich鍜屽凡鎷垮埌鐨勪笅鎷夋暟鎹�
     getDataList(type, dicData) {
       if (type === "truefalse") {
@@ -709,26 +699,30 @@
       });
     },
     // 琛ㄥ崟鏍¢獙
-     validate() {
+    validate() {
       return new Promise((resolve) => {
         this.$refs.form.validate((valid, done, msg) => {
-          console.error(msg, valid)
-        if (valid) {
-          resolve(true)
-        } else {
-          resolve(false);
-        }
+          console.error(msg, valid);
+          if (valid) {
+            done();
+            resolve(true);
+          } else {
+            resolve(false);
+          }
+        });
       });
-      })
-      
     },
-    // 鑾峰彇琛ㄥ崟鏁版嵁
+    // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
     getFormDetail() {
-      if (this.type === 'add') return
-      getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(res => {
-        console.log(res, 'res');
-      })
-    }
+      if (this.type === 'add') return 
+      if (this.type === "add") return;
+      getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
+        (res) => {
+          this.form = Object.assign(this.form, res.obj)
+          console.log(res, "res");
+        }
+      );
+    },
   },
   watch: {
     // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢

--
Gitblit v1.9.3