From 8314c2943734770c6a38e67147e6367f683df8d1 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 11:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
index 6985056..7a61745 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
@@ -13,7 +13,7 @@
       </div>
       <div class="btns">
         <el-button size="small" type="primary"
-          @click="addDialogVisible = true, addInfo = {}, currentFile = {}, title = '鏂囦欢鍙樻洿鐢宠'">鏂囦欢鍙樻洿鐢宠</el-button>
+          @click="addDialogVisible = true, addInfo = {}, currentFile = {}, title = '鏂囦欢鍙樻洿鐢宠', file = null">鏂囦欢鍙樻洿鐢宠</el-button>
         <el-button :loading="outLoading" size="small" type="primary" @click="handleOut">瀵煎嚭</el-button>
       </div>
     </div>
@@ -557,6 +557,7 @@
       this.addInfo = this.HaveJson(row)
       let alterBeforeCode = this.addInfo.alterBeforeCode
       this.getCurrentFile(alterBeforeCode)
+      this.file = null
       this.addDialogVisible = true
     },
     // 棰勮
@@ -567,8 +568,7 @@
     // 涓嬭浇闄勪欢
     handleDown(row) {
       if (!row.alterAfterUrl) return this.$message.warning('鏂囦欢鏈笂浼�')
-      let url = this.javaApi + '/word/' + row.alterAfterUrl
-      this.$download.saveAs(url, row.alterAfterUrl)
+      this.$download.downloadFileFromUrl(row.alterAfterUrl, row.alterAfterUrl)
     },
     // 鎵撳紑瀹℃牳寮规
     handleCheck(row) {

--
Gitblit v1.9.3