From 159ef88d48aeb8e96484b9298dd2010661812e6d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 18 Jun 2025 14:18:08 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B9=83=E0=B8=99?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B9=80=E0=B8=9B?=
 =?UTF-8?q?=E0=B9=87=E0=B8=99=E0=B8=A2=E0=B8=B1=E0=B8=9A=E0=B8=A2=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=89=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/02_resign/ResignByid.vue      | 7 +++++--
 .../06_retirement/components/03_resignEmp/ResignByid.vue   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 3d83892d2..d42dc131c 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -1219,7 +1219,7 @@ onMounted(async () => {
                 <div v-else-if="col.name == 'approveStatus'">
                   {{
                     props.row.approveStatus
-                      ? convertStatusText(props.row.approveStatus)
+                      ? convertStatusText(props.row.approveStatus, "ยับยั้ง")
                       : "-"
                   }}
                 </div>
@@ -1313,7 +1313,10 @@ onMounted(async () => {
                 rowsApprover &&
                 rowsApprover.approvers &&
                 rowsApprover.approvers[0]?.approveStatus
-                  ? convertStatusText(rowsApprover?.approvers[0].approveStatus)
+                  ? convertStatusText(
+                      rowsApprover?.approvers[0].approveStatus,
+                      "ยับยั้ง"
+                    )
                   : "-"
               }}
             </div>
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index 65371cac6..c2ebfa160 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -1227,7 +1227,7 @@ onMounted(async () => {
                 <div v-else-if="col.name == 'approveStatus'">
                   {{
                     props.row.approveStatus
-                      ? convertStatusText(props.row.approveStatus)
+                      ? convertStatusText(props.row.approveStatus, "ยับยั้ง")
                       : "-"
                   }}
                 </div>
@@ -1314,7 +1314,10 @@ onMounted(async () => {
                 rowsApprover &&
                 rowsApprover.approvers &&
                 rowsApprover.approvers[0]?.approveStatus
-                  ? convertStatusText(rowsApprover?.approvers[0].approveStatus)
+                  ? convertStatusText(
+                      rowsApprover?.approvers[0].approveStatus,
+                      "ยับยั้ง"
+                    )
                   : "-"
               }}
             </div>