From 9a4e2db0860ef252a21b1fd043fcc679fc160e61 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 16 Jul 2024 13:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E5=89=8D=E7=AB=AF=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inventorymoveJobMain/index.ts            | 11 +++++++++++
 src/api/wms/inventorymoveRecordMain/index.ts         | 12 +++++++++++-
 .../inventorymove/inventorymoveJobMain/index.vue     |  3 +++
 .../inventorymove/inventorymoveRecordMain/index.vue  |  3 +++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/inventorymoveJobMain/index.ts b/src/api/wms/inventorymoveJobMain/index.ts
index 724b20757..177d2cf08 100644
--- a/src/api/wms/inventorymoveJobMain/index.ts
+++ b/src/api/wms/inventorymoveJobMain/index.ts
@@ -96,6 +96,17 @@ export const exportOkToHoldJobMain = async (params) => {
   }
 }
 
+// 导出不合格转隔离任务主 Excel
+export const exportNokToHoldJobMain = async (params) => {
+  params.businessType = 'NokToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params })
+  }
+}
 // 导出隔离转合格任务主 Excel
 export const exportHoldToOkJobMain = async (params) => {
   params.businessType = 'HoldToOk'
diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts
index 885baae74..9d9c4f083 100644
--- a/src/api/wms/inventorymoveRecordMain/index.ts
+++ b/src/api/wms/inventorymoveRecordMain/index.ts
@@ -81,7 +81,17 @@ export const exportOkToHoldRecordMain = async (params) => {
    return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
   }
 }
-
+// 导出合格转隔离记录主 Excel
+export const exportNokToHoldRecordMain = async (params) => {
+  params.businessType = 'NokToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
+  }
+}
 // 导出隔离转合格记录主 Excel
 export const exportHoldToOkRecordMain = async (params) => {
   params.businessType = 'HoldToOk'
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
index 1b6071b73..1c749d79f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
@@ -302,6 +302,9 @@ const handleExport = async () => {
     if(routeName.value == 'OktoholdJobMain'){
       const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params)
       download.excel(data, '合格转隔离任务主.xlsx')
+        }else if ( routeName.value == 'HoldtookJobMain') {
+          const data = await InventorymoveJobMainApi.exportNokToHoldJobMain(tableObject.params)
+          download.excel(data, '不合格转隔离任务主.xlsx')
         }else if ( routeName.value == 'HoldtookJobMain') {
           const data = await InventorymoveJobMainApi.exportHoldToOkJobMain(tableObject.params)
           download.excel(data, '隔离转合格任务主.xlsx')
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index 9f48e3048..b788e1f57 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -227,6 +227,9 @@ const handleExport = async () => {
     if(routeName.value == 'OktoholdRecordMain'){
       const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params)
       download.excel(data, '合格转隔离记录主.xlsx')
+        }else if ( routeName.value == 'HoldtookRecordMain') {
+          const data = await InventorymoveRecordMainApi.exportNokToHoldRecordMain(tableObject.params)
+          download.excel(data, '不合格转隔离记录主.xlsx')
         }else if ( routeName.value == 'HoldtookRecordMain') {
           const data = await InventorymoveRecordMainApi.exportHoldToOkRecordMain(tableObject.params)
           download.excel(data, '隔离转合格记录主.xlsx')