From 518f6efefe510f45176076261f49e0fa1bc40a07 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 25 八月 2023 11:06:42 +0800
Subject: [PATCH] 处理basemodel，bean里面遇到字段相同且map里面数据为空，则使用bean里面的值
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 162 ++++++++++++++++++++++++++---------------------------
1 files changed, 79 insertions(+), 83 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index bd8484d..69e0bc2 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -3,7 +3,8 @@
:visible.sync="dialogVisible"
v-if="dialogVisible"
v-dialogDrag
- top="5vh"
+ top="-5vh"
+ class="avue-dialog avue-dialog--top"
:title="title"
:width="width"
append-to-body
@@ -83,7 +84,7 @@
import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
export default {
- name: "FormTemplateDialog",
+ name: "FormTemplateDialog",
components: { ResembleQuery, FormTemplate },
props: {
visible: {
@@ -133,10 +134,13 @@
showCodeApply: false,
showResembleQuery: false,
selfColumnType: {
- codefixedsec: "combox",
- codeclassifysec: "refer",
- codevariablesec: "text",
- coderefersec: "refer",
+ codefixedsec: "combox",//鍥哄畾鐮佹
+ codeclassifysec: "refer",//鍒嗙被鐮佹
+ codevariablesec: "text",//鍙彉鐮佹
+ coderefersec: "refer",//寮曠敤鐮佹
+ codeattrsec: "text",
+ codelevelsec: "text",
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -155,6 +159,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -260,10 +265,19 @@
if (res.data && res.data.code === 200) {
this.codeRuleOid = res.data.data.oid;
const typeList = [
+ //鍥哄畾鐮佹
"codefixedsec",
+ //鍒嗙被鐮佹
"codeclassifysec",
+ //鍙彉鐮佹
"codevariablesec",
+ //寮曠敤鐮佹
"coderefersec",
+ //灞炴�х爜娈�
+ "codeattrsec",
+ // "codelevelsec",
+ //鏃ユ湡鐮佹
+ "codedatesec",
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
@@ -278,6 +292,8 @@
this.showCodeApply = false;
}
}
+ console.log(' this.secVOList',this.secVOList)
+ console.log(' res.data.data.secVOList',res.data.data.secVOList)
});
},
getFormData(form) {
@@ -293,6 +309,8 @@
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;
}
return item;
});
@@ -313,13 +331,13 @@
if (!formValidate) return;
let codeValidate = true;
// 杩涜鐮佸�肩敵璇锋牎楠�
- if (this.showCodeApply) {
- codeValidate = await this.$refs.CodeApply.validate();
- if (!codeValidate) {
- this.activeName = "codeApply";
- return false;
- }
- }
+ // if (this.showCodeApply) {
+ // codeValidate = await this.$refs.CodeApply.validate();
+ // if (!codeValidate) {
+ // this.activeName = "codeApply";
+ // return false;
+ // }
+ // }
let resembleQueryList = [];
if (this.$refs.resembleQueryRef) {
// 杩涜鐩镐技椤规煡璇�
@@ -327,42 +345,8 @@
this.form
);
}
- if (resembleQueryList.length === 0) {
- let resForm = {};
- const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
- this.form
- );
- const noData = [
- "jiliangdwname",
- "materialtypeText",
- "morengongysname",
- "$caigouwl",
- "$xiaoshouwl",
- "$shifoupihaoguanli",
- "lcstatus_text",
- "hesuanfenleiname",
- "$kucunwl",
- ];
- noData.forEach((item) => {
- this.$delete(formValue, item);
- });
- resForm.data = formValue;
- resForm = Object.assign({}, resForm, defaultValue);
- resForm.secDTOList = [];
- for (const key in this.codeApplyForm) {
- if (Object.hasOwnProperty.call(this.codeApplyForm, key)) {
- const value = this.codeApplyForm[key];
- if (value) {
- resForm.secDTOList.push({ secOid: key, secValue: value });
- }
- }
- }
- resForm.codeClassifyOid = this.codeClassifyOid;
- resForm.codeRuleOid = this.codeRuleOid;
- resForm.templateOid = this.templateOid;
- this.$emit("submit", resForm);
- } else {
- this.$confirm(
+ if (resembleQueryList.length > 0) {
+ await this.$confirm(
`璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
"闇�瑕佹偍纭",
{
@@ -370,41 +354,51 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}
- )
- .then(() => {
- // 鎺掗櫎涓�浜涘瓧娈�
- const noData = [
- "jiliangdwname",
- "materialtypeText",
- "morengongysname",
- "$caigouwl",
- "$xiaoshouwl",
- "$shifoupihaoguanli",
- "lcstatus_text",
- "hesuanfenleiname",
- "$kucunwl",
- ];
- let resForm = {};
- const { defaultValue, formValue } =
- this.getDefaultValueAndFormValues(this.form);
- noData.forEach((item) => {
- this.$delete(formValue, item);
- });
- resForm.data = formValue;
- resForm = Object.assign({}, resForm, defaultValue);
- resForm.secDTOList = this.secVOList.map((item) => {
- return {
- secOid: item.oid,
- secValue: this.codeApplyForm[item.oid],
- };
- });
- resForm.codeClassifyOid = this.codeClassifyOid;
- resForm.codeRuleOid = this.codeRuleOid;
- resForm.templateOid = this.templateOid;
- this.$emit("submit", resForm);
- })
- .catch(() => {});
+ );
}
+ // 鎺掗櫎涓�浜涘瓧娈�
+ const noData = [
+ "jiliangdwname",
+ "materialtypeText",
+ "morengongysname",
+ "$caigouwl",
+ "$xiaoshouwl",
+ "$shifoupihaoguanli",
+ "lcstatus_text",
+ "hesuanfenleiname",
+ "$kucunwl",
+ "oldcode",
+ "lastmodifier"
+ ];
+ let resForm = {};
+ const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
+ this.form
+ );
+ noData.forEach((item) => {
+ this.$delete(formValue, item);
+ });
+ const keys = Object.keys(formValue);
+ debugger
+ keys.forEach((item, index) => {
+ keys.forEach((itm, idx) => {
+ if ((item === ('$' + itm)) && idx !== index) {
+ this.$delete(formValue, keys[index]);
+ }
+ })
+ });
+
+ resForm.data = formValue;
+ resForm = Object.assign({}, resForm, defaultValue);
+ resForm.secDTOList = this.secVOList.map((item) => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.oid],
+ };
+ });
+ resForm.codeClassifyOid = this.codeClassifyOid;
+ resForm.codeRuleOid = this.codeRuleOid;
+ resForm.templateOid = this.templateOid;
+ this.$emit("submit", resForm);
},
getDefaultValueAndFormValues(form) {
let defaultValue = {};
@@ -430,6 +424,7 @@
getReferConfig(item) {
let params = {};
if (item.secType == "codeclassifysec") {
+ //鍒嗙被鐮佹
params = {
isMuti: false,
type: "grid",
@@ -474,6 +469,7 @@
},
};
} else if (item.secType == "coderefersec") {
+ //寮曠敤鐮佹
params = JSON.parse(item.referValueInfo);
}
return params;
--
Gitblit v1.9.3