From 0b8990b4a3cfa8126287a594f0d3810ec97b2e15 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 16:00:08 +0800
Subject: [PATCH] 弹窗展示
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 107 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 87 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 45f318e..71981c8 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
@@ -14,6 +15,7 @@
:type="type"
:rowOid="rowOid"
:templateOid="templateOid"
+ v-if="dialogVisible"
ref="FormTemplate"
@getFormData="getFormData"
></FormTemplate>
@@ -114,6 +116,10 @@
type: String,
default: "纭� 瀹�",
},
+ setForm: {
+ type: Object,
+ default: () => ({}),
+ },
},
data() {
return {
@@ -191,6 +197,7 @@
"copyfromversion",
"secretgrade",
],
+ codeRuleOid: "",
};
},
created() {},
@@ -230,10 +237,18 @@
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);
- })
+ this.$refs.FormTemplate.templateRender(
+ res.data.formDefineVO.items
+ );
+ if (Object.keys(this.setForm).length > 0) {
+ this.$refs.FormTemplate.form = this.setForm;
+ }
+ });
}
})
.catch(() => {
@@ -244,6 +259,7 @@
getCodeRule() {
getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
if (res.data && res.data.code === 200) {
+ this.codeRuleOid = res.data.data.oid;
const typeList = [
"codefixedsec",
"codeclassifysec",
@@ -253,15 +269,15 @@
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- if (this.secVOList.length > 0 && this.type === "add") {
- this.showCodeApply = true;
- this.activeName = "codeApply";
- this.$nextTick(() => {
- this.$refs.CodeApply.templateRender(this.secVOList);
- })
- } else {
- this.showCodeApply = false;
- }
+ if (this.secVOList.length > 0 && this.type === "add") {
+ this.showCodeApply = true;
+ this.activeName = "codeApply";
+ this.$nextTick(() => {
+ this.$refs.CodeApply.templateRender(this.secVOList);
+ });
+ } else {
+ this.showCodeApply = false;
+ }
}
});
},
@@ -300,18 +316,37 @@
// 杩涜鐮佸�肩敵璇锋牎楠�
if (this.showCodeApply) {
codeValidate = await this.$refs.CodeApply.validate();
- console.log(9999);
- if (!codeValidate) return;
+ if (!codeValidate) {
+ this.activeName = "codeApply";
+ 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(
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 = [];
@@ -319,10 +354,13 @@
if (Object.hasOwnProperty.call(this.codeApplyForm, key)) {
const value = this.codeApplyForm[key];
if (value) {
- resForm.secDTOList.push({ [key]: 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(
@@ -335,7 +373,36 @@
}
)
.then(() => {
- this.$emit("submit", this.form);
+ // 鎺掗櫎涓�浜涘瓧娈�
+ 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(() => {});
}
--
Gitblit v1.9.3