From d66ab921c996c38da3aa373ffdc7c974c157df33 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 09:37:53 +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/FileObsoletionRequest.vue | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
index 6744fa5..128cd8b 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
@@ -12,14 +12,12 @@
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
<div class="btns" style="padding-left: 30px;">
- <el-button size="small" type="primary" @click="addDialogVisible = true, addInfo = {}">鏂囦欢浣滃簾鐢宠</el-button>
+ <el-button size="small" type="primary"
+ @click="addDialogVisible = true, addInfo = {}, 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.delManageDocumentCancel"
- :url="$api.manageDocumentList.pageManageDocumentCancel" /> -->
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
:height="'calc(100vh - 290px)'" @pagination="pagination"></lims-table>
</div>
@@ -430,7 +428,6 @@
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '鏂囦欢浣滃簾琛�.xlsx')
- this.$message.success('瀵煎嚭鎴愬姛')
})
},
handleDelete(row) {
--
Gitblit v1.9.3