From 980c41509b2afa00de9d57e25e5551c8bfc40c08 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 04 十二月 2023 14:48:59 +0800
Subject: [PATCH] 标准接口传值修改
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 230 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 150 insertions(+), 80 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 340f056..561cb91 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -413,90 +413,160 @@
}
},
async submit() {
- // 杩涜琛ㄥ崟鏍￠獙
- const formValidate = await this.$refs.FormTemplate.validate();
- 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.showResembleQuery && this.$refs.resembleQueryRef) {
- // 杩涜鐩镐技椤规煡璇�
- resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ if(this.status){
+ // 杩涜琛ㄥ崟鏍￠獙
+ const formValidate = await this.$refs.FormTemplate.validate();
+ if (!formValidate) return;
+ let resembleQueryList = [];
+ if (this.showResembleQuery && this.$refs.resembleQueryRef) {
+ // 杩涜鐩镐技椤规煡璇�
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ this.form
+ );
+ }
+ if (resembleQueryList.length > 0) {
+ await this.$confirm(
+ `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
+ "闇�瑕佹偍纭",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ }
+ // 鎺掗櫎涓�浜涘瓧娈�
+ const noData = [
+ "jiliangdwname",
+ "materialtypeText",
+ "morengongysname",
+ "$caigouwl",
+ "$xiaoshouwl",
+ "$shifoupihaoguanli",
+ "lcstatus_text",
+ "hesuanfenleiname",
+ "$kucunwl",
+ "lastmodifier"
+ ];
+
+ let resForm = {};
+ const {defaultValue, formValue} = this.getDefaultValueAndFormValues(
this.form
);
- }
- if (resembleQueryList.length > 0) {
- await this.$confirm(
- `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
- "闇�瑕佹偍纭",
- {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- }
- );
- }
- // 鎺掗櫎涓�浜涘瓧娈�
- const noData = this.status ? [
- "jiliangdwname",
- "materialtypeText",
- "morengongysname",
- "$caigouwl",
- "$xiaoshouwl",
- "$shifoupihaoguanli",
- "lcstatus_text",
- "hesuanfenleiname",
- "$kucunwl",
- "lastmodifier"
- ] : [
- "jiliangdwname",
- "materialtypeText",
- "morengongysname",
- "$caigouwl",
- "$xiaoshouwl",
- "$shifoupihaoguanli",
- "lcstatus_text",
- "hesuanfenleiname",
- "$kucunwl",
- "oldcode",
- "lastmodifier"
- ];
+ noData.forEach((item) => {
+ this.$delete(formValue, item);
+ });
+ const keys = Object.keys(formValue);
+ keys.forEach((item, index) => {
+ keys.forEach((itm, idx) => {
+ if ((item === ('$' + itm)) && idx !== index) {
+ this.$delete(formValue, keys[index]);
+ }
+ })
+ });
- let resForm = {};
- const {defaultValue, formValue} = this.getDefaultValueAndFormValues(
- this.form
- );
- noData.forEach((item) => {
- this.$delete(formValue, item);
- });
- const keys = Object.keys(formValue);
- 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.data = formValue;
+ resForm.data = Object.assign({}, resForm.data, defaultValue);
+ resForm.secDTOList = this.secVOList.map((item) => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.oid],
+ };
+ });
+ //鏍囧噯鐗瑰畾
+ const mappings = {
+ codeStandardEditType: 'operationType',
+ reviseSeries: 'series',
+ oldcode: 'oldCode',
+ releaseDate: 'releaseTime',
+ isSeries: 'isEditseries'
};
- });
- resForm.codeClassifyOid = this.codeClassifyOid;
- resForm.codeRuleOid = this.codeRuleOid;
- resForm.templateOid = this.templateOid;
- this.$emit("submit", resForm);
+
+ for (const key in mappings) {
+ if (formValue[key]) {
+ resForm[mappings[key]] = formValue[key];
+ }
+ }
+ //
+ resForm.codeClassifyOid = this.codeClassifyOid;
+ resForm.codeRuleOid = this.codeRuleOid;
+ resForm.templateOid = this.templateOid;
+ this.$emit("submit", resForm);
+ }else {
+ // 杩涜琛ㄥ崟鏍￠獙
+ const formValidate = await this.$refs.FormTemplate.validate();
+ 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.showResembleQuery && this.$refs.resembleQueryRef) {
+ // 杩涜鐩镐技椤规煡璇�
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ this.form
+ );
+ }
+ if (resembleQueryList.length > 0) {
+ await this.$confirm(
+ `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
+ "闇�瑕佹偍纭",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ }
+ // 鎺掗櫎涓�浜涘瓧娈�
+ 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);
+ 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 = {};
--
Gitblit v1.9.3