From 9b1aa8494aa0706dee84f7bc34cd646cf13d9b64 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 10 七月 2023 14:24:56 +0800
Subject: [PATCH] fjl
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index b54d048..b951e11 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,34 +137,30 @@
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() {
return this.currentTypeObj[this.type]["action"];
},
upParams() {
- if (this.type === "historyImport") {
+ if (this.type === "historyImport" || this.type === "batchApplyCode") {
return {
codeClassifyOid: this.codeClassifyOid,
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") {
- return {
- codeClassifyOid: this.codeClassifyOid,
- classifyAttr: this.classifyAttr,
};
}
},
@@ -212,6 +210,7 @@
upParams: "classifyAttr",
},
},
+ secDTOList: [],
};
},
methods: {
@@ -223,10 +222,10 @@
return Promise.reject(false);
}
if (this.type === "batchImportApply" && this.showCodeApply) {
- // const flag = await this.$refs.CodeApply.validate();
- // if (!flag) {
- // return Promise.reject(false);
- // }
+ const flag = await this.$refs.CodeApply.validate();
+ if (!flag) {
+ return Promise.reject(false);
+ }
}
this.pageLoading = this.$loading({
lock: true,
@@ -252,9 +251,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();
@@ -267,17 +266,28 @@
this.redisOid = res.data.redisUuid;
importDataShow(res.data.redisUuid).then((res2) => {
this.leftTree = res2.data.data.map((item) => {
- return {
+ if (this.type === 'batchApplyCode') {
+ return {
+ cloNamesList: item.cloNamesList,
+ oid: item.codeTemplateOid,
+ codeClassifyOid: item.codeClassifyOid,
+ codeRuleOid: item.codeRuleOid,
+ name: item.codeRuleVO.name
+ }
+ } else {
+ return {
...item.codeClassifyTemplateVO,
cloNamesList: item.cloNamesList,
+ codeClassifyOid: item.codeClassifyTemplateVO.codeclassifyoid
};
+ }
});
this.showVisible = true;
});
}
},
onError(err) {
- console.log(err, 'err');
+ console.log(err, "err");
this.pageLoading.close();
},
uploadChange(file) {
--
Gitblit v1.9.3