From 91c870955bcc0cfd9d22465e566bc2198f11fe93 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 5 Feb 2026 12:16:18 +0700
Subject: [PATCH] add: leaveCount in permission leave

---
 .../components/07_LeaveHistory/DialogForm.vue     | 15 ++++++++++++++-
 .../09_leave/interface/response/leaveHistory.ts   |  1 +
 .../09_leave/views/07_LeaveHistoryMain.vue        | 12 +++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index 384253293..fbc6babc0 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -84,6 +84,7 @@ const formData = reactive({
   leaveYear: calculateFiscalYear(new Date()), //ปี
   leaveDays: "", //วันลาที่ยกมา
   leaveDaysUsed: "", //วันลาที่ใช้ไป
+  leaveCount: "", //ครั้งที่ใช้ไป
 });
 const leaveTypeOptions = ref<DataLeaveType[]>([]);
 const leaveTypeOptionsMain = ref<DataLeaveType[]>([]);
@@ -104,6 +105,7 @@ async function onSubmit() {
       leaveDaysUsed: formData.leaveDaysUsed
         ? Number(formData.leaveDaysUsed)
         : 0,
+      leaveCount: formData.leaveCount ? Number(formData.leaveCount) : 0,
     })
 
       .then(async () => {
@@ -156,6 +158,7 @@ async function defineDataLeaveBeginning(data: DataLeaveBeginning) {
   formData.leaveDaysUsed = data.leaveDaysUsed
     ? data.leaveDaysUsed.toString()
     : "0";
+  formData.leaveCount = data.leaveCount ? data.leaveCount.toString() : "0";
 }
 
 /**
@@ -450,7 +453,17 @@ watch(modal, async (val) => {
                     v-model="formData.leaveDaysUsed"
                     dense
                     outlined
-                    label="วันลาที่ใช้ไป"
+                    label="ที่ใช้ไป (วัน)"
+                    hide-bottom-space
+                  />
+                </div>
+                <div class="col-12">
+                  <q-input
+                    :class="classInput(true)"
+                    v-model="formData.leaveCount"
+                    dense
+                    outlined
+                    label="ที่ใช้ไป (ครั้ง)"
                     hide-bottom-space
                   />
                 </div>
diff --git a/src/modules/09_leave/interface/response/leaveHistory.ts b/src/modules/09_leave/interface/response/leaveHistory.ts
index 502cae1ea..5ff103c2e 100644
--- a/src/modules/09_leave/interface/response/leaveHistory.ts
+++ b/src/modules/09_leave/interface/response/leaveHistory.ts
@@ -27,6 +27,7 @@ interface DataLeaveBeginning {
   leaveYear: number;
   prefix: string;
   profileId: string;
+  leaveCount: number;
 }
 
 export type { DataLeaveType, DataLeaveBeginning };
diff --git a/src/modules/09_leave/views/07_LeaveHistoryMain.vue b/src/modules/09_leave/views/07_LeaveHistoryMain.vue
index ccaaab601..a20df7288 100644
--- a/src/modules/09_leave/views/07_LeaveHistoryMain.vue
+++ b/src/modules/09_leave/views/07_LeaveHistoryMain.vue
@@ -83,12 +83,21 @@ const columns = ref<QTableColumn[]>([
   {
     name: "leaveDaysUsed",
     align: "left",
-    label: " วันลาที่ใช้ไป",
+    label: "ที่ใช้ไป (วัน)",
     sortable: true,
     field: "leaveDaysUsed",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "leaveCount",
+    align: "left",
+    label: "ที่ใช้ไป (ครั้ง)",
+    sortable: true,
+    field: "leaveCount",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 ]);
 const visibleColumns = ref<string[]>([
   "fullName",
@@ -96,6 +105,7 @@ const visibleColumns = ref<string[]>([
   "leaveYear",
   "leaveDays",
   "leaveDaysUsed",
+  "leaveCount",
 ]);
 
 const modalDialogForm = ref<boolean>(false); //modal Dialog บันทึกข้อมูลการลาย้อนหลัง