From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突

---
 src/views/CNAS/process/sampleDisposal/sampleDisposal.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/views/CNAS/process/sampleDisposal/sampleDisposal.vue b/src/views/CNAS/process/sampleDisposal/sampleDisposal.vue
index 8759567..4e8e62e 100644
--- a/src/views/CNAS/process/sampleDisposal/sampleDisposal.vue
+++ b/src/views/CNAS/process/sampleDisposal/sampleDisposal.vue
@@ -506,8 +506,7 @@
     // 瀵煎嚭璇︽儏
     handleDown0(row) {
       // 鍚庣涓嬭浇
-      let url = this.javaApi + '/word/' + row.url
-      this.$download.saveAs(url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
+      this.$download.saveAs(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�')
     },
     handleDelete(row) {
       this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {

--
Gitblit v1.9.3