From e480475d30c1a079a39b6cbf1dd43dc485394e62 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 06 六月 2023 18:01:32 +0800
Subject: [PATCH] 动态表单

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue  |   33 ++--------------
 Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue |    5 +-
 Source/UBCS-WEB/src/components/FormTemplate/index.vue         |    5 ++
 Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue     |   16 ++++---
 Source/UBCS-WEB/vue.config.js                                 |    5 --
 5 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue b/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
index 5d02e9d..eb23a6f 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
@@ -57,13 +57,6 @@
     getType(item) {
       return this.selfColumnType[item.sectype];
     },
-    init(columnList) {
-      this.$refs.FormTempalte.templateRender(columnList);
-    },
-    handleResize() {
-      let windowWidth = document.body.clientWidth;
-      this.trendsSpan = 24 / Math.floor(windowWidth / 500);
-    },
     isRequired(item) {
       return item.nullableFlag != "true";
     },
@@ -90,6 +83,15 @@
         return [];
       }
     },
+    init(columnList) {
+      this.$refs.FormTempalte.templateRender(columnList);
+    },
+    handleResize() {
+      let windowWidth = document.body.clientWidth;
+      this.trendsSpan = 24 / Math.floor(windowWidth / 500);
+    },
+    
+    
     async validate() {
       return await this.$refs.FormTempalte.validate();
     },
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 1c1f9bc..19297f2 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -24,18 +24,18 @@
         </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>
 </template>
 
 <script>
-import { getFormTemplate, getFormDetail } from "@/api/formTemplate";
+import { getFormDetail } from "@/api/formTemplate";
 import { getDictionary } from "../../api/system/dict";
 import vciWebRefer from "../refer/vciWebRefer.vue";
 export default {
@@ -497,31 +497,6 @@
     this.handleResize();
   },
   methods: {
-    // 鍒濆鍖�
-    init(columnList) {
-      if (Array.isArray(columnList)) {
-        this.templateRender(columnList);
-      } else {
-        this.getFormTemplate();
-      }
-    },
-    // 鎺ュ彛鑾峰彇琛ㄥ崟鏁版嵁
-    getFormTemplate() {
-      getFormTemplate({
-        templateOid: this.templateOid,
-        codeClassifyOid: this.codeClassifyOid,
-      })
-        .then((res) => {
-          if (res.status === 200) {
-            this.$emit('getFormTemplateEnd', res.data)
-            this.templateRender(res.data.formDefineVO.items);
-          }
-        })
-        .catch((err) => {
-          this.loading = false;
-          console.log(err);
-        });
-    },
     // 娓叉煋琛ㄥ崟妯℃澘
     templateRender(formItemList) {
       // 鏃犻渶鍒嗙粍鏁版嵁
@@ -716,7 +691,7 @@
     getFormDetail() {
       if (this.type === 'add') return 
       if (this.type === "add") return;
-      getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
+      getFormDetail({ templateOid: this.templateOid, oid: '213D13D5-76D3-6B42-0932-705693F6B6E4' }).then(
         (res) => {
           this.form = Object.assign(this.form, res.obj)
           console.log(res, "res");
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index 7195205..3891fc5 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
@@ -36,7 +36,7 @@
       ref="FormTemplateDialog"
       type="detail"
       :visible.sync="formTemplateVisible"
-      :templateOid="this.resembleTemplateOid"
+      :templateOid="resembleTemplateOid"
       :rowOid="rowOid"
       title="鏌ョ湅璇︾粏淇℃伅"
       :codeClassifyOid="this.resembleCodeClassifyOid"
@@ -142,7 +142,8 @@
     },
 
     openFormTemlpate(row) {
-      this.codetemplateoid = row.codetemplateoid;
+      this.resembleTemplateOid = row.codetemplateoid
+      this.resembleCodeClassifyOid = row.codeClassifyOid
       this.rowOid = row.iod
       this.formTemplateVisible = true;
     },
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 6009b7e..3977502 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -14,6 +14,7 @@
       :visible="visible"
       :type="type"
       :rowOid="rowOid"
+      :templateOid="templateOid"
       ref="FormTempalte"
       @getFormData="getFormData"
     ></FormTempalte>
@@ -160,7 +161,9 @@
   methods: {
     openDialog() {
       this.getFormTemplate();
-      this.getCodeRule();
+      if (this.type === 'add') {
+        this.getCodeRule();
+      }
     },
     close() {
       this.dialogVisible = false;
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 5259a48..c3b6e82 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -29,13 +29,8 @@
         //  target: 'http://localhost:37000',
         // target: 'http://192.168.1.63:37000',
         //target: 'http://192.168.3.7:37000',
-<<<<<<< HEAD
         // target: 'http://dev.vci-tech.com:37000',
         target: 'http://192.168.1.51:37000/',
-=======
-        target: 'http://dev.vci-tech.com:37000',
-        // target: 'http://192.168.1.51:37000/',
->>>>>>> a3c7b3f7a4778a777a78a72c968b0e172488df03
         //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
         // target: 'https://saber.bladex.vip/api',
         ws: true,

--
Gitblit v1.9.3