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&¶ms.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&¶ms.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&¶ms.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&¶ms.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 = []