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/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
index b66b5c7..8f9d12a 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
@@ -13,14 +13,11 @@
</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>
<div class="table">
- <!-- <ValueTable :key="upIndex" ref="ValueTable" :componentData="componentData"
- :delUrl="$api.manageDocumentList.delManageDocumentAlter"
- :url="$api.manageDocumentList.pageManageDocumentAlter" /> -->
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
:height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
</div>
@@ -560,6 +557,7 @@
this.addInfo = this.HaveJson(row)
let alterBeforeCode = this.addInfo.alterBeforeCode
this.getCurrentFile(alterBeforeCode)
+ this.file = null
this.addDialogVisible = true
},
// 棰勮
@@ -570,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) {
@@ -631,7 +628,6 @@
})
.then(() => {
delManageDocumentAlter({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
--
Gitblit v1.9.3