From 31e47cebb043a65c838a23c517848f1afdab778c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 09:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/reportPreparation/index.vue | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 29da53d..01da7ac 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -547,16 +547,7 @@
downFile({
id: row.id,
}).then(res => {
- if (res.code === 200) {
- let url = '';
- if (res.data.type == 1) {
- url = this.javaApi + '/img/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
- }
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
}).catch(error => {
})
@@ -600,8 +591,11 @@
this.outLoading = true
downAll({ ids: str }).then(res => {
this.outLoading = false
- this.$download.saveAs(this.javaApi + res.message, row.fileName);
+ this.$download.zip(res.data, '鎶ュ憡.zip');
+ }).catch(() => {
+ this.outLoading = false
})
+
},
beforeUpload(file) {
const isZip = file.type === 'application/zip' || file.name.endsWith('.zip');
@@ -740,6 +734,7 @@
},
// 鏌ョ湅鎶ュ憡
viewIssued(row) {
+ console.log('this.javaApi', this.javaApi)
this.currentInfo = row;
let fileName = (row.urlS === null || row.urlS === '') ? row.url : row.urlS
let fileType = "docx"
--
Gitblit v1.9.3