Merge branch 'nice_dev' into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-03-04 18:07:00 +07:00
commit 314ba05073

View file

@ -326,6 +326,11 @@ watch(
? props.row.positionSalaryAmount.toLocaleString()
: ""
}}
{{
props.row.amountSpecial !== 0
? `(${props.row.amountSpecial.toLocaleString()})`
: ""
}}
</div>
<div v-else>
@ -389,7 +394,6 @@ watch(
direction-links
@update:model-value="updatePagePagination()"
></q-pagination>
</d-table>
<DialogAddPerson