From c6e96cdb8b1cfb51e9a45bf86c38d1353e983127 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:19:48 +0800
Subject: [PATCH] 设备模块业务完善及前序页面优化
---
src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue b/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue
index 1862be0..584bd63 100644
--- a/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue
+++ b/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue
@@ -21,7 +21,8 @@
<el-table-column label="澶嶆牳鐘舵��" min-width="180" prop="status">
<template #default="scope">
<el-tag v-if="scope.row.status === 1" type="success">閫� 杩�</el-tag>
- <el-tag v-if="scope.row.status === 0" type="danger">涓嶉�氳繃</el-tag>
+ <el-tag v-else-if="scope.row.status === 0" type="danger">涓嶉�氳繃</el-tag>
+ <el-tag v-else type="info">寰呭鏍�</el-tag>
</template>
</el-table-column>
<!-- 鎿嶄綔鎸夐挳 -->
@@ -37,7 +38,7 @@
</template>
</el-table-column>
</el-table>
- <el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
+ <el-pagination :current-page="pagination1.current" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
:total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper" background
@size-change="handleSizeChange1" @current-change="handleCurrentChange1">
</el-pagination>
@@ -54,6 +55,7 @@
exportDeviceInspectionRecord,
deleteDeviceInspectionRecord,
} from '@/api/cnas/resourceDemand/device.js'
+import { saveBlobOrShowError } from '@/utils/saveBlob'
export default {
name: "inspection-of-equipment",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -127,8 +129,9 @@
inspectionRecordId: id
}).then(res => {
this.outLoading = false
- const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '璁惧鐐规璁板綍琛�.doc')
+ saveBlobOrShowError(res, '璁惧鐐规璁板綍琛�.doc', 'application/msword')
+ }).catch(() => {
+ this.outLoading = false
})
},
// 鍒犻櫎
--
Gitblit v1.9.3