From 8314c2943734770c6a38e67147e6367f683df8d1 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 11:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
index 874abfc..0cc82fa 100644
--- a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
@@ -20,9 +20,9 @@
</div>
<div class="btn">
<el-button size="small" type="primary" @click="openAdd">鏂板</el-button>
- <el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx' :headers="headers"
- :on-change="beforeUpload" :on-error="onError" ref='upload' :on-success="handleSuccessUp"
- style="display:inline-block;margin-left: 20px;">
+ <el-upload :action="action" :multiple="false" :show-file-list="false" accept='.doc,.docx'
+ :headers="uploadHeader" :on-change="beforeUpload" :on-error="onError" ref='upload'
+ :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
<el-button type="primary" size="small">瀵煎叆</el-button></el-upload>
<el-button size="small" type="primary" @click="handleDown" :loading="outLoading"
style="display:inline-block;margin-left: 20px;">瀵煎嚭</el-button>
@@ -133,7 +133,6 @@
import {
getYearAndMonthAndDays
} from '@/utils/date'
-import { getToken } from "@/utils/auth";
import {
selectUserCondition,
} from "@/api/business/inspectionTask.js";
@@ -232,11 +231,6 @@
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
- headers() {
- return {
- 'Authorization': "Bearer " + getToken()
- }
- },
action() {
return this.javaApi + '/manageRecordIssueRecycle/exportInManageRecordIssueRecycle'
},
@@ -306,10 +300,7 @@
this.outLoading = true
exportOutManageRecordIssueRecycle(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) return this.$message.error('瀵煎嚭澶辫触')
- this.$message.success('瀵煎嚭鎴愬姛')
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
+ this.$download.downloadFileFromUrl(res.data, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
})
},
getList() {
@@ -372,7 +363,7 @@
this.upLoading = false;
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
- this.refreshTable()()
+ this.refreshTable()
} else {
this.$message.error('涓婁紶澶辫触');
}
--
Gitblit v1.9.3