From 8db5b7ff317abcfd6905a2722850944d8574eafa Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期三, 13 十二月 2023 19:07:18 +0800 Subject: [PATCH] feat: 导出统一修改 --- admin-web/src/api/exportExcel.js | 10 +++++----- admin-web/src/views/mixins/listPage.js | 20 +------------------- admin-web/src/utils/base.js | 11 +++++------ 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/admin-web/src/api/exportExcel.js b/admin-web/src/api/exportExcel.js index ccc2c98..5b21a72 100644 --- a/admin-web/src/api/exportExcel.js +++ b/admin-web/src/api/exportExcel.js @@ -13,7 +13,7 @@ export function procureExport(params) { return request({ url: '/pc/whForm/procure/list/export', - responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob + // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob method: 'get', params, }); @@ -22,7 +22,7 @@ export function transferExport(params) { return request({ url: '/pc/l/wh/form/transfer/list/export', - responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob + // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob method: 'get', params, }); @@ -32,7 +32,7 @@ export function inventoryExport(params) { return request({ url: '/pc/l/wh/form/inventory/list/export', - responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob + // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob method: 'get', params, }); @@ -42,7 +42,7 @@ export function scrappedExport(params) { return request({ url: '/pc/l/wh/form/scrapped/list/export', - responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob + // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob method: 'get', params, }); @@ -51,7 +51,7 @@ export function deptScrappedExport(params) { return request({ url: '/pc/l/wh/form/scrapped/deptList/export', - responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob + // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob method: 'get', params, }); diff --git a/admin-web/src/utils/base.js b/admin-web/src/utils/base.js index 76b7d74..c3ef085 100644 --- a/admin-web/src/utils/base.js +++ b/admin-web/src/utils/base.js @@ -25,14 +25,13 @@ // 涓嬭浇鏂囦欢 -export function downLoad(obj) { - let url = obj.url - if (obj.url.indexOf('http') !== 0) { - url = SettingIplatform.ftpUrl + obj.url +export function downLoad(url) { + let link = url + if (link.indexOf('http') !== 0) { + link = SettingIplatform.ftpUrl + url } - window.open(decodeURI(url)) var doc = document.createElement('a') - doc.href = url + doc.href = link doc.target = '_blank' doc.rel = "noreferrer noopener" doc.click() diff --git a/admin-web/src/views/mixins/listPage.js b/admin-web/src/views/mixins/listPage.js index 11c66fa..5054212 100644 --- a/admin-web/src/views/mixins/listPage.js +++ b/admin-web/src/views/mixins/listPage.js @@ -43,7 +43,6 @@ methods: { // 瀵煎嚭 handleExport(api, fileName, params) { - console.log(fileName) let loading = this.$loading({ lock: true, text: '瀵煎嚭涓紝璇风◢鍊�...', @@ -53,24 +52,7 @@ // 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁� dataExport[api](params) .then((res) => { - const blob = new Blob([res], {type: 'application/vnd.ms-excel'}); - /*if ('download' in document.createElement('a')) { - // 闈濱E涓嬭浇 - const elink = document.createElement('a'); - elink.download = `${fileName}.xls`; - elink.style.display = 'none'; - const URL = window.URL || window.webkitURL - const href = URL.createObjectURL(blob) - elink.href = href; - document.body.appendChild(elink); - elink.click(); - URL.revokeObjectURL(elink.href); - document.body.removeChild(elink); - window.URL.revokeObjectURL(href) - } else { - // IE10+涓嬭浇 - navigator.msSaveBlob(blob, `${fileName}.xls`); - }*/ + console.log(res) downLoad(res) this.$message.success('瀵煎嚭鎴愬姛锛�'); loading.close(); -- Gitblit v1.9.1