From 1707976c2f30199565c2ddbea0e2c33edd4688a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 九月 2023 09:11:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 886ce91..6e36920 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -11,6 +11,7 @@
@opened="openDialog"
>
<FormTemplate
+ key="masterForm" data-key="masterForm"
v-bind="$attrs"
:type="type"
:TreeValue="TreeValue"
@@ -33,7 +34,8 @@
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
<FormTemplate
- v-bind="$attrs"
+ key="codeApplyForm" data-key="codeApplyForm"
+ secDTOListv-bind="$attrs"
:type="type"
:selfColumnType="selfColumnType"
:selfColumnConfig="selfColumnConfig"
@@ -271,8 +273,8 @@
},
// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
getCodeRule() {
- let that = this;
- getCodeRule({ codeClassifyOid: that.codeClassifyOid }).then((res) => {
+ let that = this;
+ getCodeRule({codeClassifyOid: that.codeClassifyOid}).then((res) => {
if (res.data && res.data.code === 200) {
that.codeRuleOid = res.data.data.oid;
const typeList = [
@@ -298,8 +300,8 @@
if (that.secVOList.length > 0 && that.type === "add") {
that.showCodeApply = true;
that.activeName = "codeApply";
- that.$nextTick(() => {
- that.$refs.CodeApply.templateRender(that.secVOList,this.TreeValue);
+ this.$nextTick(() => {
+ that.$refs.CodeApply.templateRender(that.secVOList, this.TreeValue);
});
} else {
that.showCodeApply = false;
@@ -316,16 +318,20 @@
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
const { field } = data;
+ let childItems=[];
this.secVOList = this.secVOList.map((item) => {
if (item.parentClassifySecOid === field) {
this.$refs.CodeApply.form[item.oid] = undefined;
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;
});
- this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
+ //this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
+ this.$refs.CodeApply.changeChildItem(childItems);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -350,7 +356,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