From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

---
 src/views/business/productOrder/index.vue |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index a7a22f7..0d97704 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -986,25 +986,16 @@
       downFile({
         id: row.id,
       }).then(res => {
-        if (res.code === 200) {
-          let url = '';
-          if (res.data.type == 1) {
-            url = this.javaApi + '/img/' + res.data.fileUrl
-            this.$download.saveAs(url, row.fileName);
-          } else {
-            url = this.javaApi + '/word/' + res.data.fileUrl
-            this.$download.saveAs(url, row.fileName);
-          }
-        }
+        this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
       }).catch(error => {
 
       })
     },
     // 涓嬭浇鎶ュ憡
     download(row) {
-      let url = this.javaApi + '/word/' + row.urlS ? row.urlS : row.url;
+      let url = row.urlS ? row.urlS : row.url;
       if (url) {
-        this.$download.saveAs(url, this.downLoadInfo.fileName);
+        this.$download.downloadFileFromUrl(url, this.downLoadInfo.fileName);
       }
     },
     // 鎾ら攢
@@ -1131,10 +1122,6 @@
         userId: this.distributeData.userId,
         sonLaboratory: this.distributeData.sonLaboratory,
       }).then(res => {
-        if (res.code === 201) {
-          this.upLoad = false
-          return
-        }
         this.$message.success('淇敼鎴愬姛')
         this.upLoad = false
         this.issuedDialogVisible = false

--
Gitblit v1.9.3