From bd80a0fb4f32db0f852cd662bc2ba53ee0827922 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 27 Jan 2026 09:39:28 +0700 Subject: [PATCH] fix(leave):dislplay_columns_leaveTotal --- .../components/05_Leave/TableList.vue | 26 +++++++++++++------ .../09_leave/interface/response/leave.ts | 1 + src/modules/09_leave/stores/LeaveStore.ts | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue index bc8ffe0a7..65a8a2c3c 100644 --- a/src/modules/09_leave/components/05_Leave/TableList.vue +++ b/src/modules/09_leave/components/05_Leave/TableList.vue @@ -42,14 +42,14 @@ const columnsLeave = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "citizenId", - align: "left", - label: "เลขประจำตัวประชาชน", - field: "citizenId", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "citizenId", + // align: "left", + // label: "เลขประจำตัวประชาชน", + // field: "citizenId", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, { name: "fullName", align: "left", @@ -113,6 +113,15 @@ const columnsLeave = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "leaveTotal", + align: "left", + label: "จำนวนวันที่ลา", + sortable: true, + field: "leaveTotal", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "status", align: "left", @@ -134,6 +143,7 @@ const visibleColumnsLeave = ref([ "org", "position", "level", + "leaveTotal", "status", ]); diff --git a/src/modules/09_leave/interface/response/leave.ts b/src/modules/09_leave/interface/response/leave.ts index 8a274b6dd..8ad8f42f4 100644 --- a/src/modules/09_leave/interface/response/leave.ts +++ b/src/modules/09_leave/interface/response/leave.ts @@ -25,6 +25,7 @@ interface ListLeave { position?: string; level?: string; hajjDayStatus?: boolean; + leaveTotal: number; //จำนวนวันที่ลา } interface FormData { id: string; diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts index 9bf2d6f30..6c0665db3 100644 --- a/src/modules/09_leave/stores/LeaveStore.ts +++ b/src/modules/09_leave/stores/LeaveStore.ts @@ -88,6 +88,7 @@ export const useLeavelistDataStore = defineStore("leave", () => { : "-", status: e.status && convertSatatus(e.status), statusText: e.status, + leaveTotal: e.leaveTotal, })); mainData.value = datalist; rows.value = mainData.value;