From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index a1ebae2..3b347ac 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -31,6 +31,7 @@
left="30px"
></Divider>
<FormTemplate
+ v-loading="!showCodeApply"
style="margin-top: 30px"
type="add"
:selfColumnType="selfColumnType"
@@ -144,7 +145,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,
@@ -154,18 +155,13 @@
this.secDTOList = this.localSecVOList.map((item) => {
return {
secOid: item.oid,
- secValue: this.codeApplyForm[item.id],
+ secValue: this.codeApplyForm[item.oid],
};
});
return {
codeClassifyOid: this.codeClassifyOid,
secDTOList: JSON.stringify(this.secDTOList),
...this.codeApplyForm,
- };
- } else if (this.type === "batchApplyCode") {
- return {
- codeClassifyOid: this.codeClassifyOid,
- classifyAttr: this.classifyAttr,
};
}
},
@@ -178,7 +174,7 @@
leftTree: [],
redisOid: "",
pageLoading: null,
- showCodeApply: false,
+ showCodeApply: true,
currentTypeObj: {
historyImport: {
title: "鍘嗗彶鏁版嵁瀵煎叆",
@@ -227,10 +223,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 +267,21 @@
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;
});
--
Gitblit v1.9.3