From 0a40c5890d13d9f2de5c3ab663876afecbfbefbe Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 28 十月 2026 17:57:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/method/methodVerification/component/viewWorkPermitDia.vue | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/views/CNAS/process/method/methodVerification/component/viewWorkPermitDia.vue b/src/views/CNAS/process/method/methodVerification/component/viewWorkPermitDia.vue
index 9134791..ce2f5dd 100644
--- a/src/views/CNAS/process/method/methodVerification/component/viewWorkPermitDia.vue
+++ b/src/views/CNAS/process/method/methodVerification/component/viewWorkPermitDia.vue
@@ -26,7 +26,7 @@
</template>
<script>
-import file from '@/utils/file';
+
import filePreview from '@/components/Preview/filePreview.vue';
import limsTable from '@/components/Table/lims-table.vue'
import {getCurrentWorkFiles} from '@/api/cnas/process/method/methodVerification'
@@ -90,9 +90,23 @@
const image = /\.(png|jpe?g|gif|bmp|webp)$/i.test(row.fileUrl || '')
return this.javaApi + (image ? '/img/' : '/word/') + row.fileUrl
},
- openDia(userIds) {
+ // 涓ょ鐢ㄦ硶锛氭暟缁�=妫�娴嬩汉鍛榠d锛堝疄鏃舵煡璇級锛涜瀵硅薄=浼樺厛灞曠ず宸蹭繚瀛樼殑涓婂矖璇侊紝鍏舵鎸夊凡閫夋娴嬩汉鍛樺疄鏃舵煡璇�
+ openDia(payload = {}) {
this.filesDialogVisible = true
this.tableData = []
+ if (Array.isArray(payload)) {
+ this.loadCurrentFiles(payload)
+ return
+ }
+ this.info = payload || {}
+ if (Array.isArray(payload.workFileList) && payload.workFileList.length) {
+ this.tableData = payload.workFileList
+ return
+ }
+ this.loadCurrentFiles(Array.isArray(payload.confirmUser) ? payload.confirmUser : [])
+ },
+ loadCurrentFiles(userIds) {
+ if (!userIds.length) return
this.tableLoading = true
getCurrentWorkFiles({userIds: userIds.join(',')}).then(res => {
if (res.code === 200) this.tableData = res.data || []
@@ -120,17 +134,7 @@
this.$message.warning('璇ヤ汉鍛樺凡鏈変换鑱屾巿鏉冭褰曪紝浣嗗皻鏈笂浼犱笂宀楄瘉涔︽枃浠�')
return
}
- let url = '';
- if (/\.(png|jpe?g|gif|bmp|webp)$/i.test(row.fileUrl || '')) {
- url = this.javaApi + '/img/' + row.fileUrl
- file.downloadIamge(url, row.fileName)
- } else {
- url = this.javaApi + '/word/' + row.fileUrl
- const link = document.createElement('a');
- link.href = url;
- link.download = row.fileName;
- link.click();
- }
+ return this.$download.attachment({ fileUrl: row.fileUrl }, row.fileName)
},
},
};
--
Gitblit v1.9.3