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<List<TaskDispatchDetailDO>> getTaskDispatchDetailListByDispatchId(@RequestParam("dispatchId") Long dispatchId,@RequestParam("dispatchType") String dispatchType) {
+    public CommonResult<List<TaskDispatchDetailDO>> 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'){