From 2719424e8639a508f716dca2aaa05c340778dff1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:12:06 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index a1ebae2..c7a1d41 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -144,7 +144,7 @@
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,
@@ -161,11 +161,6 @@
codeClassifyOid: this.codeClassifyOid,
secDTOList: JSON.stringify(this.secDTOList),
...this.codeApplyForm,
- };
- } else if (this.type === "batchApplyCode") {
- return {
- codeClassifyOid: this.codeClassifyOid,
- classifyAttr: this.classifyAttr,
};
}
},
@@ -227,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,
@@ -271,10 +266,20 @@
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,
+ name: item.codeRuleVO.name
+ }
+ } else {
+ return {
...item.codeClassifyTemplateVO,
cloNamesList: item.cloNamesList,
+ codeClassifyOid: item.codeClassifyTemplateVO.codeclassifyoid
};
+ }
});
this.showVisible = true;
});
--
Gitblit v1.9.3