From e4ad5c0aa7bd574c36be97eea4dd124dad9479ca Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 29cfe88..9b76f3d 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -169,7 +169,7 @@
return this.currentTypeObj[this.type]["action"];
},
upParams() {
- if (this.type === "historyImport" || this.type === "batchApplyCode") {
+ if (this.type === "historyImport" || this.type === "batchApplyCode" ) {
return {
codeClassifyOid: this.codeClassifyOid,
classifyAttr: this.classifyAttr,
@@ -191,6 +191,10 @@
return {
codeClassifyOid: this.codeClassifyOid,
};
+ }else if(this.type === 'groupCode'){
+ return {
+ codeClassifyOid: this.codeClassifyOid,
+ };
}
},
},
@@ -257,7 +261,9 @@
"2.姣忔浠呰兘鏈�澶氬鍏�5000鏉℃暟鎹�(鍙�氳繃nacos杩涜閰嶇疆锛屾帹鑽�5000/娆″鍏�)锛屽鏋滃嚭閿欎細杩斿洖閿欒鐨勬暟鎹拰鍘熷洜锛屼絾鏄纭暟鎹彲浠ョ户缁繚瀛�",
"3.Excel绗竴琛屽拰绗簩琛屼緷娆′负浼佷笟缂栫爜鍜岄泦鍥㈢紪鐮侊紙蹇呭～锛�"
],
- action: "/api/ubcs-code/mdmEngineController/importGroupCode"
+ action: "/api/ubcs-code/mdmEngineController/importGroupCode",
+ downloadTemplateFun: null,
+ upParams: "classifyAttr",
}
},
secDTOList: [],
--
Gitblit v1.10.0