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/equipmentAccident.vue |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue
index 1c6d407..5ed5d1a 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue
@@ -15,13 +15,14 @@
           <!--          <el-table-column label="浠櫒鍚嶇О" min-width="150" prop="unitName"></el-table-column>-->
           <!--          <el-table-column label="鍨嬪彿" min-width="100" prop="model"></el-table-column>-->
           <el-table-column label="鍦扮偣" min-width="150" prop="address"></el-table-column>
-          <el-table-column label="鏃ユ湡" min-width="180" prop="accidentDate"></el-table-column>
+          <el-table-column label="鏃ユ湡" min-width="180" prop="accidentDate"
+            :formatter="formatDateCell"></el-table-column>
           <el-table-column label="浜嬫晠鎯呭喌" min-width="180" prop="descriptionOfAccident"
             show-overflow-tooltip></el-table-column>
           <!-- 鎿嶄綔鎸夐挳 -->
           <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="120">
             <template #default="scope">
-              <el-button :disabled="scope.row.ratifyStatus === 1" size="small" link type="primary"
+              <el-button :disabled="scope.row.isFinish === 1" size="small" link type="primary"
                 @click="handleForm(scope.row.accidentReportId)">鎿嶄綔</el-button>
               <el-button size="small" link type="primary" @click="handleDownOne(scope.row.accidentReportId)">瀵煎嚭</el-button>
               <el-button :disabled="scope.row.isFinish === 1" size="small" link type="danger"
@@ -29,7 +30,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>
@@ -46,6 +47,8 @@
   exportDeviceAccidentReport,
   delDeviceAccidentReport,
 } from '@/api/cnas/resourceDemand/device.js'
+import { formatListDate } from './dateFormat'
+import { saveBlobOrShowError } from '@/utils/saveBlob'
 export default {
   name: "equipment-accident",
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -75,6 +78,9 @@
   },
   // 鏂规硶闆嗗悎
   methods: {
+    formatDateCell(row, column, cellValue) {
+      return formatListDate(cellValue)
+    },
     // 鏌ヨ
     getYearTableDetailData(deviceId) {
       this.yearTableDetailDataLoading = true
@@ -117,8 +123,9 @@
       this.outLoading = true
       exportDeviceAccidentReport({ accidentReportId: 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