From a1faa94fbf85553f22da934a1abc745d89dd8667 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 17:23:49 +0800
Subject: [PATCH] fix: 取消设备核查/比对的身份限制与三张设备计划的审批功能
---
src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
index 0cb0635..f104008 100644
--- a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
+++ b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
@@ -36,15 +36,15 @@
<!-- 鎿嶄綔鎸夐挳 -->
<el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="150">
<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.externalApplyId)">鎿嶄綔</el-button>
<el-button size="small" link type="primary" @click="handleDownOne(scope.row.externalApplyId)">瀵煎嚭</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.externalApplyId)">鍒犻櫎</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" background
@size-change="handleSizeChange1" @current-change="handleCurrentChange1">
</el-pagination>
@@ -61,6 +61,7 @@
exportDeviceExternalApply,
delDeviceExternalApply,
} from '@/api/cnas/resourceDemand/device.js'
+import { saveBlobOrShowError } from '@/utils/saveBlob'
export default {
name: "using-external-instruments",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -135,8 +136,9 @@
this.outLoading = true
exportDeviceExternalApply({ externalApplyId: 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