From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
index 49004f4..64e4de1 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
@@ -6,6 +6,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
@@ -26,7 +27,7 @@
</el-table-column>
</el-table>
<el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
- :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
+ :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper" background
@size-change="handleSizeChange1" @current-change="handleCurrentChange1">
</el-pagination>
</div>
@@ -177,7 +178,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,7 +197,7 @@
},
// 涓嬭浇
upload(row) {
- this.$download.downloadFileFromUrl(row.fileUrl, row.fileName)
+ this.$download.saveAs(row.fileUrl, row.fileName)
},
// 鍒犻櫎
delete(row) {
@@ -209,7 +209,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 => {
--
Gitblit v1.9.3