diff --git a/src/modules/05_leave/components/Forms/05_VacationForm.vue b/src/modules/05_leave/components/Forms/05_VacationForm.vue
index 609f8b5..7522f86 100644
--- a/src/modules/05_leave/components/Forms/05_VacationForm.vue
+++ b/src/modules/05_leave/components/Forms/05_VacationForm.vue
@@ -267,6 +267,7 @@ const isReadOnly = computed(() => {
 					:enableTimePicker="false"
 					week-start="0"
 					:readonly="!edit"
+					@update:model-value="formDataVacation.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -307,7 +308,7 @@ const isReadOnly = computed(() => {
 					:enableTimePicker="false"
 					week-start="0"
 					:readonly="isReadOnly"
-					:min-date="formDataVacation.leaveStartDate ? new Date(formDataVacation.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataVacation.leaveStartDate"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/components/Forms/06_OrdinationForm.vue b/src/modules/05_leave/components/Forms/06_OrdinationForm.vue
index 924a3a0..b6e4c65 100644
--- a/src/modules/05_leave/components/Forms/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/Forms/06_OrdinationForm.vue
@@ -229,6 +229,7 @@ function updateLeaveTotal() {
 					borderless
 					:enableTimePicker="false"
 					week-start="0"
+					@update:model-value="formDataOrdination.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -265,7 +266,7 @@ function updateLeaveTotal() {
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataOrdination.leaveStartDate"
 					:enableTimePicker="false"
-					:min-date="formDataOrdination.leaveStartDate ? new Date(formDataOrdination.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataOrdination.leaveStartDate"
 					week-start="0"
 				>
 					<template #year="{ year }">
@@ -372,7 +373,7 @@ function updateLeaveTotal() {
 									class="full-width"
 									:model-value="formDataOrdination.leavebirthDate != null ? date2Thai(formDataOrdination.leavebirthDate) : null"
 									:label="`${'วันเดือนปีเกิด'}`"
-									:rules="[val => !!val || `${'กรุณาเลือกลาตั้งแต่วันที่'}`]"
+									:rules="[val => !!val || `${'กรุณาเลือกวันเดือนปีเกิด'}`]"
 								>
 									<template v-slot:prepend>
 										<q-icon name="event" class="cursor-pointer" style="color: var(--black)"> </q-icon>
diff --git a/src/modules/05_leave/components/Forms/07_HajjForm.vue b/src/modules/05_leave/components/Forms/07_HajjForm.vue
index 6f7af3a..11aef91 100644
--- a/src/modules/05_leave/components/Forms/07_HajjForm.vue
+++ b/src/modules/05_leave/components/Forms/07_HajjForm.vue
@@ -193,6 +193,7 @@ function updateLeaveTotal() {
 							week-start="0"
 							:enableTimePicker="false"
 							:locale="'th'"
+							@update:model-value="formDataHaji.leaveEndDate = null"
 						>
 							<template #year="{ year }">
 								{{ year + 543 }}
@@ -230,7 +231,7 @@ function updateLeaveTotal() {
 							:locale="'th'"
 							@update:model-value="updateLeaveTotal"
 							:readonly="!formDataHaji.leaveStartDate"
-							:min-date="formDataHaji.leaveStartDate ? new Date(formDataHaji.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+							:min-date="formDataHaji.leaveStartDate"
 						>
 							<template #year="{ year }">
 								{{ year + 543 }}
diff --git a/src/modules/05_leave/components/Forms/08_MilitaryForm.vue b/src/modules/05_leave/components/Forms/08_MilitaryForm.vue
index e1b9bc6..6bac886 100644
--- a/src/modules/05_leave/components/Forms/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/Forms/08_MilitaryForm.vue
@@ -204,6 +204,7 @@ function updateLeaveTotal() {
 					borderless
 					:enableTimePicker="false"
 					week-start="0"
+					@update:model-value="formDataMilitary.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -241,7 +242,7 @@ function updateLeaveTotal() {
 					week-start="0"
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataMilitary.leaveStartDate"
-					:min-date="formDataMilitary.leaveStartDate ? new Date(formDataMilitary.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataMilitary.leaveStartDate"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/components/Forms/09_StudyForm.vue b/src/modules/05_leave/components/Forms/09_StudyForm.vue
index ec38dc4..3bf4dd4 100644
--- a/src/modules/05_leave/components/Forms/09_StudyForm.vue
+++ b/src/modules/05_leave/components/Forms/09_StudyForm.vue
@@ -225,6 +225,7 @@ const formattedleaveSalary = computed(() => {
 					week-start="0"
 					:enableTimePicker="false"
 					:locale="'th'"
+					@update:model-value="formDataStudy.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -263,7 +264,7 @@ const formattedleaveSalary = computed(() => {
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataStudy.leaveStartDate"
 					:enableTimePicker="false"
-					:min-date="formDataStudy.leaveStartDate ? new Date(formDataStudy.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataStudy.leaveStartDate"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/components/Forms/10_TrainForm.vue b/src/modules/05_leave/components/Forms/10_TrainForm.vue
index 7b9f7cf..838f2d9 100644
--- a/src/modules/05_leave/components/Forms/10_TrainForm.vue
+++ b/src/modules/05_leave/components/Forms/10_TrainForm.vue
@@ -226,6 +226,7 @@ const formattedSalary = computed(() => {
 					week-start="0"
 					:enableTimePicker="false"
 					:locale="'th'"
+					@update:model-value="formDataTrain.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -264,7 +265,7 @@ const formattedSalary = computed(() => {
 					:readonly="!formDataTrain.leaveStartDate"
 					:locale="'th'"
 					:enableTimePicker="false"
-					:min-date="formDataTrain.leaveStartDate ? new Date(formDataTrain.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataTrain.leaveStartDate"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue b/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
index d28cc6d..ae3a2ad 100644
--- a/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/Forms/11_WorkInternationalForm.vue
@@ -207,6 +207,7 @@ async function saveFormData() {
 					:enableTimePicker="false"
 					week-start="0"
 					:readonly="!edit"
+					@update:model-value="formDataWorkInternational.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -247,7 +248,7 @@ async function saveFormData() {
 					@update:model-value="FetchCheck()"
 					week-start="0"
 					:readonly="!formDataWorkInternational.leaveStartDate"
-					:min-date="formDataWorkInternational.leaveStartDate ? new Date(formDataWorkInternational.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataWorkInternational.leaveStartDate"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue b/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue
index 2bf4855..bbcd4ed 100644
--- a/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/Forms/12_FollowSpouseForm.vue
@@ -248,6 +248,7 @@ function updateLeaveTotal() {
 					:enableTimePicker="false"
 					week-start="0"
 					:readonly="!edit"
+					@update:model-value="formDataFollowSpouse.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -288,7 +289,7 @@ function updateLeaveTotal() {
 					week-start="0"
 					@update:model-value="updateLeaveTotal, FetchCheck()"
 					:readonly="!formDataFollowSpouse.leaveStartDate"
-					:min-date="formDataFollowSpouse.leaveStartDate ? new Date(formDataFollowSpouse.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataFollowSpouse.leaveStartDate"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
diff --git a/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue b/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
index 36bdff2..232adf8 100644
--- a/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/Forms/13_RehabilitationForm.vue
@@ -185,6 +185,7 @@ async function saveFormData() {
 					week-start="0"
 					:enableTimePicker="false"
 					:locale="'th'"
+					@update:model-value="formDataRehabilitation.leaveEndDate = null"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}
@@ -223,7 +224,7 @@ async function saveFormData() {
 					@update:model-value="FetchCheck()"
 					:readonly="!formDataRehabilitation.leaveStartDate"
 					:enableTimePicker="false"
-					:min-date="formDataRehabilitation.leaveStartDate ? new Date(formDataRehabilitation.leaveStartDate.getTime() * 60 * 60 * 1000) : null"
+					:min-date="formDataRehabilitation.leaveStartDate"
 				>
 					<template #year="{ year }">
 						{{ year + 543 }}