Merge branch 'devTee' into develop

This commit is contained in:
STW_TTTY\stwtt 2024-08-30 10:01:16 +07:00
commit 4c99f89437

View file

@ -207,10 +207,10 @@ function fetchProfile(id: string) {
})
.catch(() => {
profilePicture.value = avatar;
})
// .finally(() => {
// hideLoader();
// });
});
// .finally(() => {
// hideLoader();
// });
}
const reasonStatus = ref<boolean>(false);
@ -788,9 +788,11 @@ onMounted(async () => {
"
>
{{
`${formDetail?.prefix ? formDetail?.prefix : ""}${
formDetail?.firstName
} ${formDetail?.lastName} ${leaveReason}`
`${
formDetail.rank
? formDetail.rank
: formDetail.prefix ?? ""
} ${formDetail.firstName} ${formDetail.lastName}`
}}
</h2>
</div>