From a44f9cf998977c86ae0717f46a37e74da8958238 Mon Sep 17 00:00:00 2001
From: zhongjin <zhongjin@onenetcom.cn>
Date: Mon, 8 May 2023 13:07:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'src/client/src/orangehrmP?=
 =?UTF-8?q?imPlugin/pages/employee/Employee.vue'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orangehrmPimPlugin/pages/employee/Employee.vue   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/client/src/orangehrmPimPlugin/pages/employee/Employee.vue b/src/client/src/orangehrmPimPlugin/pages/employee/Employee.vue
index b4487fc..03b606e 100644
--- a/src/client/src/orangehrmPimPlugin/pages/employee/Employee.vue
+++ b/src/client/src/orangehrmPimPlugin/pages/employee/Employee.vue
@@ -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'),