From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/reportPreparation/index.vue | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index db8311e..785e9f1 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -29,6 +29,7 @@
</div>
<div style="text-align: right;margin-bottom: 10px">
<el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
+ <el-button :loading="outExportLoading" size="mini" type="primary" @click="handleExport">鎶ヨ〃瀵煎嚭</el-button>
</div>
<div>
<lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
@@ -186,7 +187,7 @@
<el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
</el-upload>
</div>
- <lims-table :tableData="tableDataFile" :column="columnFile" height="500px"
+ <lims-table :tableData="tableDataFile" :column="columnFile" height="600px"
key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
</el-dialog>
</div>
@@ -202,7 +203,8 @@
ratifyReport,
sendBackTask,
upReportUrl,
- writeReport
+ writeReport,
+ reportAllExport
} from "@/api/business/insReport";
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
@@ -217,6 +219,7 @@
queryStatus: null,
code: null,
typeSource: null,
+ orderType: null,
},
page: {
current: 1,
@@ -241,6 +244,7 @@
option: null,
mutiList: [],
outLoading: false,
+ outExportLoading: false,
inLoading: false,
addApproverDia: false, // 鎸囧畾瀹℃壒浜哄憳寮规
approver: '', // 瀹℃壒浜哄憳
@@ -521,7 +525,7 @@
// 鏌ヨ闄勪欢鏌ョ湅鍒楄〃鍥炶皟
getFileList() {
this.tableLoadingFile = true
- getFileList({ insOrderId: this.filesLookInfo.insOrderId }).then(res => {
+ getFileList({ insOrderId: this.filesLookInfo.insOrderId,current: -1, size: -1 }).then(res => {
this.tableLoadingFile = false
if (res.code === 200) {
this.tableDataFile = res.data.records
@@ -600,6 +604,17 @@
})
},
+ // 鎶ヨ〃瀵煎嚭
+ handleExport() {
+ this.outExportLoading = true
+ reportAllExport({
+ ...this.entity
+ }).then(res => {
+ this.outExportLoading = false
+ const blob = new Blob([res], { type: 'application/octet-stream' });
+ this.$download.saveAs(blob, "鎶ュ憡鎶ヨ〃瀵煎嚭.xlsx");
+ })
+ },
beforeUpload(file) {
const isZip = file.type === 'application/zip' || file.name.endsWith('.zip');
if (!isZip) {
--
Gitblit v1.9.3