From 42253e05dfcfe56acf5f9708b79d7250685e111a Mon Sep 17 00:00:00 2001 From: waruneeta Date: Mon, 22 Jan 2024 09:58:14 +0700 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20=E0=B9=81=E0=B8=88=E0=B9=89?= =?UTF-8?q?=E0=B8=87=E0=B9=80=E0=B8=95=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=82?= =?UTF-8?q?=E0=B8=A2=E0=B8=B2=E0=B8=A2=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2?= =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2=20=E0=B8=AA?= =?UTF-8?q?=E0=B8=B7=E0=B8=AA=E0=B8=A7=E0=B8=99=20=E0=B8=AA=E0=B8=AD?= =?UTF-8?q?=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../11_discipline/components/2_InvestigateFacts/Form.vue | 2 +- .../components/3_InvestigateDisciplinary/Form.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index f043c8643..e920ac519 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -139,7 +139,7 @@ const formData = reactive({ const rows = ref([]); const dateEndInputStyle = computed(() => { if(formData.investigationDateStart){ - const currentDate = new Date(formData.investigationDateStart as Date); + const currentDate = new Date(); const investigationDateEnd = new Date(formData.investigationDateEnd as Date); const isInNext7Days = diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 916e48468..2841a3cfe 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -180,9 +180,9 @@ const emit = defineEmits(["submit:disciplinary"]); const dateEndInputStyle = computed(() => { if (formData.disciplinaryDateStart) { - const currentDate = new Date(formData.disciplinaryDateStart as Date); + const currentDate = new Date(); const investigationDateEnd = new Date(formData.disciplinaryDateEnd as Date); - + const isInNext7Days = investigationDateEnd >= currentDate && investigationDateEnd <=