From 10e3cda626e7968e6a48deac7a21412d89ca36e3 Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Tue, 30 Jul 2024 16:49:17 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=A2=E0=B8=81=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_leave/components/ListView.vue | 20 +++++++++++++++++-- .../formDetail/06_OrdinationForm.vue | 2 +- .../components/formDetail/07_HajjForm.vue | 2 +- .../05_leave/interface/response/leave.ts | 2 ++ src/modules/05_leave/store.ts | 1 + 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue index 08aba27..8eb1073 100644 --- a/src/modules/05_leave/components/ListView.vue +++ b/src/modules/05_leave/components/ListView.vue @@ -158,12 +158,28 @@ async function updatePagination(p: number, ps: number) { await fetchDataTable(); } +function convert(val: any) { + if (leaveType.value) { + const filtertype = leaveType.value.find( + (e: any) => e.id === val.leaveTypeId + ); + const type = filtertype?.code; + if (type == "LV-006" && val.hajjDayStatus == false) { + return "ลาอุปสมบท"; + } else if (type == "LV-006" && val.hajjDayStatus == true) { + return "ลาประกอบพิธีฮัจญ์"; + } else { + return val.leaveTypeName; + } + } +} + /** * เรียกฟังก์ชันทั้งหมดตอนเรียกใช้ไฟล์นี้ */ onMounted(async () => { - await fetchDataTable(); await fectOptionType(); + await fetchDataTable(); });