diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue index 78a97518e..86ab16cba 100644 --- a/src/modules/09_leave/components/05_Leave/TableList.vue +++ b/src/modules/09_leave/components/05_Leave/TableList.vue @@ -33,6 +33,15 @@ const columnsLeave = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "profileType", + align: "left", + label: "สถานภาพ", + sortable: true, + field: "profileType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "citizenId", align: "left", @@ -117,6 +126,7 @@ const columnsLeave = ref([ const visibleColumnsLeave = ref([ "no", "leaveTypeName", + "profileType", "citizenId", "fullName", "dateSendLeave", @@ -147,6 +157,15 @@ const columnsReject = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "profileType", + align: "left", + label: "สถานภาพ", + sortable: true, + field: "profileType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "fullName", align: "left", @@ -178,6 +197,7 @@ const columnsReject = ref([ const visibleReject = ref([ "no", "leaveTypeName", + "profileType", "fullName", "dateSendLeave", "status", @@ -296,7 +316,15 @@ onMounted(() => {
{{ convert(props.row) }}
- +
+ {{ + col.value !== "-" + ? col.value == "OFFICER" + ? "ข้าราชการ กทม. สามัญ" + : "ลูกจ้างประจำ กทม." + : "-" + }} +
{{ col.value }}
diff --git a/src/modules/09_leave/interface/response/leave.ts b/src/modules/09_leave/interface/response/leave.ts index 38d0b0e6f..cac8aecda 100644 --- a/src/modules/09_leave/interface/response/leave.ts +++ b/src/modules/09_leave/interface/response/leave.ts @@ -17,6 +17,7 @@ interface ListLeave { leaveStartDate?: Date | null; leaveEndDate?: Date | null; agency?: string; + profileType?: string; org?: string; position?: string; level?: string; diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts index 2557cdaf5..a77c55b4e 100644 --- a/src/modules/09_leave/stores/LeaveStore.ts +++ b/src/modules/09_leave/stores/LeaveStore.ts @@ -44,6 +44,7 @@ export const useLeavelistDataStore = defineStore("leave", () => { let datalist = data.map((e: ListLeave) => ({ id: e.id, leaveTypeName: e.leaveTypeName ?? "-", + profileType: e.profileType ?? "-", leaveTypeId: e.leaveTypeId ?? "-", citizenId: e.citizenId ?? "-", fullName: