From 411e913d8e78233e79eb609d62ce4148bbc632fe Mon Sep 17 00:00:00 2001 From: hwj Date: Fri, 10 Apr 2026 15:28:41 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E6=8E=92=E4=BA=A7-=E4=B8=80=E9=94=AE=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskScheduleDialog.vue | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) 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 } })