From 7518dc7b954f88f546b50277419e798e65ca9dcd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 05 六月 2023 18:20:48 +0800
Subject: [PATCH] 整合组件

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index ec78c2f..18b9d68 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -197,7 +197,7 @@
           tooltips: "璇疯緭鍏ユ暟瀛�",
           type: "text",
           unique: false,
-          verify: "/[0-9]/",
+          verify: /^[0-9]+$/g,
         },
         {
           comboxKey: null,
@@ -513,7 +513,9 @@
       })
         .then((res) => {
           if (res.status === 200) {
-            this.templateRender(res.data.formDefineVO.items);
+            this.templateRender(this.testItems);
+            // 娴嬭瘯鏁版嵁灞曠ず
+            // this.templateRender(res.data.formDefineVO.items);
             this.$emit("getFormTemplateEnd", res.data);
           }
         })
@@ -575,14 +577,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,
+          referConfig: formItem.referConfig,
           change: () => {
             this.changeFun(formItem.displayExtension, formItem.prop);
           },
@@ -618,7 +618,8 @@
       this.formIndex++;
       this.loading = false;
       this.geDictData(dictKeys);
-      this.getFormDetail()
+      // 娴嬭瘯鏁版嵁灞曠ず
+      // this.getFormDetail();
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {
@@ -709,26 +710,28 @@
       });
     },
     // 琛ㄥ崟鏍¢獙
-     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;
+      getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
+        (res) => {
+          console.log(res, "res");
+        }
+      );
+    },
   },
   watch: {
     // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢

--
Gitblit v1.9.3