From 6aed54f04efdc63e2a9291c6f725000784ef85c7 Mon Sep 17 00:00:00 2001 From: Ledo Date: Mon, 30 Jun 2025 11:16:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B6=85=E6=97=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/heli/processdesign/detail.vue | 19 +++++++++++++------ .../views/heli/taskdispatch/detailDialog.vue | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue index 248f2c9..1b8bcc0 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue @@ -807,9 +807,12 @@ const submitForm = async (operate) => { const onAddItem = async() => { //条件修改:没有时间就不填 var date = new Date(); + date.setHours(0,0,0,0) if(processDesignType.value == 'BLUEPRINT_WORKBLANK'){ if(formData.value.blankDate != null ){ - if(formData.value.blankDate < date.getTime()){ + var date1 = new Date(formData.value.blankDate); + date1.setHours(0,0,0,0) + if(date1.getTime()< date.getTime()){ if(formData.value.isDelay == null || formData.value.isDelay == 0){ message.error("当前任务已超期,请延期后重试!") return @@ -822,7 +825,9 @@ const onAddItem = async() => { } if(processDesignType.value == 'BLUEPRINT_2D'){ if(formData.value.twoDimDate != null ){ - if(formData.value.twoDimDate < date.getTime()){ + var date1 = new Date(formData.value.twoDimDate); + date1.setHours(0,0,0,0) + if(date1.getTime()< date.getTime()){ if(formData.value.isDelay == null || formData.value.isDelay == 0){ message.error("当前任务已超期,请延期后重试!") return @@ -836,7 +841,9 @@ const onAddItem = async() => { } if(processDesignType.value == 'BLUEPRINT_3D'){ if(formData.value.threeDimDate != null ){ - if(formData.value.threeDimDate < date.getTime()){ + var date1 = new Date(formData.value.threeDimDate); + date1.setHours(0,0,0,0) + if(date1.getTime()< date.getTime()){ if(formData.value.isDelay == null || formData.value.isDelay == 0){ message.error("当前任务已超期,请延期后重试!") return @@ -850,9 +857,9 @@ const onAddItem = async() => { if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){ console.log(formData.value.craftEndDate) if(formData.value.craftEndDate != null ){ - console.log(date.getTime()) - console.log(formData.value.craftEndDate) - if(formData.value.craftEndDate < date.getTime()){ + var date1 = new Date(formData.value.craftEndDate); + date1.setHours(0,0,0,0) + if(date1.getTime()< date.getTime()){ if(formData.value.isDelay == null || formData.value.isDelay == 0){ message.error("当前任务已超期,请延期后重试!") return 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 97e54f5..06923ed 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 @@ -1353,7 +1353,8 @@ const submitForm = async (operate) => { d1.setHours(0, 0, 0, 0); d2.setHours(0, 0, 0, 0); - + console.log(d1) + console.log(d2) if (d1 > d2) { let name; procedureList.value.forEach((items) => {