|
|
|
@ -144,7 +144,6 @@ import usei18n from '@/core/util/composable/usei18n';
|
|
|
|
|
const defaultSortOrder = {
|
|
|
|
|
'employee.employeeId': 'DEFAULT',
|
|
|
|
|
'employee.firstName': 'ASC',
|
|
|
|
|
'employee.lastName': 'DEFAULT',
|
|
|
|
|
'jobTitle.jobTitleName': 'DEFAULT',
|
|
|
|
|
'empStatus.name': 'DEFAULT',
|
|
|
|
|
'subunit.name': 'DEFAULT',
|
|
|
|
@ -178,10 +177,7 @@ export default {
|
|
|
|
|
return {
|
|
|
|
|
id: item.empNumber,
|
|
|
|
|
employeeId: item.employeeId,
|
|
|
|
|
firstAndMiddleName: `${item.firstName} ${item.middleName}`,
|
|
|
|
|
lastName:
|
|
|
|
|
item.lastName +
|
|
|
|
|
(item.terminationId ? ` ${$t('general.past_employee')}` : ''),
|
|
|
|
|
firstAndMiddleName: `${item.firstName}`,
|
|
|
|
|
jobTitle: item.jobTitle?.isDeleted
|
|
|
|
|
? item.jobTitle.title + $t('general.deleted')
|
|
|
|
|
: item.jobTitle?.title,
|
|
|
|
@ -296,12 +292,6 @@ export default {
|
|
|
|
|
sortField: 'employee.firstName',
|
|
|
|
|
style: {flex: 1},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: 'lastName',
|
|
|
|
|
title: this.$t('general.last_name'),
|
|
|
|
|
sortField: 'employee.lastName',
|
|
|
|
|
style: {flex: 1},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: 'jobTitle',
|
|
|
|
|
title: this.$t('general.job_title'),
|
|
|
|
|