From 4c1dd77390f2e742d91b43e5c0bc8252fcc0bb29 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 18 四月 2025 08:55:41 +0800
Subject: [PATCH] 1.部分导出请求参数修改成param 2.报告编制添加导出
---
src/api/cnas/personal/personalList.js | 2 +-
src/api/business/materialInspection.js | 2 +-
src/views/business/rawMaterialInspection/index.vue | 4 +---
src/views/business/reportPreparation/index.vue | 17 ++++++++++++++++-
src/api/business/rawMaterialOrder.js | 2 +-
src/api/business/insReport.js | 11 +++++++++++
src/views/business/materialOrder/index.vue | 6 ++----
7 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/src/api/business/insReport.js b/src/api/business/insReport.js
index 896d9b2..50e5a93 100644
--- a/src/api/business/insReport.js
+++ b/src/api/business/insReport.js
@@ -57,3 +57,14 @@
data: query
})
}
+
+// 鎶ュ憡瀵煎嚭
+export function reportAllExport(query) {
+ return request({
+ url: '/insReport/reportAllExport',
+ method: 'get',
+ params: query,
+ responseType: "blob"
+ })
+}
+
diff --git a/src/api/business/materialInspection.js b/src/api/business/materialInspection.js
index 67401a5..2baa72d 100644
--- a/src/api/business/materialInspection.js
+++ b/src/api/business/materialInspection.js
@@ -93,7 +93,7 @@
return request({
url: '/rawMaterialOrder/rawAllExport',
method: 'get',
- data: query,
+ params: query,
responseType: "blob"
})
}
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index a5e5d85..a37df10 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -219,7 +219,7 @@
return request({
url: '/rawMaterialOrder/rawAllExport',
method: 'get',
- data: query,
+ params: query,
responseType: "blob"
})
}
diff --git a/src/api/cnas/personal/personalList.js b/src/api/cnas/personal/personalList.js
index d6ce381..16bdee1 100644
--- a/src/api/cnas/personal/personalList.js
+++ b/src/api/cnas/personal/personalList.js
@@ -21,7 +21,7 @@
return request({
url: "/personBasicInfo/exportPersonBasicInfo",
method: "get",
- data: query,
+ params: query,
responseType: "blob"
});
}
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 9e8df0c..9c2ac08 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -67,7 +67,7 @@
</ul>
</div>
<div>
- <el-button v-show="tabIndex === 3 || tabIndex === 2" :loading="outLoading" size="small" type="primary"
+ <el-button v-show="tabIndex === 3" :loading="outLoading" size="small" type="primary"
@click="handleOut">瀵煎嚭</el-button>
<el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">閾滄潗鏂欎笅鍗�</el-button>
<el-button v-if="tabIndex !== 0" size="small" type="primary" @click="openPrint">鏍囩鎵撳嵃</el-button>
@@ -1350,10 +1350,8 @@
},
// 瀵煎嚭
handleOut() {
- let entity = this.tabIndex === 3 ? { ...this.entity, isInspect: 2 } : { ...this.entity, state: 2, orderState: 4, }
- delete entity.orderBy
this.outLoading = true
- rawAllExport({ entity: entity }).then(res => {
+ rawAllExport({ ...this.entity }).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx');
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index bfb28d7..3bb5510 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -822,11 +822,9 @@
},
// 鍏ㄩ儴瀵煎嚭
handleDown() {
- let entity = { ...this.componentData }
- delete entity.orderBy
this.outLoading = true
rawAllExport({
- entity: entity
+ ...this.componentData
}).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index db8311e..0b6d7f7 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"
@@ -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: '', // 瀹℃壒浜哄憳
@@ -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