From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 5db4a8a..c7e2680 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -196,7 +196,7 @@
"copyfromversion",
"secretgrade",
],
- codeRuleOid: ''
+ codeRuleOid: "",
};
},
created() {},
@@ -236,7 +236,10 @@
if (this.hasResemble) {
this.activeName = "resembleQuery";
this.showResembleQuery = true;
+ } else {
+ this.showResembleQuery = false;
}
+ console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
@@ -255,7 +258,7 @@
getCodeRule() {
getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
if (res.data && res.data.code === 200) {
- this.codeRuleOid = res.data.data.oid
+ this.codeRuleOid = res.data.data.oid;
const typeList = [
"codefixedsec",
"codeclassifysec",
@@ -317,10 +320,13 @@
return false;
}
}
- // 杩涜鐩镐技椤规煡璇�
- const resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
- this.form
- );
+ let resembleQueryList = [];
+ if (this.$refs.resembleQueryRef) {
+ // 杩涜鐩镐技椤规煡璇�
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ this.form
+ );
+ }
if (resembleQueryList.length === 0) {
let resForm = {};
const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
@@ -352,20 +358,38 @@
}
)
.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 => {
+ if (formValue[item]) {
+ this.$delete(formValue, item)
+ }
+ })
resForm.data = formValue;
resForm = Object.assign({}, resForm, defaultValue);
- resForm.secDTOList = this.secVOList.map(item => {
+ 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;
+ console.log(resForm, 'ddd');
this.$emit("submit", resForm);
})
.catch(() => {});
--
Gitblit v1.9.3