From 1157e8e97e24ec7938deea2e3345a502644fc256 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 05 七月 2023 16:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 021d2f3..b47249f 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -11,14 +11,13 @@
>
<FormTemplate
v-bind="$attrs"
- :visible="visible"
:type="type"
:rowOid="rowOid"
:templateOid="templateOid"
+ v-if="dialogVisible"
ref="FormTemplate"
@getFormData="getFormData"
></FormTemplate>
-
<div
class="tab_box"
v-if="
@@ -127,8 +126,8 @@
form: {},
codeApplyForm: {},
activeName: "codeApply",
- showCodeApply: true,
- showResembleQuery: true,
+ showCodeApply: false,
+ showResembleQuery: false,
selfColumnType: {
codefixedsec: "combox",
codeclassifysec: "refer",
@@ -233,7 +232,9 @@
this.activeName = "resembleQuery";
this.showResembleQuery = true;
}
- this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items);
+ this.$nextTick(() => {
+ this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items);
+ })
}
})
.catch(() => {
@@ -253,15 +254,15 @@
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- 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;
}
- });
}
});
},
@@ -408,7 +409,7 @@
},
};
} else if (item.secType == "coderefersec") {
- params = JSON.parse(item.referConfig);
+ params = JSON.parse(item.referValueInfo);
}
return params;
},
--
Gitblit v1.9.3