diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue index 3b775ae30..be9751a64 100644 --- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue +++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue @@ -167,8 +167,10 @@ const commanderList = computed(() => { // เช็คว่าผู้ใช้มีสิทธิ์อนุมัติหรือไม่ const approveCheck = computed(() => { const commanders = rows.value?.commanders; - return Array.isArray(commanders) && commanders.length > 0 && commanders.every( - (commander) => commander.approveStatus === "APPROVE" + return ( + Array.isArray(commanders) && + commanders.length > 0 && + commanders.every((commander) => commander.approveStatus === "APPROVE") ); }); @@ -1072,7 +1074,8 @@ onMounted(async () => { rows && rows.approvers[0]?.profileId == keycloakId && rows.approvers[0]?.approveStatus == 'PENDING' && - approveCheck + approveCheck && + statusCheck === 'PENDING' " >