From 38b3548433f54e9e13583f7c51d8512b0a9021cf Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 22 九月 2023 08:59:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 2f714ce..886ce91 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -13,7 +13,9 @@
<FormTemplate
v-bind="$attrs"
:type="type"
+ :TreeValue="TreeValue"
:rowOid="rowOid"
+ :eventList="eventList"
:templateOid="templateOid"
v-if="dialogVisible"
ref="FormTemplate"
@@ -91,6 +93,10 @@
type: Boolean,
default: false,
},
+ TreeValue:{
+ type: String,
+ default: "",
+ },
type: {
type: String,
default: "add",
@@ -123,6 +129,7 @@
},
data() {
return {
+ eventList:[],
//鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
codeValueApplyStatus:'',
loading: false,
@@ -142,7 +149,7 @@
coderefersec: "refer",//寮曠敤鐮佹
codeattrsec: "text",
codelevelsec: "text",
- codedatesec: "text"
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -246,11 +253,12 @@
} else {
this.showResembleQuery = false;
}
- // console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
);
+ this.eventList=res.data.templateVO.attributes
+ // this.$refs.FormTemplate.$emit('eventList', res.data.templateVO.attributes);
if (Object.keys(this.setForm).length > 0) {
this.$refs.FormTemplate.form = this.setForm;
}
@@ -291,14 +299,12 @@
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;
}
}
- // console.log(' this.secVOList',that.secVOList)
- // console.log(' res.data.data.secVOList',res.data.data.secVOList)
});
},
getFormData(form) {
@@ -319,7 +325,7 @@
}
return item;
});
- this.$refs.CodeApply.templateRender(this.secVOList);
+ this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -475,8 +481,6 @@
} else if (item.secType == "coderefersec") {
//寮曠敤鐮佹
params = JSON.parse(item.referValueInfo);
- // console.log('item',item)
- console.log('params',params)
}
return params;
},
--
Gitblit v1.9.3