Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m53s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m53s
This commit is contained in:
commit
00304b3bc8
1 changed files with 6 additions and 4 deletions
|
|
@ -166,10 +166,11 @@ const commanderList = computed(() => {
|
||||||
|
|
||||||
// เช็คว่าผู้ใช้มีสิทธิ์อนุมัติหรือไม่
|
// เช็คว่าผู้ใช้มีสิทธิ์อนุมัติหรือไม่
|
||||||
const approveCheck = computed(() => {
|
const approveCheck = computed(() => {
|
||||||
|
const commanders = rows.value?.commanders;
|
||||||
return (
|
return (
|
||||||
rows.value?.commanders?.every(
|
Array.isArray(commanders) &&
|
||||||
(commander) => commander.approveStatus === "APPROVE"
|
commanders.length > 0 &&
|
||||||
) ?? false
|
commanders.every((commander) => commander.approveStatus === "APPROVE")
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -1073,7 +1074,8 @@ onMounted(async () => {
|
||||||
rows &&
|
rows &&
|
||||||
rows.approvers[0]?.profileId == keycloakId &&
|
rows.approvers[0]?.profileId == keycloakId &&
|
||||||
rows.approvers[0]?.approveStatus == 'PENDING' &&
|
rows.approvers[0]?.approveStatus == 'PENDING' &&
|
||||||
approveCheck
|
approveCheck &&
|
||||||
|
statusCheck === 'PENDING'
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<q-btn
|
<q-btn
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue