hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-08 09:02:21 +07:00
commit 7897369ffe
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue
View file

@ -453,7 +453,7 @@ watch(
}}
</div>
<div v-else-if="col.name === 'posNo'">
{{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
{{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
</div>
<div v-else-if="col.name === 'fullName'">
{{

2
src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
View file

@ -464,7 +464,7 @@ watch(
}}
</div>
<div v-else-if="col.name === 'posNo'">
{{ `${props.row.orgShortName}${props.row.posMasterNo}` }}
{{ `${props.row.orgShortName} ${props.row.posMasterNo}` }}
</div>
<div v-else-if="col.name === 'fullName'">
{{