From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index af1fcd4..e9fb97f 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"
@@ -78,6 +79,7 @@
:type="type"
:title="title"
:secDTOList="secDTOList"
+ :resetTable="resetTable"
></ShowImportData>
</el-dialog>
</template>
@@ -115,6 +117,7 @@
type: String,
default: "",
},
+ resetTable: Function
},
computed: {
uploadHeaders() {
@@ -154,7 +157,7 @@
this.secDTOList = this.localSecVOList.map((item) => {
return {
secOid: item.oid,
- secValue: this.codeApplyForm[item.id],
+ secValue: this.codeApplyForm[item.oid],
};
});
return {
@@ -173,7 +176,7 @@
leftTree: [],
redisOid: "",
pageLoading: null,
- showCodeApply: false,
+ showCodeApply: true,
currentTypeObj: {
historyImport: {
title: "鍘嗗彶鏁版嵁瀵煎叆",
@@ -271,12 +274,14 @@
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
};
}
});
--
Gitblit v1.9.3