From a146908e41d62070123455dd76388870c5440da5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 20 十月 2026 11:26:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
index 06b77f2..f104008 100644
--- a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
+++ b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
@@ -4,7 +4,7 @@
<div style="display: flex;justify-content: space-between;margin-top: 10px;">
<div style="display: flex;">
<div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
- <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">鍗曚綅鍚嶇О</span>
+ <span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">鍗曚綅鍚嶇О</span>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="searchForm.unitName"
@keyup.enter="getYearTableDetailData"></el-input>
</div>
@@ -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