From 78a3c898908bbb8827d1c2aa6299f92ff03f5847 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 21 十月 2026 15:06:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/systemManagement/documentControl/components/FileList.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
index d0f56e9..96cea97 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
@@ -21,10 +21,7 @@
</el-form>
</div>
<div>
- <el-upload :action="action" :multiple="false" accept='.xls,.xlsx' :headers="uploadHeader"
- :on-change="beforeUpload" :on-error="onError" ref='upload' :on-success="handleSuccessUp"
- :show-file-list="false">
- <el-button size="small" type="primary" :loading="upLoading">瀵煎叆</el-button></el-upload>
+ <el-button size="small" type="primary" @click="$refs.importDialog.open()">瀵煎叆</el-button>
</div>
</div>
<div class="table">
@@ -32,6 +29,9 @@
:height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
</div>
<el-dialog title="涓婁紶" v-model="addDialogVisible" width="1000px" top="3vh">
+ <div style="margin-bottom: 10px; padding: 8px 12px; border-radius: 4px; background: var(--el-color-primary-light-9); font-size: 13px; color: var(--el-text-color-regular);">
+ 鏀寔 PDF銆乄ord锛�.doc/.docx锛夈�丒xcel锛�.xls/.xlsx锛夈�丳PT銆佸浘鐗囩瓑甯歌鏍煎紡锛屽崟涓枃浠朵笉瓒呰繃 20MB銆侾DF 鍙瑙堝苟鐩栫珷锛涘叾浠栨牸寮忔寜鍘熸枃浠朵笂浼狅紝涓嶇洊绔犮��
+ </div>
<UpPdfStamp ref="UpPdfStamp" v-if="addDialogVisible" @uploadPDF="uploadPDF" :isUpFile="true"
@uploadPDFErr="uploadPDFErr"></UpPdfStamp>
<template #footer><span class="dialog-footer">
@@ -84,6 +84,16 @@
<el-button :loading="uploading" type="primary" @click="submitProduct('currentInfoForm')">纭� 璁�</el-button>
</span></template>
</el-dialog>
+ <import-dialog
+ ref="importDialog"
+ title="瀵煎叆鏂囦欢娓呭崟"
+ :action="action"
+ accept=".xls,.xlsx"
+ template-url="/import-templates/鏂囦欢娓呭崟瀵煎叆妯℃澘.xlsx?v=2"
+ template-name="鏂囦欢娓呭崟瀵煎叆妯℃澘.xlsx"
+ :tips="['琛ㄥご蹇呴』涓庢ā鏉垮畬鍏ㄤ竴鑷达紝涓嶈兘澧炲垹鍒楁垨淇敼鍒楀悕', '鐢熸晥鏃ユ湡鏍煎紡锛歒YYY-MM-DD']"
+ @success="refreshTable"
+ />
</div>
</template>
@@ -91,6 +101,7 @@
import UpPdfStamp from '@/components/UpPdfStamp/index.vue'
import filePreview from '@/components/Preview/filePreview.vue'
import limsTable from "@/components/Table/lims-table.vue";
+import ImportDialog from '@/components/ImportDialog/index.vue'
import {
uploadFileManageDocumentList,
pageManageDocumentList,
@@ -102,6 +113,7 @@
UpPdfStamp,
filePreview,
limsTable,
+ ImportDialog,
},
data() {
return {
@@ -205,7 +217,7 @@
page: {
total: 0,
size: 10,
- current: 0,
+ current: 1,
},
tableLoading: false,
addDia: false,
@@ -268,7 +280,9 @@
// 涓嬭浇鏂囦欢
handleDown(row) {
if (!row.url) return this.$message.warning('鏂囦欢鏈笂浼�')
- this.$download.saveAs(row.url, row.url);
+ // 鍚庣淇濆瓨鐨勬槸 word 鐩綍涓嬬殑 uuid_鍘熸枃浠跺悕锛屼笅杞芥椂璧伴潤鎬佽祫婧愬湴鍧�骞跺幓鎺� uuid 鍓嶇紑
+ const fileName = row.url.replace(/^[0-9a-fA-F-]{36}_/, '')
+ this.$download.saveAs(this.javaApi + '/word/' + row.url, fileName);
},
// 鏌ョ湅鏂囦欢
handleLook(row) {
--
Gitblit v1.9.3