From d4fafe3c3f9c2eb2d4f98a93468702599c87c084 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 8 Jan 2024 09:58:22 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A5=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B9=80=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Work/DialogDetail.vue        | 27 +++++++++++++++++++
 .../09_leave/interface/response/work.ts       |  4 +++
 2 files changed, 31 insertions(+)

diff --git a/src/modules/09_leave/components/1_Work/DialogDetail.vue b/src/modules/09_leave/components/1_Work/DialogDetail.vue
index 647682135..e425b81b2 100644
--- a/src/modules/09_leave/components/1_Work/DialogDetail.vue
+++ b/src/modules/09_leave/components/1_Work/DialogDetail.vue
@@ -58,6 +58,10 @@ const formData = reactive<FormDetail>({
   checkOutStatus: "",
   fullName: "",
   checkOutDescription: "",
+  isLocationCheckIn: false,
+  checkInLocationName: "",
+  isLocationCheckOut: false,
+  checkOutLocationName: "",
 });
 
 /**
@@ -98,6 +102,11 @@ async function fetchDetailByid(id: string, type: string) {
       formData.checkOutStatus = data.checkOutStatus
         ? convertSatatus(data.checkOutStatus)
         : "-";
+
+      formData.isLocationCheckIn = data.isLocationCheckIn;
+      formData.checkInLocationName = data.checkInLocationName;
+      formData.isLocationCheckOut = data.isLocationCheckOut;
+      formData.checkOutLocationName = data.checkOutLocationName;
     })
     .catch((err) => {
       messageError($q, err);
@@ -198,6 +207,15 @@ watch(
                     <div class="col text-grey-8">เวลาเข้างาน</div>
                     <div class="col">{{ formData.checkInTime }}</div>
                   </div>
+                  <div class="row">
+                    <div class="col text-grey-8">สถานที่ทำงาน</div>
+                    <div class="col" v-if="formData.isLocationCheckIn">
+                      ในสถานที่
+                    </div>
+                    <div class="col" v-else>
+                      นอกสถานที่ ({{ formData.checkInLocationName }})
+                    </div>
+                  </div>
                   <div class="row">
                     <div class="col text-grey-8">พิกัด</div>
                     <div class="col">
@@ -244,6 +262,15 @@ watch(
                     <div class="col text-grey-8">เวลาออกงาน</div>
                     <div class="col">{{ formData.checkOutTime }}</div>
                   </div>
+                  <div class="row">
+                    <div class="col text-grey-8">สถานที่ทำงาน</div>
+                    <div class="col" v-if="formData.isLocationCheckOut">
+                      ในสถานที่
+                    </div>
+                    <div class="col" v-else>
+                      นอกสถานที่ ({{ formData.checkOutLocationName }})
+                    </div>
+                  </div>
                   <div class="row">
                     <div class="col text-grey-8">พิกัด</div>
                     <div class="col">
diff --git a/src/modules/09_leave/interface/response/work.ts b/src/modules/09_leave/interface/response/work.ts
index 876c46d71..8a1fb718f 100644
--- a/src/modules/09_leave/interface/response/work.ts
+++ b/src/modules/09_leave/interface/response/work.ts
@@ -77,5 +77,9 @@ interface FormDetail {
   checkOutLon: number | null; //พิกัด Lon ออกงาน
   checkOutImg: string; //รูปถ่ายออกงาน
   checkOutDescription: string; //หมายเหตุออกงาน
+  isLocationCheckIn: boolean;
+  isLocationCheckOut: boolean;
+  checkInLocationName: string;
+  checkOutLocationName: string;
 }
 export type { TableRows, DataResLog, DataResTime, TableRowsTime, FormDetail };