From 8674269934246d84e16ab35eac70506726673dbb Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 2 Oct 2025 17:25:20 +0700 Subject: [PATCH] feat(retirement): add Page retire-old --- src/api/06_retirement/api.retirement.ts | 2 + .../06_retirement/interface/request/Main.ts | 15 +- .../06_retirement/interface/response/Main.ts | 32 +- src/modules/06_retirement/router.ts | 15 +- .../06_retirement/views/09_retirementOld.vue | 372 ++++++++++++++++++ 5 files changed, 432 insertions(+), 4 deletions(-) create mode 100644 src/modules/06_retirement/views/09_retirementOld.vue diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index fd0149446..d0991a12f 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -108,4 +108,6 @@ export default { // แก้ไขข้อมูลการลาออก updateResign: (path: string, id: string) => `${retirement}/${path}/admin-update/resign-info/${id}`, + + exRetirement: `${env.API_URI}/org/ex/retirement`, }; diff --git a/src/modules/06_retirement/interface/request/Main.ts b/src/modules/06_retirement/interface/request/Main.ts index d0c05ec40..b4a6e3d88 100644 --- a/src/modules/06_retirement/interface/request/Main.ts +++ b/src/modules/06_retirement/interface/request/Main.ts @@ -20,4 +20,17 @@ interface QuestionDesc { question10Desc: string; } -export type { OptionQuestions, OptionQuestions2,QuestionDesc }; +interface FilterRetirementOld { + type: string; + retireYear: number; + citizenID: string; + firstNameTH: string; + lastNameTH: string; +} + +export type { + OptionQuestions, + OptionQuestions2, + QuestionDesc, + FilterRetirementOld, +}; diff --git a/src/modules/06_retirement/interface/response/Main.ts b/src/modules/06_retirement/interface/response/Main.ts index 758fbb842..4e7c72bb4 100644 --- a/src/modules/06_retirement/interface/response/Main.ts +++ b/src/modules/06_retirement/interface/response/Main.ts @@ -68,7 +68,33 @@ interface SeqTypeRow { keycloakId: string; approveStatus: string; comment: string; - rejectDate: Date|null; + rejectDate: Date | null; +} + +interface RetirementOld { + dataRecords: DataRecords[]; + rowPerPage: number; + startRecord: number; + totalRecords: number; +} + +interface DataRecords { + citizenID: string; + firstNameTH: string; + lastNameTH: string; + organizeID: string; + organizeNameTH: string; + positionID: string; + positionLevelID: string; + positionLevelNameTH: string; + positionNameTH: string; + positionTypeID: string; + positionTypeNameTH: string; + recordRow: number; + retireDate: string; + retireTypeID: string; + retireTypeNameTH: string; + retireYear: string; } export type { @@ -79,5 +105,7 @@ export type { FileList, CheckBoxType, RowsType, - SeqTypeRow + SeqTypeRow, + RetirementOld, + DataRecords, }; diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts index 5ad3f78fc..4e8a35b82 100644 --- a/src/modules/06_retirement/router.ts +++ b/src/modules/06_retirement/router.ts @@ -66,9 +66,11 @@ const outDetailOnlyEmp = () => import("@/modules/06_retirement/components/06_dismissOrder/DetailEMP.vue"); /** รายงาน*/ - const ReportView = () => import("@/modules/06_retirement/views/07_report.vue"); +const RetirementOld = () => + import("@/modules/06_retirement/views/09_retirementOld.vue"); + export default [ { path: "/retirement", @@ -356,4 +358,15 @@ export default [ Role: "STAFF", }, }, + + { + path: "retire-old", + name: "retireOld", + component: RetirementOld, + meta: { + Auth: true, + Key: "SYS_RETIRE_OLD", + Role: "STAFF", + }, + }, ]; diff --git a/src/modules/06_retirement/views/09_retirementOld.vue b/src/modules/06_retirement/views/09_retirementOld.vue new file mode 100644 index 000000000..86d12d699 --- /dev/null +++ b/src/modules/06_retirement/views/09_retirementOld.vue @@ -0,0 +1,372 @@ + + + + +