From 8696b4d4c235a73f2bc5c030e20f1ad7c0a7166e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 25 二月 2025 14:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
index c111c0f..0548ea4 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
@@ -27,7 +27,7 @@
:height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
</div>
<el-dialog :title="'娣诲姞' + radio + '璁板綍'" :visible.sync="addDialogVisible" top="10vh" width="800px">
- <el-row>
+ <el-row v-if="addDialogVisible">
<el-col :span="12" style="margin-bottom: 16px;">
<div class="search_thing">
<div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鐢宠缂栧彿锛�</div>
@@ -152,7 +152,7 @@
<div class="search_thing">
<div class="search_label">涓婁紶闄勪欢锛�</div>
<div class="search_input"><el-upload :auto-upload="false" :multiple="false" :on-change="handleChangeUpload"
- accept='.pdf,.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx' action="#" style="margin: 8px 0 0px 50px;">
+ accept='.pdf,.doc,.docx,.xls,.xlsx' action="#" style="margin: 8px 0 0px 50px;">
<el-button size="small" type="primary">涓婁紶闄勪欢</el-button>
</el-upload></div>
</div>
@@ -222,8 +222,8 @@
prop: "version",
},
{ label: "鏂囦欢鐘舵��", prop: "documentState" },
- { label: "鍙戞斁缂栧彿", prop: "issueUserName" },
- { label: "鍙戞斁浜�", prop: "department" },
+ { label: "鍙戞斁缂栧彿", prop: "issueCode" },
+ { label: "鍙戞斁浜�", prop: "issueUserName" },
{ label: "鍙戞斁鏃ユ湡", prop: "issueDate" },
{ label: "鍥炴敹浜�", prop: "recycleUserName" },
{ label: "鍥炴敹鏃ユ湡", prop: "recycleDate" },
@@ -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