From f626fca77eb221e2bb2cde2e71d9a39f35e79d26 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 29 Aug 2023 14:30:16 +0700
Subject: [PATCH] no message

---
 .../components/resign/ResignByid.vue          | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index 11f2466fa..2d0d79f5e 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -550,7 +550,20 @@ const statusOrder = (val: boolean) => {
         </div>
         <div class="col-xs-12 row items-start">
           <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
-          <div class="col-12 text-detail">
+          <div
+            class="col-12 text-detail"
+            v-if="dataDetail.commanderReject === false"
+          >
+            {{
+              dataDetail.commanderApproveReason !== null
+                ? dataDetail.commanderApproveReason
+                : "-"
+            }}
+          </div>
+          <div
+            class="col-12 text-detail"
+            v-if="dataDetail.commanderReject === true"
+          >
             {{
               dataDetail.commanderRejectReason !== null
                 ? dataDetail.commanderRejectReason
@@ -592,7 +605,20 @@ const statusOrder = (val: boolean) => {
         </div>
         <div class="col-xs-12 row items-start">
           <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
-          <div class="col-12 text-detail">
+          <div
+            class="col-12 text-detail"
+            v-if="dataDetail.oligarchReject == false"
+          >
+            {{
+              dataDetail.oligarchApproveReason !== null
+                ? dataDetail.oligarchApproveReason
+                : "-"
+            }}
+          </div>
+          <div
+            class="col-12 text-detail"
+            v-else-if="dataDetail.oligarchReject == true"
+          >
             {{
               dataDetail.oligarchRejectReason !== null
                 ? dataDetail.oligarchRejectReason