From ded6e8d2312e139e8ce770c7f1d5830bf2db4af6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 19 七月 2023 11:39:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 84 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index e888918..5268994 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -281,7 +281,7 @@
title: "鏌ョ湅璇︾粏淇℃伅",
setForm: {},
},
- batchApplyCodeTableData: {},
+ batchSelectTableData: {},
savedList: [],
tab1Loading: false,
tab2Loading: false,
@@ -308,7 +308,7 @@
if (first === true) {
this.codeRuleOid = data.codeRuleOid;
// 绗竴娆℃墦寮�鐩存帴璧嬪�间笉鏍￠獙
- this.batchApplyCodeTableData[data.codeRuleOid] = {
+ this.batchSelectTableData[data.codeRuleOid] = {
name: data.name,
templateOid: data.oid,
cloNamesList: data.cloNamesList,
@@ -328,8 +328,8 @@
}
}
}
- if (!this.batchApplyCodeTableData[data.codeRuleOid]) {
- this.batchApplyCodeTableData[data.codeRuleOid] = {
+ if (!this.batchSelectTableData[data.codeRuleOid]) {
+ this.batchSelectTableData[data.codeRuleOid] = {
name: data.name,
templateOid: data.oid,
cloNamesList: data.cloNamesList,
@@ -337,6 +337,31 @@
codeRuleOid: data.codeRuleOid,
};
}
+ }
+ if (this.type === 'historyImport') {
+ if (first === true) {
+ // 绗竴娆℃墦寮�鐩存帴璧嬪�间笉鏍￠獙
+ this.batchSelectTableData[data.codeClassifyOid] = {
+ name: data.name,
+ templateOid: data.oid,
+ cloNamesList: data.cloNamesList,
+ codeClassifyOid: data.codeClassifyOid,
+ codeRuleOid: data.codeRuleOid,
+ };
+ // 涓嶆槸绗竴娆℃墦寮�闇�瑕佷紭鍏堟牎楠�
+ }else if (this.localCodeClassifyOid === data.codeClassifyOid) {
+ console.log("閲嶅鐐瑰嚮");
+ }
+ if (!this.batchSelectTableData[data.codeClassifyOid]) {
+ this.batchSelectTableData[data.codeClassifyOid] = {
+ name: data.name,
+ templateOid: data.oid,
+ cloNamesList: data.cloNamesList,
+ codeClassifyOid: data.codeClassifyOid,
+ tab1Selected: []
+ };
+ }
+ this.selection = this.batchSelectTableData[this.localCodeClassifyOid]['tab1Selected']
}
this.localCodeClassifyOid = data.codeClassifyOid;
this.cloNamesList = data.cloNamesList;
@@ -352,7 +377,11 @@
(item) => !this.savedList.includes(item.oid)
);
if (this.type === "batchApplyCode") {
- this.batchApplyCodeTableData[data.codeRuleOid]["tab1"] =
+ this.batchSelectTableData[data.codeRuleOid]["tab1"] =
+ this.tab1Table;
+ }
+ if (this.type === "historyImport") {
+ this.batchSelectTableData[data.codeClassifyOid]["tab1"] =
this.tab1Table;
}
});
@@ -366,13 +395,17 @@
this.tab2Loading = false
this.tab2Table = res.data.data;
if (this.tab2Table.length > 0 && this.type === "batchApplyCode") {
- this.batchApplyCodeTableData[data.codeRuleOid]["codeApply"] = {};
- this.batchApplyCodeTableData[data.codeRuleOid]["tab2"] =
- res.data.data;
+ this.batchSelectTableData[data.codeRuleOid]["codeApply"] = {};
+ this.batchSelectTableData[data.codeRuleOid]["tab2"] =
+ this.tab2Table
if (this.$refs.CodeApply) {
this.$refs.CodeApply.loading = true;
}
this.getCodeRule();
+ }
+ if (this.type === "historyImport") {
+ this.batchSelectTableData[data.codeClassifyOid]["tab2"] =
+ this.tab2Table
}
});
getFormTemplate({
@@ -384,6 +417,9 @@
},
tab1TableSelectChange(selection) {
this.selectedTab1Table = selection;
+ if (this.batchSelectTableData[this.localCodeClassifyOid]) {
+ this.batchSelectTableData[this.localCodeClassifyOid]['tab1Selected'] = selection
+ }
},
resembleRowChange(row) {
if (!row || !row.oid) {
@@ -425,7 +461,7 @@
return false;
}
}
- let lookedCodeRuleOidList = Object.keys(this.batchApplyCodeTableData);
+ let lookedCodeRuleOidList = Object.keys(this.batchSelectTableData);
let noLookCodeRuleOidList = this.leftTree.filter(
(item) => !lookedCodeRuleOidList.includes(item.codeRuleOid)
);
@@ -436,9 +472,9 @@
}
let errorData = [];
let successData = [];
- for (const key in this.batchApplyCodeTableData) {
- if (Object.hasOwnProperty.call(this.batchApplyCodeTableData, key)) {
- const element = this.batchApplyCodeTableData[key];
+ for (const key in this.batchSelectTableData) {
+ if (Object.hasOwnProperty.call(this.batchSelectTableData, key)) {
+ const element = this.batchSelectTableData[key];
if (element.tab1.length > 0) {
errorData.push(element);
}
@@ -479,6 +515,27 @@
},
};
});
+ } else if (this.type === 'historyImport') {
+ let lookedCodeRuleOidList = Object.keys(this.batchSelectTableData);
+ let noLookCodeRuleOidList = this.leftTree.filter(
+ (item) => !lookedCodeRuleOidList.includes(item.codeClassifyOid)
+ );
+ let noLookName = noLookCodeRuleOidList.map((item) => item.name);
+ if (noLookName.length > 0) {
+ this.$message.warning(`鏁版嵁${noLookName}杩樻湭鏇炬煡鐪嬶紝璇峰厛鏌ョ湅锛乣);
+ return false;
+ }
+ params.codeImprotSaveDatVOList = this.batchSelectTableData.map(item => {
+ return {
+ Clos: item.cloNamesList,
+ dataList: item.tab2.concat(item.tab1Selected),
+ orderDTO: {
+ codeClassifyOid: item.codeClassifyOid,
+ templateOid: item.templateOid,
+ secDTOList: this.secDTOList,
+ },
+ }
+ })
} else {
params.codeImprotSaveDatVOList = [
{
@@ -495,7 +552,6 @@
this.submitLoading = true
submitHistoryimport(params).then((res) => {
this.submitLoading = false
- console.log(res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
}
@@ -503,7 +559,6 @@
},
// 閲嶆柊缂栬緫
reEdit(row) {
- console.log(row, "row");
this.currentSelectedResembleRow = {
templateOid: row.codetemplateoid,
codeClassifyOid: row.codeclassifyid,
@@ -517,7 +572,6 @@
// 鐩存帴缂栬緫鍚庝繚瀛�
FormTemplateSubmit(form) {
addSaveCode(form).then((res) => {
- console.log(res);
if (res.data.code === 200) {
this.savedList.push(form.oid);
this.$message.success("鏂板鎴愬姛锛�");
--
Gitblit v1.9.3