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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-01-22 12:50:47 +07:00
commit 273861a379
5 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
View file

@ -464,10 +464,10 @@ function onClickViewInfo(type: string, id: string) {
-
</div>
{{
`${props.row.child4 ? props.row.child4 + "/" : ""}${
props.row.child3 ? props.row.child3 + "/" : ""
}${props.row.child2 ? props.row.child2 + "-" : ""}${
props.row.child1 ? props.row.child1 + "/" : ""
`${props.row.child4 ? props.row.child4 + " " : ""}${
props.row.child3 ? props.row.child3 + " " : ""
}${props.row.child2 ? props.row.child2 + " " : ""}${
props.row.child1 ? props.row.child1 + " " : ""
}${props.row.root ? props.row.root : ""}`
}}
</div>

8
src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
View file

@ -481,10 +481,10 @@ watch(
-
</div>
{{
`${props.row.child4 ? props.row.child4 + "/" : ""}${
props.row.child3 ? props.row.child3 + "/" : ""
}${props.row.child2 ? props.row.child2 + "-" : ""}${
props.row.child1 ? props.row.child1 + "/" : ""
`${props.row.child4 ? props.row.child4 + " " : ""}${
props.row.child3 ? props.row.child3 + " " : ""
}${props.row.child2 ? props.row.child2 + " " : ""}${
props.row.child1 ? props.row.child1 + " " : ""
}${props.row.root ? props.row.root : ""}`
}}
</div>