Merge branch 'develop' into dev

2026-01-30 09:41:43 +07:00 · 2026-01-30 09:41:43 +07:00 · 00304b3bc8
commit 00304b3bc8
parent 9c9fb561b5 6280ab2e17
1 changed files with 6 additions and 4 deletions
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@ -166,10 +166,11 @@ const commanderList = computed(() => {

 // เช็คว่าผู้ใช้มีสิทธิ์อนุมัติหรือไม่
 const approveCheck = computed(() => {
+  const commanders = rows.value?.commanders;
  return (
-    rows.value?.commanders?.every(
-      (commander) => commander.approveStatus === "APPROVE"
-    ) ?? false
+    Array.isArray(commanders) &&
+    commanders.length > 0 &&
+    commanders.every((commander) => commander.approveStatus === "APPROVE")
  );
 });

@ -1073,7 +1074,8 @@ onMounted(async () => {
                      rows &&
                      rows.approvers[0]?.profileId == keycloakId &&
                      rows.approvers[0]?.approveStatus == 'PENDING' &&
-                      approveCheck
+                      approveCheck &&
+                      statusCheck === 'PENDING'
                    "
                  >
                    <q-btn