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

11
src/modules/06_retirement/components/01_retirement/AddList.vue
View file

@ -82,28 +82,28 @@ function findOrgChildName(obj: any) {
if (obj) {
let name =
obj.orgChild4Name != null && obj.orgChild3Name != null
? obj.orgChild4Name + "/"
? obj.orgChild4Name + " "
: obj.orgChild4Name != null
? obj.orgChild4Name
: "";
name +=
obj.orgChild3Name != null && obj.orgChild2Name != null
? obj.orgChild3Name + "/"
? obj.orgChild3Name + " "
: obj.orgChild3Name !== null
? obj.orgChild3Name
: "";
name +=
obj.orgChild2Name != null && obj.orgChild1Name != null
? obj.orgChild2Name + "/"
? obj.orgChild2Name + " "
: obj.orgChild2Name != null
? obj.orgChild2Name
: "";
name +=
obj.orgChild1Name != null && obj.orgRootName != null
? obj.orgChild1Name + "/"
? obj.orgChild1Name + " "
: obj.orgChild1Name != null
? obj.orgChild1Name
: "";
@ -337,7 +337,8 @@ watch(modal, () => {
ทั้งหมด {{ totalList }} รายการ
<q-pagination
v-model="formPagePersonList.page"
color="primary"
active-color="primary"
color="dark"
:max="maxPage"
:max-pages="5"
size="sm"