From 5afbc4e389c04363b2117d52d6dcc7503f7a7a5b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 23 Aug 2024 15:40:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BB=A3=E7=A0=81=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnJobMain/index.vue         | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 5e738580e..91a117d47 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -117,7 +117,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: 'ProductionreturnJobMain'==routeName.value?ProductionreturnJobDetailApi.getProductionreturnJobDetailPageStore:ProductionreturnJobDetailApi.getProductionreturnJobDetailPageHold // 分页接口
+  // getListApi: 'ProductionreturnJobMain'==routeName.value?ProductionreturnJobDetailApi.getProductionreturnJobDetailPageStore:ProductionreturnJobDetailApi.getProductionreturnJobDetailPageHold // 分页接口
+  getListApi: ProductionreturnJobDetailApi.getProductionreturnJobDetailPage // 分页接口
+
 
 })
 
@@ -275,16 +277,17 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    if('ProductionreturnJobMain'==routeName.value){
-      //生产退料任务导出
-      const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainStore(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }else{
-      // 隔离退料任务导出
-      const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainHold(tableObject.params)
-      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-    }
-
+    // if('ProductionreturnJobMain'==routeName.value){
+    //   //生产退料任务导出
+    //   const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainStore(tableObject.params)
+    //   download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    // }else{
+    //   // 隔离退料任务导出
+    //   const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainHold(tableObject.params)
+    //   download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    // }
+    const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     
   } catch {
   } finally {