diff --git a/frontend/src/pages/Roster.tsx b/frontend/src/pages/Roster.tsx index b01cbf9..788e1e8 100644 --- a/frontend/src/pages/Roster.tsx +++ b/frontend/src/pages/Roster.tsx @@ -841,100 +841,104 @@ export default function Roster() { } {e.status === 'ACTIVE' && (!e.hasTermination || e.latestTerminationStatus === 'CANCELLED' || e.latestTerminationStatus === 'COMPLETED') && ( -
- - {/* 试用期员工显示转正按钮 */} - {e.probationInfo?.isProbation && ( +
+
- )} - - - - + {/* 试用期员工显示转正按钮 */} + {e.probationInfo?.isProbation && ( + + )} + +
+
+ + + +
)} {e.hasTermination && e.status === 'ACTIVE' && e.latestTerminationStatus !== 'CANCELLED' && e.latestTerminationStatus !== 'COMPLETED' && (