From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   44 +++++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index f37041e..45f318e 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -9,16 +9,14 @@
     append-to-body
     @opened="openDialog"
   >
-    <FormTempalte
+    <FormTemplate
       v-bind="$attrs"
-      :visible="visible"
       :type="type"
       :rowOid="rowOid"
       :templateOid="templateOid"
-      ref="FormTempalte"
+      ref="FormTemplate"
       @getFormData="getFormData"
-    ></FormTempalte>
-
+    ></FormTemplate>
     <div
       class="tab_box"
       v-if="
@@ -30,7 +28,7 @@
     >
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
-          <FormTempalte
+          <FormTemplate
             v-bind="$attrs"
             :type="type"
             :selfColumnType="selfColumnType"
@@ -38,7 +36,7 @@
             ref="CodeApply"
             @getFormData="getCodeApplyFormData"
             @referConfigDataUpdate="referConfigDataUpdate"
-          ></FormTempalte>
+          ></FormTemplate>
         </el-tab-pane>
         <el-tab-pane
           label="鐩镐技椤规煡璇�"
@@ -81,11 +79,11 @@
 
 <script>
 import { getCodeRule, getFormTemplate } from "@/api/formTemplate.js";
-import FormTempalte from "./FormTempalte";
+import FormTemplate from "./FormTemplate";
 import ResembleQuery from "./ResembleQuery";
 export default {
   name: "FormTemplateDialog",
-  components: { ResembleQuery, FormTempalte },
+  components: { ResembleQuery, FormTemplate },
   props: {
     visible: {
       type: Boolean,
@@ -127,8 +125,8 @@
       form: {},
       codeApplyForm: {},
       activeName: "codeApply",
-      showCodeApply: true,
-      showResembleQuery: true,
+      showCodeApply: false,
+      showResembleQuery: false,
       selfColumnType: {
         codefixedsec: "combox",
         codeclassifysec: "refer",
@@ -233,17 +231,18 @@
               this.activeName = "resembleQuery";
               this.showResembleQuery = true;
             }
-            this.$refs.FormTempalte.templateRender(res.data.formDefineVO.items);
+            this.$nextTick(() => {
+              this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items);
+            })
           }
         })
-        .catch((err) => {
+        .catch(() => {
           this.loading = false;
         });
     },
     // 鑾峰彇鐮佸�肩敵璇锋暟鎹�
     getCodeRule() {
       getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
-        console.log(res, "resresresresres");
         if (res.data && res.data.code === 200) {
           const typeList = [
             "codefixedsec",
@@ -254,16 +253,15 @@
           this.secVOList = (res.data.data.secVOList || []).filter((item) =>
             typeList.includes(item.secType)
           );
-          console.log(this.secVOList, "this.secVOListthis.secVOList");
-          this.$nextTick(() => {
             if (this.secVOList.length > 0 && this.type === "add") {
               this.showCodeApply = true;
               this.activeName = "codeApply";
-              this.$refs.CodeApply.templateRender(this.secVOList);
+              this.$nextTick(() => {
+                this.$refs.CodeApply.templateRender(this.secVOList);
+              })
             } else {
               this.showCodeApply = false;
             }
-          });
         }
       });
     },
@@ -296,7 +294,7 @@
     },
     async submit() {
       // 杩涜琛ㄥ崟鏍￠獙
-      const formValidate = await this.$refs.FormTempalte.validate();
+      const formValidate = await this.$refs.FormTemplate.validate();
       if (!formValidate) return;
       let codeValidate = true;
       // 杩涜鐮佸�肩敵璇锋牎楠�
@@ -361,11 +359,11 @@
       };
     },
     getType(item) {
-      return this.selfColumnType[item.sectype];
+      return this.selfColumnType[item.secType];
     },
     getReferConfig(item) {
       let params = {};
-      if (item.sectype == "codeclassifysec") {
+      if (item.secType == "codeclassifysec") {
         params = {
           isMuti: false,
           type: "grid",
@@ -409,13 +407,13 @@
               : "",
           },
         };
-      } else if (item.sectype == "coderefersec") {
+      } else if (item.secType == "coderefersec") {
         params = JSON.parse(item.referValueInfo);
       }
       return params;
     },
     getDisabled(item) {
-      if (item.sectype === "codeclassifysec") {
+      if (item.secType === "codeclassifysec") {
         if (item.parentClassifySecOid) {
           if (!this.codeApplyForm[item.parentClassifySecOid]) {
             return true;

--
Gitblit v1.9.3