From 9944250470047acb0f068b060b9ae14c5a933a24 Mon Sep 17 00:00:00 2001
From: tengxiaofei <302828528@qq.com>
Date: Fri, 23 Aug 2024 18:57:32 +0800
Subject: [PATCH] =?UTF-8?q?HL-5354=EF=BC=9A=E8=A3=85=E9=85=8D=E5=88=B6?=
 =?UTF-8?q?=E5=93=81=E4=B8=8A=E6=9E=B6type=E7=B1=BB=E5=9E=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productputawayRecordMain/index.ts                 | 4 ++--
 .../productputaway/productputawayRecordMain/index.vue         | 1 +
 .../productputawayAssembleRecordMain/index.vue                | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts
index f411cfb30..f9a39d09e 100644
--- a/src/api/wms/productputawayRecordMain/index.ts
+++ b/src/api/wms/productputawayRecordMain/index.ts
@@ -74,12 +74,12 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
-  params.type = 'assemble'
+
   if (params.isSearch) {
     const cmd = {
       'column':'type',
       'action':'==',
-      'value':'assemble'
+      'value':params.type
     }
     params.filters.push(cmd)
     delete params.isSearch
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
index 7065658c1..996cdbcc8 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
@@ -158,6 +158,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
+    tableObject.params.type = 'predict'
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
index 65067e86d..dd499227d 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
@@ -158,6 +158,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
+    tableObject.params.type = 'assemble'
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {