From cf1ee9d413456f37d1abc5d8ed23a9875aa15bb1 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期一, 26 五月 2025 15:11:26 +0800
Subject: [PATCH] 销售管理>销售台站=》设置新增数据默认日期，添加子产品添加搜索逻辑更改为tree树形式，根据登录的账号匹配用户昵称默认选择当前用户昵称
---
src/plugins/download.js | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/plugins/download.js b/src/plugins/download.js
index 41b2934..82e26ed 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -1,11 +1,12 @@
-import axios from 'axios'
-import { ElMessage } from 'element-plus'
+锘縤mport axios from 'axios'
+import { ElLoading, ElMessage } from 'element-plus'
import { saveAs } from 'file-saver'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { blobValidate } from '@/utils/ruoyi'
const baseURL = import.meta.env.VITE_APP_BASE_API
+let downloadLoadingInstance
export default {
name(name, isDelete = true) {
@@ -15,58 +16,64 @@
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(async (res) => {
- const isLogin = await blobValidate(res.data);
- if (isLogin) {
+ }).then((res) => {
+ const isBlob = blobValidate(res.data)
+ if (isBlob) {
const blob = new Blob([res.data])
this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
} else {
- this.printErrMsg(res.data);
+ this.printErrMsg(res.data)
}
})
},
resource(resource) {
- var url = baseURL + "/common/download/resource?resource=" + encodeURIComponent(resource);
+ var url = baseURL + "/common/download/resource?resource=" + encodeURIComponent(resource)
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(async (res) => {
- const isLogin = await blobValidate(res.data);
- if (isLogin) {
+ }).then((res) => {
+ const isBlob = blobValidate(res.data)
+ if (isBlob) {
const blob = new Blob([res.data])
this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
} else {
- this.printErrMsg(res.data);
+ this.printErrMsg(res.data)
}
})
},
zip(url, name) {
var url = baseURL + url
+ downloadLoadingInstance = ElLoading.service({ text: "姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��", background: "rgba(0, 0, 0, 0.7)", })
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
- }).then(async (res) => {
- const isLogin = await blobValidate(res.data);
- if (isLogin) {
+ }).then((res) => {
+ const isBlob = blobValidate(res.data)
+ if (isBlob) {
const blob = new Blob([res.data], { type: 'application/zip' })
this.saveAs(blob, name)
} else {
- this.printErrMsg(res.data);
+ this.printErrMsg(res.data)
}
+ downloadLoadingInstance.close()
+ }).catch((r) => {
+ console.error(r)
+ ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒')
+ downloadLoadingInstance.close()
})
},
saveAs(text, name, opts) {
- saveAs(text, name, opts);
+ saveAs(text, name, opts)
},
async printErrMsg(data) {
- const resText = await data.text();
- const rspObj = JSON.parse(resText);
+ const resText = await data.text()
+ const rspObj = JSON.parse(resText)
const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
- ElMessage.error(errMsg);
+ ElMessage.error(errMsg)
}
}
--
Gitblit v1.9.3