diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue index 2f69e8db..6b23967e 100644 --- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue +++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue @@ -269,6 +269,7 @@ const loadDetailList = async (taskId?: number) => { pageSize: 10, taskId }) + console.log('currentTask.value',currentTask.value) const list = (data?.list ?? []).map((item: any) => ({ ...item, _parentTaskOrderPriority: currentTask.value?.isUrgent, @@ -427,32 +428,20 @@ const openTaskItemNeed = (row: any) => { itemNeedRef.value.open('task', '任务单-' + (row?.code ?? ''), row.id) } -const openTaskPlan = (row: any) => { - if (!row?.id) return - window.open(`/mes/plan?taskId=${row.id}`, '_self') -} - const openProductItemNeed = (row: any) => { if (!row?.productId) return const number = row.number - row.planNumber > 0 ? row.number - row.planNumber : 0 itemNeedRef.value.open('product', row.productName, row.productId, number) } -const openDetailPlan = (row: any) => { - if (!row?.taskId || !row?.productId) return - window.open(`/mes/plan?taskId=${row.taskId}&productId=${row.productId}`, '_self') -} - -const openDetailCreatePlan = (_row: any) => { - message.info('请在任务单汇总明细列表中使用“新增计划”功能') -} - const handlePreviewSaved = async () => { dialogVisible.value = false await loadTaskList() emit('success') } +const hasValue = (value: unknown) => value !== null && value !== undefined && value !== '' + const handleSubmit = async () => { if (searchForm.sortRule === undefined) { message.warning('请选择排产规则') @@ -470,6 +459,7 @@ const handleSubmit = async () => { } submitLoading.value = true try { + console.log(selectedRows) const createReqVO = selectedRows.map((row: any) => { const planNumber = row.number - row.planNumber > 0 ? row.number - row.planNumber : 0 return { @@ -488,8 +478,8 @@ const handleSubmit = async () => { // Image fields orderPriority: row.isUrgent || row._parentTaskOrderPriority, workOrderCode: row.taskCode, - deliveryDate: row._parentTaskDeliveryDate || new Date().getTime(), // Fallback - orderDetailDeliveryDate: row.deliveryDate || row.finishDate || row._parentTaskDeliveryDate || new Date().getTime(), // Fallback + deliveryDate: row._parentTaskDeliveryDate, + orderDetailDeliveryDate: hasValue(row.finishDate) ? row.finishDate : row._parentTaskDeliveryDate, orderDetailId: row.id } })