From 7fd952d115d4dfc4534b734e52474636b7688eaf Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 05 七月 2023 17:33:16 +0800
Subject: [PATCH] 业务类型feign修正
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 2bbbf18..b54d048 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -49,6 +49,7 @@
:on-exceed="handleExceed"
:headers="uploadHeaders"
:on-success="onSuccess"
+ :on-error="onError"
:show-file-list="false"
:on-change="uploadChange"
:data="upParams"
@@ -147,9 +148,15 @@
classifyAttr: this.classifyAttr,
};
} else if (this.type === "batchImportApply") {
+ const secDTOList = this.localSecVOList.map(item => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.id]
+ }
+ })
return {
codeClassifyOid: this.codeClassifyOid,
- secDTOList: this.secDTOList,
+ secDTOList: JSON.stringify(secDTOList),
...this.codeApplyForm,
};
} else if (this.type === "batchApplyCode") {
@@ -168,6 +175,7 @@
leftTree: [],
redisOid: "",
pageLoading: null,
+ showCodeApply: false,
currentTypeObj: {
historyImport: {
title: "鍘嗗彶鏁版嵁瀵煎叆",
@@ -208,18 +216,17 @@
},
methods: {
async beforeUpload(file) {
- console.log(file, 'file');
const fileType = file.name.split(".").pop();
if (fileType !== "xlsx" && fileType !== "xls") {
// 涓婁紶鏍煎紡涓嶇鍚堣姹傦紝鎻愮ず閿欒淇℃伅骞跺彇娑堜笂浼�
this.$message.error("鍙厑璁镐笂浼爔lsx銆亁ls鏍煎紡鐨勬枃浠�");
return Promise.reject(false);
}
- if (this.type === "batchImportApply") {
- const flag = await this.$refs.CodeApply.validate();
- if (!flag) {
- return Promise.reject(false);
- }
+ if (this.type === "batchImportApply" && this.showCodeApply) {
+ // const flag = await this.$refs.CodeApply.validate();
+ // if (!flag) {
+ // return Promise.reject(false);
+ // }
}
this.pageLoading = this.$loading({
lock: true,
@@ -249,8 +256,8 @@
this.dialogVisible = false
return
}
- let fileName = res.data.filePath.split("/").pop();
if (res.data.fileOid) {
+ const fileName = res.data.filePath.split("/").pop();
this.$message.error("璇蜂笅杞介敊璇俊鎭枃浠惰繘琛屾煡鐪嬶紒");
downloadErrorFile({ uuid: res.data.fileOid }).then((res2) => {
this.$utilFunc.downloadFileByBlob(res2.data, fileName);
@@ -269,8 +276,11 @@
});
}
},
+ onError(err) {
+ console.log(err, 'err');
+ this.pageLoading.close();
+ },
uploadChange(file) {
- console.log(file, 'file', file.status === "success");
if (file.status === "success" || file.status === "error") {
this.pageLoading.close();
}
--
Gitblit v1.9.3