From e65e4b636bf4b4e22a2d44e5940e8ff6bb70cd6b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 13 十月 2023 13:35:26 +0800
Subject: [PATCH] 字符串转换出错bug修复
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 2f714ce..6e36920 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -11,9 +11,12 @@
@opened="openDialog"
>
<FormTemplate
+ key="masterForm" data-key="masterForm"
v-bind="$attrs"
:type="type"
+ :TreeValue="TreeValue"
:rowOid="rowOid"
+ :eventList="eventList"
:templateOid="templateOid"
v-if="dialogVisible"
ref="FormTemplate"
@@ -31,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"
@@ -91,6 +95,10 @@
type: Boolean,
default: false,
},
+ TreeValue:{
+ type: String,
+ default: "",
+ },
type: {
type: String,
default: "add",
@@ -123,6 +131,7 @@
},
data() {
return {
+ eventList:[],
//鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
codeValueApplyStatus:'',
loading: false,
@@ -142,7 +151,7 @@
coderefersec: "refer",//寮曠敤鐮佹
codeattrsec: "text",
codelevelsec: "text",
- codedatesec: "text"
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -246,11 +255,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;
}
@@ -263,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 = [
@@ -290,15 +300,13 @@
if (that.secVOList.length > 0 && that.type === "add") {
that.showCodeApply = true;
that.activeName = "codeApply";
- that.$nextTick(() => {
- that.$refs.CodeApply.templateRender(that.secVOList);
+ this.$nextTick(() => {
+ 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) {
@@ -310,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.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
+ this.$refs.CodeApply.changeChildItem(childItems);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -344,7 +356,7 @@
// }
// }
let resembleQueryList = [];
- if (this.$refs.resembleQueryRef) {
+ if (this.showResembleQuery && this.$refs.resembleQueryRef) {
// 杩涜鐩镐技椤规煡璇�
resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
this.form
@@ -475,8 +487,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