From fdcbed23b41ee5b64ebdd68efcb084c7ea6aacaf Mon Sep 17 00:00:00 2001 From: z Date: Fri, 16 May 2025 08:25:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=BE=97=E6=B4=BE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B4=BE=E5=B7=A5=E5=8D=95=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/taskdispatch/TaskDispatchController.java | 2 +- .../src/views/heli/taskdispatch/detailDialog.vue | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java index 611d7cf..5fc8638 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java @@ -141,7 +141,7 @@ public class TaskDispatchController { @Parameter(name = "dispatchId", description = "派工单id",required = true) @Parameter(name = "dispatchType", description = "派工单类型",required = false) @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") - public CommonResult> getTaskDispatchDetailListByDispatchId(@RequestParam("dispatchId") Long dispatchId,@RequestParam("dispatchType") String dispatchType) { + public CommonResult> getTaskDispatchDetailListByDispatchId(@RequestParam("dispatchId") Long dispatchId,@RequestParam(value ="dispatchType", required = false) String dispatchType) { if (dispatchType != null){ return success(taskDispatchService.getTaskDispatchDetailListByDispatchNew(dispatchId)); }else { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue index e2a094c..03fd632 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue @@ -1279,6 +1279,9 @@ const submitForm = async (operate) => { return } for(var i = 0 ; i < formData.value.taskDispatchDetails.length ; i++){ + if( formData.value.taskDispatchDetails[i].endTime != undefined &&formData.value.taskDispatchDetails[i].endTime != null &&formData.value.taskDispatchDetails[i].endTime != ''){ + + const d1 = new Date(formData.value.taskDispatchDetails[i].endTime); const d2 = new Date(formData.value.requiredCompletedDate); @@ -1296,6 +1299,7 @@ const submitForm = async (operate) => { await message.confirm('工序('+name+")预计结束日期超过生产计划日期"+formatDate1(d2)+"是否继续 '") } + } } var ownerIsNull = false; if(operate == 'SUBMIT'){