From 31e47cebb043a65c838a23c517848f1afdab778c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 09:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
index 8d4097a..1bea84b 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
@@ -177,7 +177,6 @@
       this.tableLoading = true
       getDeviceAcceptanceFileList({ acceptanceId: this.acceptanceId }).then(res => {
         this.tableLoading = false
-        if (res.code === 201) return
         this.tableData = res.data
       }).catch(err => {
         this.tableLoading = false
@@ -197,14 +196,7 @@
     },
     // 涓嬭浇
     upload(row) {
-      let url = '';
-      if (row.type == 1) {
-        url = this.javaApi + '/img/' + row.fileUrl
-        this.$download.saveAs(url, row.fileName)
-      } else {
-        url = this.javaApi + '/word/' + row.fileUrl
-        this.$download.saveAs(url, row.fileName)
-      }
+      this.$download.saveAs(row.fileUrl, row.fileName)
     },
     // 鍒犻櫎
     delete(row) {
@@ -216,7 +208,6 @@
         this.tableLoading = true
         delDeviceAcceptanceFileList({ acceptanceFileId: row.acceptanceFileId }).then(res => {
           this.tableLoading = false
-          if (res.code === 201) return
           this.$message.success('鍒犻櫎鎴愬姛')
           this.searchTableList()
         }).catch(err => {
@@ -273,7 +264,6 @@
         this.outLoading = false
         const blob = new Blob([res], { type: 'application/octet-stream' });
         this.$download.saveAs(blob, '璁惧楠屾敹.doc')
-        this.$message.success('瀵煎嚭鎴愬姛')
       })
     },
     // 鍒犻櫎

--
Gitblit v1.9.3