Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-12-19 17:07:23 +07:00
commit 89ecb0c6d4

View file

@ -279,7 +279,9 @@ watch(
{{ props.row.organization }}
</div>
<div v-else-if="col.name === 'salary'">
{{ props.row.salary.toLocaleString() }}
{{
props.row.salary ? props.row.salary.toLocaleString() : "-"
}}
</div>
<div v-else-if="col.name === 'profileType'">
{{