From 71f22247e8cd8a56b564ff0294cc408b15bb71dd Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 6 Jan 2026 09:41:39 +0700 Subject: [PATCH 1/6] fix(leave-reject):download report --- .../components/05_Leave/DetailLeaveReject.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue index 433a39f6d..6b0e4e44b 100644 --- a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue +++ b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue @@ -504,9 +504,10 @@ onMounted(async () => { @click=" onClickDownloadFile( formData.id, - 'ยกเลิก' + formData.leaveSubTypeName - ? formData.leaveSubTypeName - : formData.leaveTypeName, + 'ยกเลิก' + + (formData.leaveSubTypeName + ? formData.leaveSubTypeName + : formData.leaveTypeName), typeDocx ) " @@ -522,9 +523,10 @@ onMounted(async () => { @click=" onClickDownloadFile( formData.id, - 'ยกเลิก' + formData.leaveSubTypeName - ? formData.leaveSubTypeName - : formData.leaveTypeName, + 'ยกเลิก' + + (formData.leaveSubTypeName + ? formData.leaveSubTypeName + : formData.leaveTypeName), typePdf ) " From f1e12f8b8d7a711f4d503cab092defbdc6c4f955 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 6 Jan 2026 10:23:56 +0700 Subject: [PATCH 2/6] fix(organization):show draft or current --- .../components/DialogHistoryPos.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue index 2acfd5cd7..4b9651bcf 100644 --- a/src/modules/02_organization/components/DialogHistoryPos.vue +++ b/src/modules/02_organization/components/DialogHistoryPos.vue @@ -154,7 +154,7 @@ const baseColumns = ref([ field: "lastUpdatedAt", sortable: false, format(val) { - return date2Thai(val); + return date2Thai(val, true, true); }, headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -265,15 +265,17 @@ watch(
{{ - store.typeOrganizational === "current" || - (store.typeOrganizational === "draft" && - historyType === "OWNER_HISTORY") + historyType === "OWNER_HISTORY" ? props.rowIndex + 1 - : props.rowIndex + 1 == 1 + : props.rowIndex + 1 == 1 && + (store.typeOrganizational === "draft" || + store.typeOrganizational === "old") ? "1 (แบบร่าง)" - : props.rowIndex + 1 == 2 + : props.rowIndex + 1 == 2 && + (store.typeOrganizational === "draft" || + store.typeOrganizational === "old") ? "2 (ปัจจุบัน)" - : props.rowIndex + 1 + : props.rowIndex + 1 }}
From 02ac2c75941a25d91a491a0eca36f59449031797 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 6 Jan 2026 16:37:43 +0700 Subject: [PATCH 3/6] fix(resign):Check _Permission_Update --- .../06_retirement/components/02_resign/ResignByid.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue index df0a14c49..f29f64217 100644 --- a/src/modules/06_retirement/components/02_resign/ResignByid.vue +++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue @@ -10,6 +10,7 @@ import genReport from "@/plugins/genreport"; import { useCounterMixin } from "@/stores/mixin"; import { useRoleWorkflowDataStore } from "@/stores/roleWorkflow"; import { useRetirementDataStore } from "@/modules/06_retirement/store/Main"; +import { checkPermission } from "@/utils/permissions"; import DialogHeader from "@/components/DialogHeader.vue"; @@ -766,7 +767,13 @@ onMounted(async () => {
ข้อมูลการลาออก
-
+
Date: Tue, 6 Jan 2026 16:53:20 +0700 Subject: [PATCH 4/6] fix:Permission_Update --- .../06_retirement/components/03_resignEmp/ResignByid.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue index f51b5f56b..9383118c8 100644 --- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue +++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue @@ -10,6 +10,7 @@ import genReport from "@/plugins/genreport"; import { useCounterMixin } from "@/stores/mixin"; import { useRetirementDataStore } from "@/modules/06_retirement/store/Main"; import { useRoleWorkflowDataStore } from "@/stores/roleWorkflow"; +import { checkPermission } from "@/utils/permissions"; import type { TypeFile, @@ -794,7 +795,13 @@ onMounted(async () => {
ข้อมูลการลาออก
-
+
Date: Wed, 7 Jan 2026 09:36:34 +0700 Subject: [PATCH 5/6] fix(resign-employee):permission _update --- .../components/03_resignEmp/ResignReject.vue | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue index 76cbe2a2b..4221aaaee 100644 --- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue +++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue @@ -10,6 +10,7 @@ import { useCounterMixin } from "@/stores/mixin"; import DialogHeader from "@/components/DialogHeader.vue"; import { useRetirementDataStore } from "@/modules/06_retirement/store/Main"; import { useRoleWorkflowDataStore } from "@/stores/roleWorkflow"; +import { checkPermission } from "@/utils/permissions"; import type { QTableProps } from "quasar"; import type { DataProfile } from "@/modules/05_placement/interface/index/Main"; @@ -507,7 +508,12 @@ onMounted(async () => { ผลการพิจารณาของผู้บังคับบัญชา
{ dataDetail.statusMain === 'CANCELING' && props.row.approveStatus == 'PENDING' && props.row.comment == '' && - approveStep === 'st2' + approveStep === 'st2' && + checkPermission($route)?.attrIsUpdate " > {
{ rowsApprover.approvers && rowsApprover.approvers[0]?.profileId == keycloakId && rowsApprover.approvers[0]?.approveStatus == 'PENDING' && - approveStep === 'st3' + approveStep === 'st3' && + checkPermission($route)?.attrIsUpdate " > { { !checkRoutePermisson && (dataDetail.status === 'APPROVE' || dataDetail.status === 'REJECT') && - isStaff + isStaff && + checkPermission($route)?.attrIsUpdate " >
From 8b6d581ddf85dc371c363bc49167a40772baddf0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 7 Jan 2026 17:21:41 +0700 Subject: [PATCH 6/6] fix:orgTreeDnaId --- src/modules/09_leave/views/06_ReportMain.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue index 2034622be..2f1fca1c3 100644 --- a/src/modules/09_leave/views/06_ReportMain.vue +++ b/src/modules/09_leave/views/06_ReportMain.vue @@ -112,6 +112,7 @@ const nodeId = ref(""); const nodeLevel = ref(0); const node = ref([]); const expanded = ref([]); +const orgTreeDnaId = ref(""); /** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/ async function fetchDataTree() { @@ -135,6 +136,7 @@ function onSelectedNode(data: any) { nodeId.value = data.orgTreeId; nodeLevel.value = data.orgLevel; expandedModal.value = false; + orgTreeDnaId.value = data.orgTreeDnaId; updateLeaveday(); } @@ -219,6 +221,7 @@ async function fetchLeaveday( startDate: Date, endDate: Date ) { + const nodeIdVal = typeReport.value === 3 ? orgTreeDnaId.value : nodeId.value; const body = { type: year === "FULL" @@ -232,7 +235,7 @@ async function fetchLeaveday( : "WEEKLY", startDate: dateToISO(startDate), endDate: dateToISO(endDate), - nodeId: nodeId.value, + nodeId: nodeIdVal, node: nodeLevel.value, }; @@ -334,6 +337,7 @@ function filterOption(val: string, update: any, typeOp: string) { function clearData() { nodeId.value = ""; nodeLevel.value = 0; + orgTreeDnaId.value = ""; org.value = ""; typeReport.value = null; yearType.value = "FULL"; @@ -410,7 +414,7 @@ function getReport() { : "WEEKLY", startDate: dateToISO(dateStart.value), endDate: dateToISO(dateEnd.value), - nodeId: nodeId.value, + nodeId: orgTreeDnaId.value, node: nodeLevel.value, }; http