diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue index 3a4864e6..64740eff 100644 --- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue +++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue @@ -15,6 +15,24 @@ +
+ * + 生产时间安排 + +
+
+ 是否跳过节假日 + +
@@ -47,8 +65,10 @@ - - 库存任务 + +
+ +
@@ -261,8 +281,10 @@ const capacityTypeOptions = [ const searchForm = reactive({ inventoryTaskSchedule: false, + skipHoliday: false, sortRule: 2 as number | undefined, capacityType: 1 as number | undefined, + workTimeRange: ['08:00', '18:00'] as string[], code: '', orderDate: [] as string[], deliveryDate: [] as string[], @@ -553,8 +575,10 @@ const handleSearch = async () => { const handleReset = async () => { searchForm.inventoryTaskSchedule = false + searchForm.skipHoliday = false searchForm.sortRule = undefined searchForm.capacityType = 1 + searchForm.workTimeRange = ['08:00', '18:00'] searchForm.code = '' searchForm.orderDate = [] searchForm.deliveryDate = [] @@ -669,6 +693,11 @@ const handleSubmit = async () => { message.warning('请选择产能来源') return } + const [workStartTime, workEndTime] = Array.isArray(searchForm.workTimeRange) ? searchForm.workTimeRange : [] + if (!workStartTime || !workEndTime) { + message.warning('请选择生产时间安排') + return + } const selectedRows = detailTableRef.value?.getSelectionRows() || [] if (selectedRows.length === 0) { @@ -705,7 +734,10 @@ const handleSubmit = async () => { const scheduleResult = await TaskApi.oneClickSchedule({ createReqVO, sortRule: searchForm.sortRule, - capacityType: searchForm.capacityType + capacityType: searchForm.capacityType, + workStartTime, + workEndTime, + skipHoliday: searchForm.skipHoliday }) const scheduleData = Array.isArray(scheduleResult) ? scheduleResult