diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue index 5ed3618..fa3c763 100644 --- a/src/modules/05_leave/views/Main.vue +++ b/src/modules/05_leave/views/Main.vue @@ -135,10 +135,16 @@ async function fetchStatsTable() { : el.leaveTypeName === "ลากิจส่วนตัว" ? "text-deep-purple" : "text-indigo", - value: el.leavePercent, - all: el.leaveLimit, + value: + (Number(el.leaveCountApprove) / + (Number(el.leaveLimit) + Number(el.leaveExtend))) * + 100, + all: Number(el.leaveLimit) + Number(el.leaveExtend), use: el.leaveCountApprove, - remain: Number(el.leaveLimit) - Number(el.leaveCountApprove), + remain: + Number(el.leaveLimit) + + Number(el.leaveExtend) - + Number(el.leaveCountApprove), })); }); stat.forEach((item) => itemPie.value.push(...item));