From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/views/CNAS/process/disposal/sampleDisposal/index.vue |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/CNAS/process/disposal/sampleDisposal/index.vue b/src/views/CNAS/process/disposal/sampleDisposal/index.vue
index f966024..1cbcb06 100644
--- a/src/views/CNAS/process/disposal/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/disposal/sampleDisposal/index.vue
@@ -115,11 +115,11 @@
   doProcessDeal,
   addProcessDeal,
   submitProcessTotaldeal,
-  pageProcessDeal,
   checkProcessTotaldeal,
   ratifyProcessTotaldeal,
   delProcessDeal,
   pageProcessTotaldeal, getProcessDeal, addProcessTotaldeal,
+  exportProcessTotaldeal
 } from "@/api/cnas/process/sampleDisposal";
 export default {
   name: 'SampleDisposal',
@@ -273,9 +273,6 @@
               type: "text",
               clickFun: (row) => {
                 this.handleDown0(row);
-              },
-              disabled: (row) => {
-                return !row.url
               }
             },
             {
@@ -538,12 +535,11 @@
     },
     // 瀵煎嚭璇︽儏
     handleDown0(row) {
-      if (!row.url) {
-        this.$message.warning('鏆傛棤鏂囦欢')
-        return
-      }
-      // 鍚庣涓嬭浇
-      this.$download.saveAs(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
+      exportProcessTotaldeal({ id: row.id }).then(res => {
+        this.outLoading = false
+        const blob = new Blob([res], { type: 'application/msword' });
+        this.$download.saveAs(blob, '鏍峰搧澶勭悊' + '.docx');
+      })
     },
     handleDelete(row) {
       this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {

--
Gitblit v1.9.3