From e9c7fa1915cd2afbadaef1884324fa7cd5aaaf25 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 29 七月 2025 10:12:06 +0800
Subject: [PATCH] Merge branch 'dev_y_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_y_ztns
---
src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue b/src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue
index 8fbb501..d316543 100644
--- a/src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue
+++ b/src/views/CNAS/resourceDemand/device/component/usageAuthorization.vue
@@ -3,7 +3,6 @@
<div class="search">
<el-button size="small" type="primary" @click="refreshTableList">鍒� 鏂�</el-button>
<el-button size="small" type="primary" @click="openDia('add')">鏂� 澧�</el-button>
- <el-button :loading="outLoading" size="small" type="primary" @click="openHandleOut">瀵� 鍑�</el-button>
</div>
<div>
<lims-table :tableData="tableData" :column="column"
@@ -119,9 +118,8 @@
import {
addImpower,
deleteImpower, deviceScopeSearch, getImpowerDetail, reviewImpowerStatus,
- selectDeviceImpowerByPage, submitReviewImpowerStatus, updateImpower
+ selectDeviceImpowerByPage, submitReviewImpowerStatus, updateImpower, exportDeviceImpower
} from "@/api/cnas/resourceDemand/device";
-import {exportQualityMonitorDetail} from "@/api/cnas/process/ensureResults/qualityMonitor";
import {selectUserCondition} from "@/api/system/user";
import {mapGetters} from "vuex";
@@ -209,6 +207,13 @@
disabled: (row) => {
return row.status === 1 || this.userId !== row.auditId;
},
+ },
+ {
+ name: '瀵煎嚭',
+ type: 'text',
+ clickFun: (row) => {
+ this.openHandleOut(row);
+ }
},
{
name: '鍒犻櫎',
@@ -415,10 +420,10 @@
})
},
openHandleOut (row) {
- exportQualityMonitorDetail({ impowerId: row.impowerId }).then(res => {
+ exportDeviceImpower({ impowerId: row.impowerId }).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/msword' });
- this.$download.saveAs(blob, row.monitorName + '.docx')
+ this.$download.saveAs(blob, '璁惧浣跨敤鎺堟潈琛�' + '.docx')
})
},
handleDeleteClick(row) {
--
Gitblit v1.9.3