From b51951257f62c38c9f157830e254b8ef6ae1404a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 17 十一月 2023 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 858400a..fb3a61b 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -41,6 +41,7 @@
:selfColumnConfig="selfColumnConfig"
ref="CodeApply"
@getFormData="getCodeApplyFormData"
+ @attrList="attrListForm"
@referConfigDataUpdate="referConfigDataUpdate"
></FormTemplate>
</el-tab-pane>
@@ -131,6 +132,7 @@
},
data() {
return {
+ attrList:[],
eventList:[],
//鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
codeValueApplyStatus:'',
@@ -226,6 +228,13 @@
},
},
},
+ watch:{
+ codeApplyForm:{
+ handler(newval,oldval){
+ // console.log('newval',newval)
+ }
+ }
+ },
methods: {
openDialog() {
this.getFormTemplate();
@@ -311,6 +320,18 @@
},
getFormData(form) {
this.form = form;
+ //灞炴�х爜娈佃祴鍊�
+ if (this.attrList) {
+ this.attrList.forEach(item => {
+ if (this.form.hasOwnProperty(item.referAttributeId)) {
+ this.codeApplyForm[item.oid] = this.form[item.referAttributeId];
+ }
+ })
+ }
+ },
+ //灞炴�х爜娈佃祴鍊�
+ attrListForm(attrListForm){
+ this.attrList=attrListForm;
},
getCodeApplyFormData(codeApplyForm) {
this.codeApplyForm = codeApplyForm;
@@ -325,6 +346,7 @@
this.$refs.CodeApply.form[item.name] = undefined;
item.readOnly=false;
item.referConfig.extraParams.parentClassifyValueOid=data.value;
+ item.referConfig.reloadData = true;
childItems.push(item)
}
return item;
@@ -355,7 +377,7 @@
// }
// }
let resembleQueryList = [];
- if (this.$refs.resembleQueryRef) {
+ if (this.showResembleQuery && this.$refs.resembleQueryRef) {
// 杩涜鐩镐技椤规煡璇�
resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
this.form
--
Gitblit v1.9.3