From ba72ef35e61e5583f9625feec62162b3c216639f Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 29 Apr 2025 09:32:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=99=E0=B8=9F?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../09_leave/components/05_Leave/DetailLeavePage.vue       | 2 ++
 .../components/05_Leave/Dialog/DialogAddCommander.vue      | 7 ++++++-
 .../09_leave/components/05_Leave/formDetail/formMain.vue   | 2 +-
 src/modules/09_leave/interface/request/leave.ts            | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index d17977121..1824087c0 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -132,6 +132,7 @@ const formData = reactive<FremData>({
   dear: "",
   leaveRange: "",
   profileType: "",
+  commanderPosition: "",
   leaveRangeEnd: "",
 });
 
@@ -367,6 +368,7 @@ async function fetchDetailLeave(paramsId: string) {
 
       formData.leaveSubTypeName = data.leaveSubTypeName;
       formData.leaveRange = data.leaveRange;
+      formData.commanderPosition = data.commanderPosition;
       formData.leaveRangeEnd = data.leaveRangeEnd;
       rows.value = {
         commanders: data.commanders,
diff --git a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
index 95b7775eb..a097fc556 100644
--- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
+++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
@@ -101,7 +101,6 @@ function getSearch() {
 }
 
 async function getData() {
-  console.log(props.idCheck);
   const url =
     props.type == "COMMANDER"
       ? config.API.workflowCommanderOperate
@@ -180,6 +179,12 @@ watch(
     getSearch();
   }
 );
+
+watch(()=>modal.value,()=>{
+  if(modal.value){
+    getSearch()
+  }
+})
 </script>
 <template>
   <q-dialog v-model="modal" persistent>
diff --git a/src/modules/09_leave/components/05_Leave/formDetail/formMain.vue b/src/modules/09_leave/components/05_Leave/formDetail/formMain.vue
index ec811ecd3..0fd68ceea 100644
--- a/src/modules/09_leave/components/05_Leave/formDetail/formMain.vue
+++ b/src/modules/09_leave/components/05_Leave/formDetail/formMain.vue
@@ -32,7 +32,7 @@ const props = defineProps({
       </div>
       <div class="row">
         <div class="col-4 text-grey-8">เรียน</div>
-        <div class="col">{{ props.data.dear }}</div>
+        <div class="col">{{ props.data.commanderPosition }}</div>
       </div>
       <div class="row">
         <div class="col-4 text-grey-8">ชื่อผู้ยื่นขอ</div>
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts
index a751de73f..b004a6008 100644
--- a/src/modules/09_leave/interface/request/leave.ts
+++ b/src/modules/09_leave/interface/request/leave.ts
@@ -95,6 +95,7 @@ interface FremData {
   dear: string;
   leaveRange?: string;
   profileType: string;
+  commanderPosition: string;
   leaveRangeEnd: string;
 }