diff --git a/frontend/src/pages/Roster.tsx b/frontend/src/pages/Roster.tsx index 1b99619..b3914e8 100644 --- a/frontend/src/pages/Roster.tsx +++ b/frontend/src/pages/Roster.tsx @@ -805,22 +805,24 @@ export default function Roster() { {colVisible('department') && {e.department}} {colVisible('status') && - - {e.status === 'ACTIVE' ? '在职' : e.status === 'PRE_HIRE' ? '预入职' : '离职'} - - {e.probationInfo?.isProbation && ( - + - 试用期{e.probationInfo.isExpiring ? `即将到期(${e.probationInfo.daysToConfirm}天)` : `剩${e.probationInfo.daysToConfirm}天`} + {e.status === 'ACTIVE' ? '在职' : e.status === 'PRE_HIRE' ? '预入职' : '离职'} - )} + {e.probationInfo?.isProbation && ( + + 试用期{e.probationInfo.isExpiring ? `即将到期(${e.probationInfo.daysToConfirm}天)` : `剩${e.probationInfo.daysToConfirm}天`} + + )} + } {colVisible('hireDate') && {e.hireDate?.toString().slice(0, 10)}}