From 892093c432bdbce81b57af955f49bca4880381e5 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 10 Jun 2025 13:01:44 +0700
Subject: [PATCH] fix bug retirement detail add check statusMain for approve /
 reject case cancel

---
 .../06_retirement/components/02_resign/ResignByid.vue        | 5 +++++
 .../06_retirement/components/02_resign/ResignReject.vue      | 2 ++
 .../06_retirement/components/03_resignEmp/ResignByid.vue     | 5 +++++
 .../06_retirement/components/03_resignEmp/ResignReject.vue   | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 228e4e0b3..3d83892d2 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -751,6 +751,9 @@ onMounted(async () => {
       {{
         dataDetail.prefix + dataDetail.firstName + "  " + dataDetail.lastName
       }}
+      <span v-if="dataDetail.statusMain === 'CANCELING'" class="text-red">
+        &nbsp;(อยู่ระหว่างการขอยกเลิกลาออก)
+      </span>
     </div>
 
     <CardProfile :data="dataProfile as DataProfile" />
@@ -1167,6 +1170,7 @@ onMounted(async () => {
                 <div v-else-if="col.name == 'comment'">
                   <div
                     v-if="
+                      dataDetail.statusMain === 'PENDING' &&
                       props.row.approveStatus == 'PENDING' &&
                       props.row.comment == '' &&
                       approveStep === 'st2'
@@ -1258,6 +1262,7 @@ onMounted(async () => {
         <div
           class="q-gutter-x-sm"
           v-if="
+            dataDetail.statusMain === 'PENDING' &&
             rowsApprover &&
             rowsApprover.approvers &&
             rowsApprover.approvers[0]?.profileId == myProfileId &&
diff --git a/src/modules/06_retirement/components/02_resign/ResignReject.vue b/src/modules/06_retirement/components/02_resign/ResignReject.vue
index 2514a6a35..8fc0fb331 100644
--- a/src/modules/06_retirement/components/02_resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignReject.vue
@@ -566,6 +566,7 @@ onMounted(async () => {
                   <div
                     class="q-gutter-x-xs"
                     v-if="
+                      dataDetail.statusMain === 'CANCELING' &&
                       props.row.approveStatus == 'PENDING' &&
                       props.row.comment == '' &&
                       approveStep === 'st2'
@@ -645,6 +646,7 @@ onMounted(async () => {
 
         <div
           v-if="
+            dataDetail.statusMain === 'CANCELING' &&
             rowsApprover &&
             rowsApprover.approvers &&
             rowsApprover.approvers[0]?.profileId == keycloakId &&
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index d4c8e577b..65371cac6 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -779,6 +779,9 @@ onMounted(async () => {
       {{
         dataDetail.prefix + dataDetail.firstName + "  " + dataDetail.lastName
       }}
+      <span v-if="dataDetail.statusMain === 'CANCELING'" class="text-red">
+        &nbsp;(อยู่ระหว่างการขอยกเลิกลาออก)
+      </span>
     </div>
 
     <CardProfile :type="'employee'" :data="dataProfile as DataProfile" />
@@ -1182,6 +1185,7 @@ onMounted(async () => {
                   <div
                     class="q-gutter-x-xs"
                     v-if="
+                      dataDetail.statusMain === 'PENDING' &&
                       props.row.approveStatus == 'PENDING' &&
                       props.row.comment == '' &&
                       approveStep === 'st2'
@@ -1260,6 +1264,7 @@ onMounted(async () => {
         <div
           class="q-gutter-x-sm"
           v-if="
+            dataDetail.statusMain === 'PENDING' &&
             rowsApprover &&
             rowsApprover.approvers &&
             rowsApprover.approvers[0]?.profileId == keycloakId &&
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
index 51dc58178..c6d277a82 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
@@ -551,6 +551,7 @@ onMounted(async () => {
                   <div
                     class="q-gutter-x-xs"
                     v-if="
+                      dataDetail.statusMain === 'CANCELING' &&
                       props.row.approveStatus == 'PENDING' &&
                       props.row.comment == '' &&
                       approveStep === 'st2'
@@ -628,6 +629,7 @@ onMounted(async () => {
         <div
           class="q-gutter-x-sm"
           v-if="
+            dataDetail.statusMain === 'CANCELING' &&
             rowsApprover &&
             rowsApprover.approvers &&
             rowsApprover.approvers[0]?.profileId == keycloakId &&