From 751a320fda24222d9e49a7771fa9e4b9122f6256 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 30 Oct 2024 18:08:16 +0700
Subject: [PATCH 1/3] fix

---
 src/modules/03_retire/views/addRetire.vue | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index ece94c7..7cf94d4 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -188,13 +188,7 @@ onMounted(() => {
 
             <q-space />
             <q-btn
-              v-if="
-                dataDetail.status !== 'DELETE' &&
-                dataDetail.status !== 'CANCEL' &&
-                dataDetail.status !== 'DONECANCEL' &&
-                dataDetail.status !== 'DONEREJECT' &&
-                checkCancleLeave
-              "
+              v-if="dataDetail.statusMain !== 'CANCEL' && checkCancleLeave"
               unelevated
               color="orange"
               label="ยกเลิกการลาออก"
@@ -203,15 +197,10 @@ onMounted(() => {
             />
 
             <q-btn
-              v-else-if="
-                dataDetail.status === 'DELETE' ||
-                dataDetail.status === 'CANCEL' ||
-                dataDetail.status === 'DONECANCEL' ||
-                dataDetail.status === 'DONEREJECT'
-              "
+              v-else-if="dataDetail.statusMain === 'CANCEL'"
               unelevated
               color="red"
-              label="ติดตามสถานะการขอลาออก"
+              label="ติดตามสถานะยกเลิกการขอลาออก"
               @click="modalWorkflow = true"
             />
           </q-card-actions>
@@ -618,7 +607,7 @@ onMounted(() => {
   <q-dialog v-model="modalWorkflow" persistent>
     <q-card style="width: 700px; max-width: 80vw">
       <Header
-        :tittle="`ติดตามสถานะการขอลาออก`"
+        :tittle="`ติดตามสถานะยกเลิกการขอลาออก`"
         :close="
           () => {
             modalWorkflow = false;

From 68876538ba01bc4b7d7ecd38414d0d0bab4bb0b0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 31 Oct 2024 14:37:30 +0700
Subject: [PATCH 2/3] fix leave

---
 src/modules/05_leave/components/DialogDetail.vue |  2 +-
 .../components/FormLeave/12_FollowSpouseForm.vue | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 54b5a46..308e1f6 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -529,7 +529,7 @@ watch(
               outlined
               v-model="formDelete.doc"
               label="เลือกไฟล์เอกสารหลักฐาน"
-              :rules="[(val:string) => !!val || 'กรูณา เลือกไฟล์เอกสารหลักฐาน']"
+              :rules="props.leaveStatus === 'CANCEL' ? []:[(val:string) => !!val || 'กรูณา เลือกไฟล์เอกสารหลักฐาน']"
               hide-bottom-space
               lazy-rules
               use-chips
diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
index e71ddf3..23daffd 100644
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@@ -139,11 +139,15 @@ function onValidate() {
     ); //
     formData.append(
       "coupleDayStartDateHistory",
-      dateToISO(new Date(formDataFollowSpouse.coupleDayStartDateHistory))
+      formDataFollowSpouse.coupleDayStartDateHistory
+        ? dateToISO(new Date(formDataFollowSpouse.coupleDayStartDateHistory))
+        : ""
     ); //
     formData.append(
       "coupleDayEndDateHistory",
-      dateToISO(new Date(formDataFollowSpouse.coupleDayEndDateHistory))
+      formDataFollowSpouse.coupleDayEndDateHistory
+        ? dateToISO(new Date(formDataFollowSpouse.coupleDayEndDateHistory))
+        : ""
     ); //
     formData.append("leaveWrote", formDataFollowSpouse.leaveWrote); //
     formData.append("leaveDetail", formDataFollowSpouse.leaveDetail); //
@@ -268,6 +272,8 @@ watch(props.data, async () => {
 /**Hook */
 onMounted(async () => {
   if (props.data) {
+    console.log(props.data);
+
     formDataFollowSpouse.leaveWrote = props.data.leaveWrote;
     formDataFollowSpouse.leaveStartDate = new Date(props.data.leaveStartDate);
     formDataFollowSpouse.leaveEndDate = new Date(props.data.leaveEndDate);
@@ -576,8 +582,8 @@ onMounted(async () => {
                   : null
               "
               :label="`${'ตั้งแต่วันที่'}`"
-              :rules="[(val:string) => !!val || `${'กรุณาเลือกตั้งแต่วันที่'}`]"
             >
+              <!-- :rules="[(val:string) => !!val || `${'กรุณาเลือกตั้งแต่วันที่'}`]" -->
               <template v-slot:prepend>
                 <q-icon
                   name="event"
@@ -624,8 +630,8 @@ onMounted(async () => {
                   : null
               "
               :label="`${'ถึงวันที่'}`"
-              :rules="[(val:string) => !!val || `${'กรุณาเลือกถึงวันที่'}`]"
             >
+              <!-- :rules="[(val:string) => !!val || `${'กรุณาเลือกถึงวันที่'}`]" -->
               <template v-slot:prepend>
                 <q-icon
                   name="event"
@@ -662,8 +668,8 @@ onMounted(async () => {
           v-model="formDataFollowSpouse.coupleDayCountryHistory"
           label="ประเทศ"
           :readonly="!edit || statusCheck === 'NEW'"
-          :rules="[(val:string) => !!val || `${'กรุณาเลือกประเทศ'}`]"
         />
+        <!-- :rules="[(val:string) => !!val || `${'กรุณาเลือกประเทศ'}`]" -->
 
         <q-input
           hide-bottom-space

From fcd3be7af63291f45151793e652eb5d837820cb6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 31 Oct 2024 14:38:21 +0700
Subject: [PATCH 3/3] deleta log

---
 .../05_leave/components/FormLeave/12_FollowSpouseForm.vue       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
index 23daffd..bf7a7c1 100644
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@@ -272,8 +272,6 @@ watch(props.data, async () => {
 /**Hook */
 onMounted(async () => {
   if (props.data) {
-    console.log(props.data);
-
     formDataFollowSpouse.leaveWrote = props.data.leaveWrote;
     formDataFollowSpouse.leaveStartDate = new Date(props.data.leaveStartDate);
     formDataFollowSpouse.leaveEndDate = new Date(props.data.leaveEndDate);