From ba19811676c0026709763cd9b205cf4a903d2295 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 Dec 2023 17:30:40 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=A3=E0=B8=AD=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B9=83?=
 =?UTF-8?q?=E0=B8=8A=E0=B9=89=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../09_leave/components/2_Leave/DetailLeave.vue     |  2 +-
 .../components/2_Leave/formDetail/formMain.vue      |  6 +++---
 .../components/4_ChangeRound/DialogForm.vue         | 13 +++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 4a732c209..37f9a1c5e 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -434,7 +434,7 @@ function clickSave(reason: string) {
       <!-- <q-file
         v-model="filesUpload"
         dense
-        label="อัพโหลดไฟล์"
+        label="อัปโหลดไฟล์"
         outlined
         class="col-xs-12 col-sm-3 col-md-2"
         bg-color="white"
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue b/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
index 684f4d700..63ce94ef4 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formMain.vue
@@ -27,15 +27,15 @@ console.log(props);
         <div class="col">{{ props.data.fullName }}</div>
       </div>
       <div class="row">
-        <div class="col-4 text-grey-8">ตำแหน่งผู้ยืนขอ</div>
+        <div class="col-4 text-grey-8">ตำแหน่งผู้ยื่นขอ</div>
         <div class="col">{{ props.data.positionName }}</div>
       </div>
       <div class="row">
-        <div class="col-4 text-grey-8">ระดับผู้ยืนขอ</div>
+        <div class="col-4 text-grey-8">ระดับผู้ยื่นขอ</div>
         <div class="col">{{ props.data.positionLevelName }}</div>
       </div>
       <div class="row">
-        <div class="col-4 text-grey-8">สังกัดผู้ยืนขอ</div>
+        <div class="col-4 text-grey-8">สังกัดผู้ยื่นขอ</div>
         <div class="col">{{ props.data.organizationName }}</div>
       </div>
     </div>
diff --git a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
index 1fe76ca24..5812ae463 100644
--- a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
@@ -33,7 +33,7 @@ const roundOp = ref<any>([]);
 
 /**Hook */
 onMounted(async () => {
-  await fetchDataOption();
+  // await fetchDataOption();
 });
 
 /**FormData */
@@ -124,8 +124,10 @@ async function fetchDataOption() {
           name: `${r.startTimeMorning}-${r.endTimeAfternoon}`,
         });
       });
-      roundOp.value = option;
-      console.log(roundOp.value);
+
+      roundOp.value = option.filter(
+        (e) => e.name !== props.DataRow?.currentRound
+      );
     })
     .catch((err) => {
       messageError($q, err);
@@ -190,12 +192,15 @@ function close() {
 }
 watch(
   () => props.modal,
-  (newDetailData, oldDetailData) => {
+  async (newDetailData, oldDetailData) => {
     if (props.editCheck === "edit") {
       formData.round = "";
       formData.reson = "";
       formData.effectiveDate = null;
     }
+    if (props.modal === true) {
+      await fetchDataOption();
+    }
   }
 );
 </script>

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 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=20API=20=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=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;
           });
       },