From 36d3d9da36c71e65081e38cf9cfbd5e0ff6bfeed Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 14 七月 2023 21:15:42 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 66 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 98665ec..68f7141 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
@@ -196,7 +197,7 @@
"copyfromversion",
"secretgrade",
],
- codeRuleOid: ''
+ codeRuleOid: "",
};
},
created() {},
@@ -237,9 +238,9 @@
this.activeName = "resembleQuery";
this.showResembleQuery = true;
} else {
- this.showResembleQuery = false
+ this.showResembleQuery = false;
}
- console.log(this.hasResemble, 'this.hasResemblethis.hasResemble');
+ console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
@@ -258,7 +259,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",
@@ -313,25 +314,39 @@
if (!formValidate) return;
let codeValidate = true;
// 杩涜鐮佸�肩敵璇锋牎楠�
- if (this.showCodeApply) {
- codeValidate = await this.$refs.CodeApply.validate();
- if (!codeValidate) {
- this.activeName = "codeApply";
- return false;
- }
- }
- let resembleQueryList = []
+ // if (this.showCodeApply) {
+ // codeValidate = await this.$refs.CodeApply.validate();
+ // if (!codeValidate) {
+ // this.activeName = "codeApply";
+ // return false;
+ // }
+ // }
+ let resembleQueryList = [];
if (this.$refs.resembleQueryRef) {
// 杩涜鐩镐技椤规煡璇�
- resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
- this.form
- );
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ 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 = [];
@@ -358,16 +373,31 @@
}
)
.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 => {
+ resForm.secDTOList = this.secVOList.map((item) => {
return {
secOid: item.oid,
secValue: this.codeApplyForm[item.oid],
- }
+ };
});
resForm.codeClassifyOid = this.codeClassifyOid;
resForm.codeRuleOid = this.codeRuleOid;
--
Gitblit v1.9.3