From 28989d1dbb49ed09c42fc74c866cfeb87f02af56 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Fri, 7 Mar 2025 16:46:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=87=E0=B8=84=E0=B8=B1=E0=B8=9A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_leave/components/FormLeave/01_SickForm.vue       | 1 +
 src/modules/05_leave/components/FormLeave/03_Birth.vue          | 1 +
 .../05_leave/components/FormLeave/04_HelpWifeBirthForm.vue      | 1 +
 src/modules/05_leave/components/FormLeave/05_VacationForm.vue   | 1 +
 src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue | 1 +
 src/modules/05_leave/components/FormLeave/07_HajjForm.vue       | 1 +
 src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue   | 1 +
 src/modules/05_leave/components/FormLeave/09_StudyForm.vue      | 2 +-
 src/modules/05_leave/components/FormLeave/10_TrainForm.vue      | 2 +-
 .../05_leave/components/FormLeave/11_WorkInternationalForm.vue  | 1 +
 .../05_leave/components/FormLeave/12_FollowSpouseForm.vue       | 1 +
 .../05_leave/components/FormLeave/13_RehabilitationForm.vue     | 1 +
 12 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index 282e0d0..29bc524 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -375,6 +375,7 @@ onMounted(() => {
                       : null
                   "
                   :label="`${'ลาถึงวันที่'}`"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
                 >
                   <template v-slot:prepend>
                     <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue
index 3a885eb..3acf5d2 100644
--- a/src/modules/05_leave/components/FormLeave/03_Birth.vue
+++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue
@@ -296,6 +296,7 @@ onMounted(() => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
             >
               <template v-slot:prepend>
                 <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
index e3ecaf7..45065c9 100644
--- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
@@ -321,6 +321,7 @@ onMounted(() => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
             >
               <template v-slot:prepend>
                 <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
index 19269d4..751f8e0 100644
--- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue
@@ -387,6 +387,7 @@ onMounted(() => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
             >
               <template v-slot:prepend>
                 <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
index 452bd0f..e0c94dd 100644
--- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
@@ -360,6 +360,7 @@ onMounted(() => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
               :readonly="
                 !formDataOrdination.leaveStartDate || statusCheck === 'NEW'
               "
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
index 6ba75e1..0a0db10 100644
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@@ -298,6 +298,7 @@ onMounted(() => {
                       ? date2Thai(formDataHaji.leaveEndDate)
                       : null
                   "
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
                   @update:model-value="fetchCheck()"
                 >
                   <template v-slot:prepend>
diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
index 0b53cd4..6d15498 100644
--- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
@@ -316,6 +316,7 @@ onMounted(() => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
             >
               <template v-slot:prepend>
                 <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
index 3654a6c..eb79711 100644
--- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
+++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
@@ -354,6 +354,7 @@ onMounted(async () => {
               hide-bottom-space
               :label="`${'ลาถึงวันที่'}`"
               :readonly="!formDataStudy.leaveStartDate || statusCheck === 'NEW'"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
               :model-value="
                 formDataStudy.leaveEndDate != null
                   ? date2Thai(formDataStudy.leaveEndDate)
@@ -474,7 +475,6 @@ onMounted(async () => {
                       ? date2Thai(dataStore.birthDate)
                       : null
                   "
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
                 >
                   <template v-slot:prepend>
                     <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
index 3184e9f..763e82b 100644
--- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
+++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
@@ -340,6 +340,7 @@ onMounted(async () => {
               hide-bottom-space
               :label="`${'ลาถึงวันที่'}`"
               :readonly="!formDataTrain.leaveStartDate || statusCheck === 'NEW'"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
               :model-value="
                 formDataTrain.leaveEndDate != null
                   ? date2Thai(formDataTrain.leaveEndDate)
@@ -462,7 +463,6 @@ onMounted(async () => {
                       ? date2Thai(dataStore.birthDate)
                       : null
                   "
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
                 >
                   <template v-slot:prepend>
                     <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
index 8f21b94..2baa64d 100644
--- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
@@ -332,6 +332,7 @@ onMounted(() => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
               :bottom-slots="!isLeave ? true : false"
               :color="!isLeave ? 'red' : 'black'"
               :bg-color="!isLeave ? 'red-2' : 'white'"
diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
index 348d61d..e94790d 100644
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@@ -425,6 +425,7 @@ onMounted(async () => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
             >
               <template v-slot:prepend>
                 <q-icon
diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
index 0b5b10b..f491ccf 100644
--- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
@@ -295,6 +295,7 @@ onMounted(() => {
                   : null
               "
               :label="`${'ลาถึงวันที่'}`"
+              :rules="[(val:string) => !!val || `${'กรุณาเลือกลาถึงวันที่'}`]"
               :bottom-slots="!isLeave ? true : false"
               :color="!isLeave ? 'red' : 'black'"
               :bg-color="!isLeave ? 'red-2' : 'white'"