From 7396f538bb4d43c042fd97f6920d484c1dd4880f Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 8 Apr 2025 15:30:35 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AB=E0=B8=95=E0=B8=B8=E0=B8=9C=E0=B8=A5=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=82=E0=B8=AD=E0=B8=A5=E0=B8=87=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8?=
 =?UTF-8?q?=E0=B8=A9=20=E0=B9=83=E0=B8=99=20popup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_SpecialTime/DialogApprove.vue          | 19 +++++++++++++++++--
 .../09_leave/views/04_SpecialTimeMain.vue     | 12 +++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue b/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
index 11bac7607..2eb7b2cd0 100644
--- a/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
+++ b/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
@@ -24,6 +24,7 @@ const props = defineProps({
   modal: { type: Boolean, default: "" },
   editCheck: { type: String, default: "" },
   date: { type: String, default: "" },
+  description: { type: String, default: "" },
   dateFix: { type: String, default: "" },
   id: { type: String, default: "" },
   checkInStatus: { type: String, default: "" },
@@ -215,6 +216,20 @@ watch(
               />
             </div>
           </div>
+          <div
+            class="col q-ma-md q-pa-sm bg-white border-custom text-weight-medium"
+          >
+            <p style="color: #06884d; font-size: 14px" class="q-mb-xs">
+              เหตุผลการขอลงเวลาพิเศษ
+            </p>
+            <q-input
+              dense
+              outlined
+              readonly
+              autogrow
+              :model-value="props.description ? props.description : '-'"
+            ></q-input>
+          </div>
           <div
             v-if="formData.checkInEdit"
             class="col q-ma-md q-pa-sm bg-white border-custom text-weight-medium"
@@ -299,9 +314,9 @@ watch(
             class="col-12 bg-white q-ma-md inputgreen"
             outlined
             stack-label
-            :rules="[(val:string) => !!val || 'กรุณาเหตุผล']"
+            :rules="[(val:string) => !!val || 'กรุณาเหตุผลการอนุมัติ']"
             v-model="formData.note"
-            label="เหตุผล"
+            label="เหตุผลการอนุมัติ"
             hide-bottom-space
             type="textarea"
           ></q-input>
diff --git a/src/modules/09_leave/views/04_SpecialTimeMain.vue b/src/modules/09_leave/views/04_SpecialTimeMain.vue
index 9d92b79e8..c42e389cb 100644
--- a/src/modules/09_leave/views/04_SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/04_SpecialTimeMain.vue
@@ -37,6 +37,7 @@ const yearToday = toDay.value.getFullYear();
 
 const month = ref<number>(monthToday + 1);
 const year = ref<number>(yearToday);
+const description = ref<string>('')
 
 /**ตัวแปรที่ใช้ */
 const modalUnapprove = ref<boolean>(false);
@@ -137,7 +138,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "description",
     align: "left",
-    label: "เหตุผล",
+    label: "เหตุผลการขอลงเวลาพิเศษ",
     sortable: true,
     field: "description",
     headerStyle: "font-size: 14px",
@@ -163,11 +164,13 @@ function openModal(
   check: string,
   date: string,
   dateFix: string,
-  personId: string
+  personId: string,
+  detail: string,
 ) {
   id.value = personId;
   modalApprove.value = true;
   dateDialog.value = date;
+  description.value= detail
   dateFixDialog.value = dateFix;
   editCheck.value = check;
   if (check === "PENDING") {
@@ -179,6 +182,7 @@ function openModal(
 function closeDialog() {
   modalUnapprove.value = false;
   modalApprove.value = false;
+  description.value = '';
   editCheck.value = "PENDING";
 }
 
@@ -443,7 +447,8 @@ onMounted(async () => {
                     'PENDING',
                     props.row.date,
                     props.row.dateFix,
-                    props.row.id
+                    props.row.id,
+                    props.row.description
                   )
                 "
                 >อนุมัติ</q-btn
@@ -517,6 +522,7 @@ onMounted(async () => {
     :date="dateDialog"
     :dateFix="dateFixDialog"
     :id="id"
+    :description="description"
     :editCheck="editCheck"
     :detailData="detailData"
     :fetch-data="fetchData"