From 1fa5f1b5233b183ea0f3f1827134e60b1995a206 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 15 Nov 2024 10:15:48 +0700
Subject: [PATCH 1/3] add workflow leave

---
 src/modules/05_leave/components/DialogDetail.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index bb8965c..3bfe3b8 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -503,7 +503,11 @@ watch(
                 leaveStatus != 'DRAFT' && mainStore.officerType == 'OFFICER'
               "
               :id="props.leaveId"
-              sys-name="SYS_LEAVE_LIST"
+              :sys-name="
+                mainStore.officerType == 'OFFICER'
+                  ? 'SYS_LEAVE_LIST'
+                  : 'LEAVE_EMP'
+              "
             />
           </div>
 

From 8d7f061b0bffc0b8e5829b8cc88e69427f160d8b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 15 Nov 2024 10:25:54 +0700
Subject: [PATCH 2/3] change sys key

---
 src/modules/03_retire/views/addRetire.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index 6803ca2..bff5d0f 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -205,7 +205,10 @@ onMounted(async () => {
             />
 
             <q-btn
-              v-else-if="dataDetail.statusMain === 'CANCEL' && dataStore.officerType == 'OFFICER'"
+              v-else-if="
+                dataDetail.statusMain === 'CANCEL' &&
+                dataStore.officerType == 'OFFICER'
+              "
               unelevated
               color="red"
               label="ติดตามสถานะยกเลิกการขอลาออก"
@@ -606,12 +609,16 @@ onMounted(async () => {
           dataStore.officerType == 'OFFICER'
         "
       >
-        <Workflow :id="id" sys-name="SYS_RETIREMENT" />
+        <Workflow :id="id" sys-name="SYS_RESIGN" />
       </div>
     </div>
   </div>
 
-  <Dialog v-model:modal="modal" :fectData="fectDataresign" v-model:link="link"/>
+  <Dialog
+    v-model:modal="modal"
+    :fectData="fectDataresign"
+    v-model:link="link"
+  />
 
   <q-dialog v-model="modalWorkflow" persistent>
     <q-card style="width: 700px; max-width: 80vw">

From 8bf8e85af05d028dbffae46e20bd421885e7fa8d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 15 Nov 2024 10:58:12 +0700
Subject: [PATCH 3/3] fixing

---
 src/modules/05_leave/components/DialogDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 3bfe3b8..4a72760 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -506,7 +506,7 @@ watch(
               :sys-name="
                 mainStore.officerType == 'OFFICER'
                   ? 'SYS_LEAVE_LIST'
-                  : 'LEAVE_EMP'
+                  : 'SYS_LEAVE_LIST_EMP'
               "
             />
           </div>