From 7d4171354aaa80d57fc0e53bc1318219acab6d7c Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 26 Dec 2023 16:39:39 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=AA=E0=B8=B5=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=82=E0=B9=89=E0=B8=B2-=E0=B8=AD?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/09_leave/components/1_Work/DialogEdit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/09_leave/components/1_Work/DialogEdit.vue b/src/modules/09_leave/components/1_Work/DialogEdit.vue index 308fb3f45..86351b1cb 100644 --- a/src/modules/09_leave/components/1_Work/DialogEdit.vue +++ b/src/modules/09_leave/components/1_Work/DialogEdit.vue @@ -87,7 +87,7 @@ watch( -
+
สถานะช่วงเช้า -
+
สถานะช่วงบ่าย Date: Tue, 26 Dec 2023 17:11:12 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=87=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/09_leave/components/3_Report/DetailReport.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/09_leave/components/3_Report/DetailReport.vue b/src/modules/09_leave/components/3_Report/DetailReport.vue index a9bc15dae..22a9e89c0 100644 --- a/src/modules/09_leave/components/3_Report/DetailReport.vue +++ b/src/modules/09_leave/components/3_Report/DetailReport.vue @@ -278,7 +278,7 @@ async function updateLeaveday() { dateStart.value = new Date(year.value, 9, 1); dateEnd.value = new Date(year.value + 1, 2, 31); } else if (yearType.value === "SECONDHAFT") { - dateStart.value = new Date(year.value + 1, 2, 31); + dateStart.value = new Date(year.value + 1, 3, 1); dateEnd.value = new Date(year.value + 1, 8, 30); }