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/equipmentScrap.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue b/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
index 799517f..6c7f04f 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
@@ -15,20 +15,22 @@
<!-- <el-table-column label="浠櫒鍚嶇О" min-width="150" prop="unitName"></el-table-column>-->
<!-- <el-table-column label="鍨嬪彿" min-width="100" prop="address"></el-table-column>-->
<el-table-column label="閰嶄欢" min-width="150" prop="parts"></el-table-column>
- <el-table-column label="缂栧彿" min-width="100" prop="number"></el-table-column>
+ <el-table-column label="缂栧彿" min-width="100">
+ <template v-slot="scope">{{ scope.row.number || clickNodeVal.managementNumber || '-' }}</template>
+ </el-table-column>
<el-table-column label="鎶ュ簾鐞嗙敱" min-width="150" prop="reasonsForScrap"></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.scrappedId)">鎿嶄綔</el-button>
<el-button size="small" link type="primary" @click="handleDownOne(scope.row.scrappedId)">瀵煎嚭</el-button>
- <el-button size="small" link type="danger"
+ <el-button :disabled="scope.row.isFinish === 1" size="small" link type="danger"
@click="deleteFun(scope.row.scrappedId)">鍒犻櫎</el-button>
</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"
@size-change="handleSizeChange1" @current-change="handleCurrentChange1" background>
</el-pagination>
@@ -46,6 +48,7 @@
exportDeviceScrapped,
delDeviceScrapped,
} from '@/api/cnas/resourceDemand/device.js'
+import { saveBlobOrShowError } from '@/utils/saveBlob'
export default {
name: "equipment-scrap",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -117,8 +120,9 @@
this.outLoading = true
exportDeviceScrapped({ scrappedId: 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