From 4fe6e23de80225138ee6bd51a51fd9a6e5c7b6c9 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 11 Jun 2025 14:33:21 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20path=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=94=E0=B8=82=E0=B8=AD=E0=B8=A5=E0=B8=B2=E0=B8=AD?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9C=E0=B8=A5=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B8=88=E0=B8=B2=E0=B8=A3=E0=B8=93=E0=B8=B2=E0=B8=81=E0=B8=A3?= =?UTF-8?q?=E0=B8=93=E0=B8=B5=E0=B8=82=E0=B8=AD=E0=B8=A1=E0=B8=B5=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5=E0=B8=B4?= =?UTF-8?q?=E0=B8=81=E0=B8=82=E0=B8=AD=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD?= =?UTF-8?q?=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leave/api.leave.ts | 10 +- src/modules/03_retire/interface/Main.ts | 2 + src/modules/03_retire/views/addRetire.vue | 419 +++++++++++++++------- 3 files changed, 298 insertions(+), 133 deletions(-) diff --git a/src/api/leave/api.leave.ts b/src/api/leave/api.leave.ts index 8c2b537..6101b03 100644 --- a/src/api/leave/api.leave.ts +++ b/src/api/leave/api.leave.ts @@ -6,16 +6,18 @@ const holiday = `${env.API_URI}/metadata/holiday/`; export default { listUser: () => `${retirementResign}/resign/user`, - listUserByType:(type:string) => `${retirementResign}/resign${type}/user`, + listUserByType: (type: string) => `${retirementResign}/resign${type}/user`, listResign: () => `${retirementResign}/resign`, - listResignByType: (type:string) => `${retirementResign}/resign${type}`, + listResignByType: (type: string) => `${retirementResign}/resign${type}`, resingByid: (id: string) => `${retirementResign}/resign/${id}`, - resingByidType: (type:string,id: string) => `${retirementResign}/resign${type}/${id}`, + resingByidType: (type: string, id: string) => + `${retirementResign}/resign${type}/user/${id}`, questionnaireByid: (id: string) => `${retirementResign}/resign/questionnaire/${id}`, listquestionnaire: () => `${retirementResign}/resign/questionnaire`, cancelResign: (id: string) => `${retirementResign}/resign/cancel/${id}`, - cancelResignByType: (type:string,id: string) => `${retirementResign}/resign${type}/cancel/${id}`, + cancelResignByType: (type: string, id: string) => + `${retirementResign}/resign${type}/cancel/${id}`, // คำถาม questionList: () => `${retirementResign}/resign/questionnaire/question`, diff --git a/src/modules/03_retire/interface/Main.ts b/src/modules/03_retire/interface/Main.ts index 1bb3486..28b5f01 100644 --- a/src/modules/03_retire/interface/Main.ts +++ b/src/modules/03_retire/interface/Main.ts @@ -62,6 +62,8 @@ interface DataOptions { interface RowsType { commanders: SeqTypeRow[]; approvers: SeqTypeRow[]; + cancelCommanders: SeqTypeRow[] | null; + cancelApprovers: SeqTypeRow[] | null; } interface SeqTypeRow { seq: number; diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index 2e82e3b..c6c3a6c 100644 --- a/src/modules/03_retire/views/addRetire.vue +++ b/src/modules/03_retire/views/addRetire.vue @@ -144,19 +144,6 @@ const columnsCommanders = ref([ }, ]); -/** - * ฟังก์ชั่นเปลี่ยนเป็น string ของ status - * @param val value ของ status true/false - */ -function statusOrder(val: boolean) { - switch (val) { - case true: - return "ยับยั้ง"; - case false: - return "อนุญาต"; - } -} - /** * บันทึกข้อมูลการลาออก */ @@ -233,6 +220,8 @@ async function fectDataresign(id: string) { rowsApprover.value = { commanders: data.commanders, approvers: data.approvers, + cancelCommanders: data.cancelCommanders ?? null, + cancelApprovers: data.cancelApprovers ?? null, }; files.value = data.docs; dataDetail.value = data; @@ -398,6 +387,7 @@ onMounted(async () => { ? 'col-md-3 col-xs-12' : 'col-md-3 col-xs-12 inputgreen' " + menu-class-name="modalfix" v-model="dateLeave" :locale="'th'" autoApply @@ -585,137 +575,308 @@ onMounted(async () => { --> - -
- -
-
- ผลการพิจารณาของผู้บังคับบัญชา -
-
- -
- - - - +
+
+
+ วันสุดท้ายที่ยับยั้ง +
+
+ {{ + rowsApprover && + rowsApprover.approvers && + rowsApprover.approvers[0]?.rejectDate + ? date2Thai( + rowsApprover?.approvers[0].rejectDate + ) + : "-" + }} +
+
+
+
+ ความคิดเห็นและเหตุผล +
+
+ {{ + rowsApprover && + rowsApprover.approvers && + rowsApprover.approvers[0]?.comment + ? rowsApprover?.approvers[0].comment + : "-" + }} +
+
+
+ + - + - -
- -
-
- ผลการพิจารณาของผู้มีอำนาจ -
+ +
+
+ ผลการพิจารณาการขอยกเลิกลาออก +
+ +
+ +
+ +
+
+ ผลการพิจารณาของผู้บังคับบัญชา +
+
+ +
+ + + + +
+
- -
-
-
-
ชื่อ - นามสกุล
-
- {{ - rowsApprover && - rowsApprover.approvers && - rowsApprover.approvers[0]?.firstName - ? `${rowsApprover?.approvers[0].prefix}${rowsApprover?.approvers[0].firstName} ${rowsApprover?.approvers[0].lastName}` - : "-" - }} + + +
+ +
+
+ ผลการพิจารณาของผู้มีอำนาจ
-
-
สถานะ
-
- {{ - rowsApprover && - rowsApprover.approvers && - rowsApprover.approvers[0]?.approveStatus - ? convertStatusText( - rowsApprover?.approvers[0].approveStatus - ) - : "-" - }} + +
+
+
+
ชื่อ - นามสกุล
+
+ {{ + rowsApprover && + rowsApprover.cancelApprovers && + rowsApprover.cancelApprovers[0]?.firstName + ? `${rowsApprover?.cancelApprovers[0].prefix}${rowsApprover?.cancelApprovers[0].firstName} ${rowsApprover?.cancelApprovers[0].lastName}` + : "-" + }} +
+
+
+
สถานะ
+
+ {{ + rowsApprover && + rowsApprover.cancelApprovers && + rowsApprover.cancelApprovers[0]?.approveStatus + ? convertStatusText( + rowsApprover?.cancelApprovers[0] + .approveStatus + ) + : "-" + }} +
+
+
+
+ วันสุดท้ายที่ยับยั้ง +
+
+ {{ + rowsApprover && + rowsApprover.cancelApprovers && + rowsApprover.cancelApprovers[0]?.rejectDate + ? date2Thai( + rowsApprover?.cancelApprovers[0].rejectDate + ) + : "-" + }} +
+
+
+
+ ความคิดเห็นและเหตุผล +
+
+ {{ + rowsApprover && + rowsApprover.cancelApprovers && + rowsApprover.cancelApprovers[0]?.comment + ? rowsApprover?.cancelApprovers[0].comment + : "-" + }} +
+
-
-
วันสุดท้ายที่ยับยั้ง
-
- {{ - rowsApprover && - rowsApprover.approvers && - rowsApprover.approvers[0]?.rejectDate - ? date2Thai(rowsApprover?.approvers[0].rejectDate) - : "-" - }} -
-
-
-
ความคิดเห็นและเหตุผล
-
- {{ - rowsApprover && - rowsApprover.approvers && - rowsApprover.approvers[0]?.comment - ? rowsApprover?.approvers[0].comment - : "-" - }} -
-
-
+
- +