From b64d6db597d332c699f84e4928f6d3e5551851f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 16:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
index 5946df7..8dcd2c2 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
@@ -63,7 +63,7 @@
pageDeviceAcceptance,
getDeviceAcceptanceFileList,
delDeviceAcceptanceFileList,
- exportUseRecord,
+ exportDeviceAcceptance,
delDeviceAcceptance,
} from '@/api/cnas/resourceDemand/device.js'
export default {
@@ -200,13 +200,10 @@
let url = '';
if (row.type == 1) {
url = this.javaApi + '/img/' + row.fileUrl
- file.downloadIamge(url, row.fileName)
+ this.$download.saveAs(url, row.fileName)
} else {
url = this.javaApi + '/word/' + row.fileUrl
- const link = document.createElement('a');
- link.href = url;
- link.download = row.fileName;
- link.click();
+ this.$download.saveAs(url, row.fileName)
}
},
// 鍒犻櫎
@@ -272,11 +269,10 @@
// 瀵煎嚭
handleDownOne(id) {
this.outLoading = true
- exportUseRecord({ acceptanceId: id }).then(res => {
+ exportDeviceAcceptance({ acceptanceId: id }).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '璁惧楠屾敹.doc')
- this.$message.success('瀵煎嚭鎴愬姛')
})
},
// 鍒犻櫎
--
Gitblit v1.9.3