From bf70f3cf825f44c457dba2bebd26e7af73e4b2a8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 06 九月 2024 15:02:09 +0800
Subject: [PATCH] 解决集成日志查询bug
---
Source/UBCS-WEB/src/components/BatchImport/index.vue | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index 29cfe88..d9f082b 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -61,24 +61,27 @@
>
</el-upload>
<template #footer>
- <div v-if="type !== 'groupCode'">
- <el-button
- v-if="type !== 'bulkEdit' "
- :loading="downloadLoading"
- size="small"
- type="primary"
- @click="downloadTemplateFun"
- >涓嬭浇瀵煎叆妯℃澘
- </el-button>
- <el-button v-if="type === 'bulkEdit'"
- :loading="downloadLoading"
- size="small"
- type="primary"
- @click="downloadTemplateFun"
- >涓嬭浇缂栬緫妯℃澘
- </el-button>
- </div>
- <el-button size="small" @click="dialogVisible = false">鍏抽棴</el-button>
+ <div style="display: inline-block" v-if="type != 'groupCode'">
+ <el-button
+ v-if="type !== 'bulkEdit' "
+ :loading="downloadLoading"
+ size="small"
+ type="primary"
+ @click="downloadTemplateFun"
+ >涓嬭浇瀵煎叆妯℃澘
+ </el-button>
+ <el-button v-if="type === 'bulkEdit'"
+ :loading="downloadLoading"
+ size="small"
+ type="primary"
+ @click="downloadTemplateFun"
+ >涓嬭浇缂栬緫妯℃澘
+ </el-button>
+ </div>
+ <div style="display: inline-block">
+ <el-button size="small" @click="dialogVisible = false">鍏抽棴</el-button>
+ </div>
+
</template>
<ShowImportData
v-if="showVisible"
@@ -191,6 +194,10 @@
return {
codeClassifyOid: this.codeClassifyOid,
};
+ } else if (this.type === 'groupCode') {
+ return {
+ codeClassifyOid: this.codeClassifyOid,
+ };
}
},
},
@@ -257,7 +264,9 @@
"2.姣忔浠呰兘鏈�澶氬鍏�5000鏉℃暟鎹�(鍙�氳繃nacos杩涜閰嶇疆锛屾帹鑽�5000/娆″鍏�)锛屽鏋滃嚭閿欎細杩斿洖閿欒鐨勬暟鎹拰鍘熷洜锛屼絾鏄纭暟鎹彲浠ョ户缁繚瀛�",
"3.Excel绗竴琛屽拰绗簩琛屼緷娆′负浼佷笟缂栫爜鍜岄泦鍥㈢紪鐮侊紙蹇呭～锛�"
],
- action: "/api/ubcs-code/mdmEngineController/importGroupCode"
+ action: "/api/ubcs-code/mdmEngineController/importGroupCode",
+ downloadTemplateFun: null,
+ upParams: "classifyAttr",
}
},
secDTOList: [],
@@ -314,6 +323,7 @@
}
},
onSuccess(res) {
+ console.log(res)
if (Object.keys(res.data).length === 0) {
this.$message.success(this.title + "瀵煎叆鎴愬姛锛�");
this.resetTable()
--
Gitblit v1.9.3