From 19d5737f8be1f7d0f5c37dc0bd72935edbc4b94f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 Dec 2023 17:36:08 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20API=20=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A5=E0=B8=B2=E0=B8=82=E0=B8=AD=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/09_leave/api.leave.ts                     |  3 ++-
 .../09_leave/components/2_Leave/DetailLeave.vue   | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/api/09_leave/api.leave.ts b/src/api/09_leave/api.leave.ts
index 6c88cd01d..120f29d62 100644
--- a/src/api/09_leave/api.leave.ts
+++ b/src/api/09_leave/api.leave.ts
@@ -23,7 +23,8 @@ export default {
   leaveListDelete: () => `${leave}/admin/delete`,
   leaveListById: (id: string) => `${leave}/admin/${id}`,
   leaveCalendar: () => `${leave}/user/calendar`,
-  leaveApproveToComander: (id: string) => `${leave}/admin/officer/${id}`,
+  leaveApproveToComander: (id: string) =>
+    `${leave}/admin/approve/officer/${id}`,
   leaveComanderApprove: (id: string) => `${leave}/admin/comander/${id}`,
   leaveApprove: (id: string) => `${leave}/admin/approve/${id}`,
   leaveReject: (id: string) => `${leave}/admin/reject/${id}`,
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 37f9a1c5e..74e0febc1 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -317,14 +317,16 @@ function sendToCommand() {
     $q,
     async () => {
       await http
-        .put(config.API.leaveApproveToComander(formData.id))
+        .get(config.API.leaveApproveToComander(formData.id))
         .then(() => {
           success($q, "บันทึกข้อมูลสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);
         })
-        .finally(() => {});
+        .finally(async () => {
+          await fetchDetailLeave(paramsId);
+        });
     },
     "ยืนยันการส่งไปผู้บังคับบัญชา",
     "ต้องการยืนยันการส่งไปผู้บังคับบัญชานี้ใช่หรือไม่ ?"
@@ -349,7 +351,8 @@ function clickSave(reason: string) {
           .catch((err) => {
             messageError($q, err);
           })
-          .finally(() => {
+          .finally(async () => {
+            await fetchDetailLeave(paramsId);
             modalApprove.value = false;
           });
       },
@@ -370,7 +373,8 @@ function clickSave(reason: string) {
           .catch((err) => {
             messageError($q, err);
           })
-          .finally(() => {
+          .finally(async () => {
+            await fetchDetailLeave(paramsId);
             modalApprove.value = false;
           });
       },
@@ -392,7 +396,8 @@ function clickSave(reason: string) {
           .catch((err) => {
             messageError($q, err);
           })
-          .finally(() => {
+          .finally(async () => {
+            await fetchDetailLeave(paramsId);
             modalApprove.value = false;
           });
       },