From b51951257f62c38c9f157830e254b8ef6ae1404a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 17 十一月 2023 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index d691ea9..3df3124 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -140,7 +140,6 @@
return this.currentTypeObj[this.type]["tipList"];
},
downloadTemplateApi() {
- console.log(this.currentTypeObj[this.type], "this.type");
return this.currentTypeObj[this.type]["downloadTemplateFun"];
},
action() {
@@ -183,7 +182,7 @@
tipList: [
"1.鏍囬甯︿簲瑙掓槦鐨勮〃绀哄叧閿睘鎬э紝甯︽槦鍙疯〃绀哄繀杈撻」",
"2.浼佷笟缂栫爜锛岄泦鍥㈢爜鍜岀姸鎬侀兘闇�瑕佸鍏�",
- "3.姣忔浠呰兘鏈�澶氬鍏�10000鏉℃暟鎹紝濡傛灉鍑洪敊浼氳繑鍥為敊璇殑鏁版嵁鍜屽師鍥狅紝浣嗘槸姝ｇ‘鐨勬暟鎹細淇濆瓨",
+ "3.姣忔浠呰兘鏈�澶氬鍏�5000鏉℃暟鎹�(鍙�氳繃nacos杩涜閰嶇疆锛屾帹鑽�5000/娆″鍏�)锛屽鏋滃嚭閿欎細杩斿洖閿欒鐨勬暟鎹拰鍘熷洜锛屼絾鏄纭暟鎹彲浠ョ户缁繚瀛�",
"4.鍒嗙被鐨勮矾寰勯渶瑕佺敤#鍒嗛殧銆備粎濉啓褰撳墠閫夌殑鍒嗙被鏍戜笂鐨勪笅绾у垎绫荤殑璺緞锛屽鏋滃綋鍓嶅垎绫诲凡缁忔槸鍙跺瓙鑺傜偣锛屽垯涓嶅～鍐�",
],
action: "/api/ubcs-code/mdmEngineController/batchImportHistoryData",
@@ -255,6 +254,7 @@
onSuccess(res) {
if (Object.keys(res.data).length === 0) {
this.$message.success(this.title + "瀵煎叆鎴愬姛锛�");
+ this.resetTable()
this.dialogVisible = false;
return;
}
@@ -290,12 +290,13 @@
}
},
onError(err) {
- console.log(err, "err");
this.pageLoading.close();
+ //console.log('onError')
},
uploadChange(file) {
if (file.status === "success" || file.status === "error") {
this.pageLoading.close();
+ //console.log('uploadChange')
}
},
},
--
Gitblit v1.10.0