From 91aaf058fb07682f8682b25e31ece337d652c4e9 Mon Sep 17 00:00:00 2001 From: pqhuy1987 Date: Tue, 16 Jun 2026 14:20:23 +0700 Subject: [PATCH] =?UTF-8?q?[CLAUDE]=20FE:=20H=E1=BB=93=20s=C6=A1=20NS=20?= =?UTF-8?q?=E2=80=94=20list=20pane=20flex-row=20g=E1=BB=8Dn=20(h=E1=BA=BFt?= =?UTF-8?q?=20tr=C3=A0n=20ngang=20rail)=20+=20=C4=91=E1=BB=93ng=20nh?= =?UTF-8?q?=E1=BA=A5t=20c=E1=BB=A1=20ch=E1=BB=AF=20(x2=20app=20SHA256)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.8 (1M context) --- fe-admin/src/pages/hrm/EmployeesListPage.tsx | 76 +++++++++----------- fe-user/src/pages/hrm/EmployeesListPage.tsx | 76 +++++++++----------- 2 files changed, 66 insertions(+), 86 deletions(-) diff --git a/fe-admin/src/pages/hrm/EmployeesListPage.tsx b/fe-admin/src/pages/hrm/EmployeesListPage.tsx index d445f2a..74bb43e 100644 --- a/fe-admin/src/pages/hrm/EmployeesListPage.tsx +++ b/fe-admin/src/pages/hrm/EmployeesListPage.tsx @@ -241,7 +241,7 @@ export function EmployeesListPage() {
-

Hồ sơ Nhân sự

+

Hồ sơ Nhân sự

{selectedDeptName ? `Phòng: ${selectedDeptName}` : 'Tất cả phòng ban'} {' · '} @@ -297,8 +297,8 @@ export function EmployeesListPage() { )} - {/* list table */} -

+ {/* list — compact flex rows (KHÔNG bảng 3 cột → không tràn ngang rail hẹp) */} +
{list.isLoading ? (
Đang tải…
) : !list.data || list.data.items.length === 0 ? ( @@ -308,44 +308,34 @@ export function EmployeesListPage() { description="Đổi bộ lọc, hoặc bấm 'Tạo mới' để thêm hồ sơ nhân viên." /> ) : ( - - - - - - - - - - {list.data.items.map(e => { - const active = selectedId === e.id - return ( - setParam('id', e.id)} - className={cn( - 'cursor-pointer border-b border-slate-100 transition last:border-0 hover:bg-slate-50', - active && 'bg-brand-50 hover:bg-brand-50', - )} - > - - - - - ) - })} - -
Nhân viênPhòng banTrạng thái
-
- -
-
{e.fullName ?? '—'}
-
{e.employeeCode}
-
-
-
{e.departmentName ?? '—'} - -
+
+ {list.data.items.map(e => { + const active = selectedId === e.id + return ( + + ) + })} +
)}
@@ -654,13 +644,13 @@ function EmployeeDetailTabs({ detail, onDelete }: { detail: EmployeeDetail; onDe
{initials(detail.fullName)}
-

{detail.fullName ?? '—'}

+

{detail.fullName ?? '—'}

{detail.employeeCode} {detail.departmentName && (<>{detail.departmentName})} diff --git a/fe-user/src/pages/hrm/EmployeesListPage.tsx b/fe-user/src/pages/hrm/EmployeesListPage.tsx index d445f2a..74bb43e 100644 --- a/fe-user/src/pages/hrm/EmployeesListPage.tsx +++ b/fe-user/src/pages/hrm/EmployeesListPage.tsx @@ -241,7 +241,7 @@ export function EmployeesListPage() {
-

Hồ sơ Nhân sự

+

Hồ sơ Nhân sự

{selectedDeptName ? `Phòng: ${selectedDeptName}` : 'Tất cả phòng ban'} {' · '} @@ -297,8 +297,8 @@ export function EmployeesListPage() { )} - {/* list table */} -

+ {/* list — compact flex rows (KHÔNG bảng 3 cột → không tràn ngang rail hẹp) */} +
{list.isLoading ? (
Đang tải…
) : !list.data || list.data.items.length === 0 ? ( @@ -308,44 +308,34 @@ export function EmployeesListPage() { description="Đổi bộ lọc, hoặc bấm 'Tạo mới' để thêm hồ sơ nhân viên." /> ) : ( - - - - - - - - - - {list.data.items.map(e => { - const active = selectedId === e.id - return ( - setParam('id', e.id)} - className={cn( - 'cursor-pointer border-b border-slate-100 transition last:border-0 hover:bg-slate-50', - active && 'bg-brand-50 hover:bg-brand-50', - )} - > - - - - - ) - })} - -
Nhân viênPhòng banTrạng thái
-
- -
-
{e.fullName ?? '—'}
-
{e.employeeCode}
-
-
-
{e.departmentName ?? '—'} - -
+
+ {list.data.items.map(e => { + const active = selectedId === e.id + return ( + + ) + })} +
)}
@@ -654,13 +644,13 @@ function EmployeeDetailTabs({ detail, onDelete }: { detail: EmployeeDetail; onDe
{initials(detail.fullName)}
-

{detail.fullName ?? '—'}

+

{detail.fullName ?? '—'}

{detail.employeeCode} {detail.departmentName && (<>{detail.departmentName})}