From cf0fb9a6395d78bd808190a0506d1f003cc6fc31 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期二, 25 二月 2025 14:24:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
index 1aba02d..0548ea4 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
@@ -394,33 +394,33 @@
exportManageDocumentIssueRecycle(this.queryParams).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '鍙戞斁鍥炴敹璁板綍.xlsx')
+ // this.$download.saveAs(blob, '鍙戞斁鍥炴敹璁板綍.xlsx')
//灏咮lob 瀵硅薄杞崲鎴愬瓧绗︿覆
- // let reader = new FileReader();
- // reader.readAsText(blob, 'utf-8');
- // reader.onload = () => {
- // try {
- // let result = JSON.parse(reader.result);
- // if (result.message) {
- // this.$message.error(result.message);
- // } else {
- // const url = URL.createObjectURL(blob);
- // const link = document.createElement('a');
- // link.href = url;
- // link.download = '鍙戞斁鍥炴敹璁板綍.xlsx';
- // link.click();
- // this.$message.success('瀵煎嚭鎴愬姛')
- // }
- // } catch (err) {
- // console.log(err);
- // const url = URL.createObjectURL(blob);
- // const link = document.createElement('a');
- // link.href = url;
- // link.download = '鍙戞斁鍥炴敹璁板綍.xlsx';
- // link.click();
- // this.$message.success('瀵煎嚭鎴愬姛')
- // }
- // }
+ let reader = new FileReader();
+ reader.readAsText(blob, 'utf-8');
+ reader.onload = () => {
+ try {
+ let result = JSON.parse(reader.result);
+ if (result.message) {
+ this.$message.error(result.message);
+ } else {
+ const url = URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = '鍙戞斁鍥炴敹璁板綍.xlsx';
+ link.click();
+ this.$message.success('瀵煎嚭鎴愬姛')
+ }
+ } catch (err) {
+ console.log(err);
+ const url = URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = '鍙戞斁鍥炴敹璁板綍.xlsx';
+ link.click();
+ this.$message.success('瀵煎嚭鎴愬姛')
+ }
+ }
})
},
changeFileList(e) {
--
Gitblit v1.9.3