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

fix bug

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-07-11 13:17:08 +07:00
parent ec04bc2e1e
commit 3ffe9b367e
5 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/06_retirement/components/ListRetirement/AddList.vue
View file

@ -135,8 +135,8 @@ const totalList = ref<number>(0);
// fecth profile
const fecthProfile = async () => {
showLoader();
if (props?.dataProfile?.type === "OFFICER") {
showLoader();
formPagePersonList.keyword =
formPagePersonList.keyword === null ? "" : formPagePersonList.keyword;
await http
@ -154,7 +154,9 @@ const fecthProfile = async () => {
fullname: e.prefix + e.firstName + " " + e.lastName,
position: e.position,
level:
e.posTypeName && e.posLevelName ? e.posTypeName + " (" + e.posLevelName + ")" : "-",
e.posTypeName && e.posLevelName
? e.posTypeName + " (" + e.posLevelName + ")"
: "-",
organizationOrganization: findOrgChildName(e),
}));
})
@ -187,9 +189,7 @@ const fecthProfile = async () => {
fullname: e.prefix + e.firstName + " " + e.lastName,
position: e.position,
level:
e.posType && e.posLevel
? e.posType + " (" + e.posLevel + ")"
: "-",
e.posType && e.posLevel ? e.posType + " (" + e.posLevel + ")" : "-",
organizationOrganization: findOrgName(e),
}));
})

11
src/modules/06_retirement/components/ListRetirement/TableList.vue
View file

@ -636,12 +636,7 @@ function updatemodalPersonal(modal: boolean) {
}}{{ props.row.firstName ? props.row.firstName : "" }}
{{ props.row.lastName ? props.row.lastName : "" }}</q-td
>
<!-- <q-td
class="table_ellipsis"
key="organizationOrganization"
:props="props"
>{{ props.row.organizationOrganization }}</q-td
> -->
<q-td key="position" :props="props">{{
props.row.position ? props.row.position : "-"
}}</q-td>
@ -697,7 +692,7 @@ function updatemodalPersonal(modal: boolean) {
flat
round
color="primary"
icon="mdi-pencil"
:icon="props.row.remove === 'EDIT' ? 'info' : 'mdi-pencil'"
dense
@click.stop="
(modalNote = true),
@ -724,7 +719,7 @@ function updatemodalPersonal(modal: boolean) {
flat
round
class="text-red-14"
icon="mdi-delete"
:icon="props.row.remove === 'REMOVE' ? 'info' : 'mdi-delete'"
dense
@click.stop="
(modalNote = true),