From 7569bb2d8f1fafa2058a8090078ebf21c1a3e486 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 06 七月 2023 18:44:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b54d048..a1ebae2 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -76,6 +76,8 @@
:codeClassifyOid="codeClassifyOid"
:redisOid="redisOid"
:type="type"
+ :title="title"
+ :secDTOList="secDTOList"
></ShowImportData>
</el-dialog>
</template>
@@ -135,7 +137,7 @@
return this.currentTypeObj[this.type]["tipList"];
},
downloadTemplateApi() {
- console.log(this.currentTypeObj[this.type], 'this.type');
+ console.log(this.currentTypeObj[this.type], "this.type");
return this.currentTypeObj[this.type]["downloadTemplateFun"];
},
action() {
@@ -148,15 +150,16 @@
classifyAttr: this.classifyAttr,
};
} else if (this.type === "batchImportApply") {
- const secDTOList = this.localSecVOList.map(item => {
- return {
- secOid: item.oid,
- secValue: this.codeApplyForm[item.id]
- }
- })
+ // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+ this.secDTOList = this.localSecVOList.map((item) => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.id],
+ };
+ });
return {
codeClassifyOid: this.codeClassifyOid,
- secDTOList: JSON.stringify(secDTOList),
+ secDTOList: JSON.stringify(this.secDTOList),
...this.codeApplyForm,
};
} else if (this.type === "batchApplyCode") {
@@ -212,6 +215,7 @@
upParams: "classifyAttr",
},
},
+ secDTOList: [],
};
},
methods: {
@@ -252,9 +256,9 @@
},
onSuccess(res) {
if (Object.keys(res.data).length === 0) {
- this.$message.success(this.title + '瀵煎叆鎴愬姛锛�')
- this.dialogVisible = false
- return
+ this.$message.success(this.title + "瀵煎叆鎴愬姛锛�");
+ this.dialogVisible = false;
+ return;
}
if (res.data.fileOid) {
const fileName = res.data.filePath.split("/").pop();
@@ -277,7 +281,7 @@
}
},
onError(err) {
- console.log(err, 'err');
+ console.log(err, "err");
this.pageLoading.close();
},
uploadChange(file) {
--
Gitblit v1.9.3