From 0e5ba7238d31dc8fb5015001661811dceab55c42 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 09:02:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 2f714ce..0f09a76 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -13,6 +13,7 @@
<FormTemplate
v-bind="$attrs"
:type="type"
+ :TreeValue="TreeValue"
:rowOid="rowOid"
:templateOid="templateOid"
v-if="dialogVisible"
@@ -90,6 +91,10 @@
visible: {
type: Boolean,
default: false,
+ },
+ TreeValue:{
+ type: String,
+ default: "",
},
type: {
type: String,
@@ -291,7 +296,7 @@
that.showCodeApply = true;
that.activeName = "codeApply";
that.$nextTick(() => {
- that.$refs.CodeApply.templateRender(that.secVOList);
+ that.$refs.CodeApply.templateRender(that.secVOList,this.TreeValue);
});
} else {
that.showCodeApply = false;
@@ -319,7 +324,7 @@
}
return item;
});
- this.$refs.CodeApply.templateRender(this.secVOList);
+ this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
--
Gitblit v1.9.3