From 4d15b0b7853292b3f2a80a23af19955375f12e80 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 20 六月 2023 11:09:39 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index a9f8e52..c8ab6a3 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -517,7 +517,6 @@
             collapse: true,
             column: [],
           });
-          return
         }
         if (
           formItem.type === "combox" &&
@@ -597,7 +596,7 @@
       this.$set(this.option, "column", column);
       this.$set(this.option, "group", group);
       this.formIndex++;
-      if (this.type === 'add' || this.type === 'preview') {
+      if (this.type === 'add') {
         this.loading = false;
       }
       this.geDictData(dictKeys);
@@ -653,11 +652,11 @@
       if (type === "truefalse") {
         return [
           {
-            key: 'false',
+            key: false,
             value: "鍚�",
           },
           {
-            key: 'true',
+            key: true,
             value: "鏄�",
           },
         ];
@@ -701,7 +700,7 @@
     },
     // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
     getFormDetail() {
-      if (this.type === 'add' || this.type === 'preview') return
+      if (this.type === 'add') return
       getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
         (res) => {
           this.form = Object.assign(this.form, res.data.data[0])

--
Gitblit v1.9.3