From 7ff07df398d5dd8c424c38f0eb40eb5aee32a0ff Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Tue, 24 Jun 2025 13:55:21 +0800
Subject: [PATCH] =?UTF-8?q?YT-2815=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts  | 40 +++++++++----------
 src/api/wms/demandforecastingMain/index.ts    |  4 +-
 .../demandforecastingMain/index.vue           | 37 ++++++++---------
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index 62f23c7e8..e90b4e155 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -21,26 +21,26 @@ export interface DemandforecastingDetailVO {
 const getPageParams = (par) => {
   const params = { ...par }
   // 到货日期
-  if(params.dueDate&&params.dueDate.length>0){
-    if(isString(params.dueDate[0])){
-      params.startDate = params.dueDate[0]
-    }else{
-      params.startDate = params.dueDate[0].format('YYYY-MM-DD')
-    }
-
-  }
-  if(params.dueDate&&params.dueDate.length>1){
-    if(isString(params.dueDate[1])){
-      params.endDate = params.dueDate[1]
-    }else{
-      params.endDate = params.dueDate[1].format('YYYY-MM-DD')
-    }
-  }
-  console.log(params.dueDate)
-  if (!params.dueDate || params.dueDate.length == 0) {
-    params.startDate = ''
-    params.endDate = ''
-  }
+  // if(params.dueDate&&params.dueDate.length>0){
+  //   if(isString(params.dueDate[0])){
+  //     params.startDate = params.dueDate[0]
+  //   }else{
+  //     params.startDate = params.dueDate[0].format('YYYY-MM-DD')
+  //   }
+
+  // }
+  // if(params.dueDate&&params.dueDate.length>1){
+  //   if(isString(params.dueDate[1])){
+  //     params.endDate = params.dueDate[1]
+  //   }else{
+  //     params.endDate = params.dueDate[1].format('YYYY-MM-DD')
+  //   }
+  // }
+  // console.log(params.dueDate)
+  // if (!params.dueDate || params.dueDate.length == 0) {
+  //   params.startDate = ''
+  //   params.endDate = ''
+  // }
   // params.dueDate = ''
 
   //计划员
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index c9d231426..c89686d29 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -128,7 +128,7 @@ export const exportDemandforecastingMain = async (params) => {
     const data = {...params}
     return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
   } else {
-    params = getPageParams(params)
+    // params = getPageParams(params)
     return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
   }
 }
@@ -140,7 +140,7 @@ export const exportDemandforecastingPlannnerMain = async (params) => {
     const data = {...params}
     return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
   } else {
-    params = getPageParams(params)
+    // params = getPageParams(params)
     return await request.download({ url: `/wms/demandforecasting-main/export-excel-planner`, params })
   }
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 093388435..b442a7bce 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -293,28 +293,29 @@ const selectionPlan = async ()=>{
   })
   console.log('批量生成要货计划', rows.join(','))
   tableObjectPlan.params.masterIds = rows.join(',')
+  tableObjectPlan.params.dueDate = tableObject.params.dueDate
   handlePreviewPlan()
 }
 const handlePreviewPlan = async ()=>{
 
-  if(tableObject.params.dueDate&&tableObject.params.dueDate.length>0){
-    if(isString(tableObject.params.dueDate[0])){
-      tableObjectPlan.params.startDate = tableObject.params.dueDate[0]
-    }else{
-      tableObjectPlan.params.startDate = tableObject.params.dueDate[0].format('YYYY-MM-DD')
-    }
-  }
-  if(tableObject.params.dueDate&&tableObject.params.dueDate.length>1){
-    if(isString(tableObject.params.dueDate[1])){
-      tableObjectPlan.params.endDate = tableObject.params.dueDate[1]
-    }else{
-      tableObjectPlan.params.endDate = tableObject.params.dueDate[1].format('YYYY-MM-DD')
-    }
-  }
-  if (!tableObject.params.dueDate || tableObject.params.dueDate.length == 0) {
-    tableObjectPlan.params.startDate = ''
-    tableObjectPlan.params.endDate = ''
-  }
+  // if(tableObject.params.dueDate&&tableObject.params.dueDate.length>0){
+  //   if(isString(tableObject.params.dueDate[0])){
+  //     tableObjectPlan.params.startDate = tableObject.params.dueDate[0]
+  //   }else{
+  //     tableObjectPlan.params.startDate = tableObject.params.dueDate[0].format('YYYY-MM-DD')
+  //   }
+  // }
+  // if(tableObject.params.dueDate&&tableObject.params.dueDate.length>1){
+  //   if(isString(tableObject.params.dueDate[1])){
+  //     tableObjectPlan.params.endDate = tableObject.params.dueDate[1]
+  //   }else{
+  //     tableObjectPlan.params.endDate = tableObject.params.dueDate[1].format('YYYY-MM-DD')
+  //   }
+  // }
+  // if (!tableObject.params.dueDate || tableObject.params.dueDate.length == 0) {
+  //   tableObjectPlan.params.startDate = ''
+  //   tableObjectPlan.params.endDate = ''
+  // }
 
   await getListPlan()
   selectionPlanRows.value = []