优化: 重新入职弹窗对齐+花名册增加离职日期列
1. 重新入职弹窗:移除孕期/医疗期/工伤,缺省日期=今天,合同双向计算,试用期校验 2. 花名册列表增加「离职日期」列:已离职显示日期,待离职显示预计日期(amber) 3. 后端 rehireEmployee 重置特殊状态为 false
This commit is contained in:
@@ -112,6 +112,7 @@ export default function Roster() {
|
||||
<th className="py-2 px-3 text-left">部门</th>
|
||||
<th className="py-2 px-3 text-left">状态</th>
|
||||
<th className="py-2 px-3 text-left">入职日期</th>
|
||||
<th className="py-2 px-3 text-left">离职日期</th>
|
||||
<th className="py-2 px-3 text-right">月薪</th>
|
||||
<th className="py-2 px-3 text-left">合同状态</th>
|
||||
<th className="py-2 px-3 text-center">违纪</th>
|
||||
@@ -137,6 +138,16 @@ export default function Roster() {
|
||||
</span>
|
||||
</td>
|
||||
<td className="py-2 px-3 text-gray-500">{e.hireDate?.toString().slice(0, 10)}</td>
|
||||
<td className="py-2 px-3 text-gray-500">
|
||||
{e.hasTermination && e.latestTerminationDate ? (
|
||||
<span className={e.status === 'RESIGNED' ? 'text-gray-500' : 'text-amber-600'}>
|
||||
{e.latestTerminationDate.toString().slice(0, 10)}
|
||||
{e.status === 'ACTIVE' && ' (预计)'}
|
||||
</span>
|
||||
) : (
|
||||
<span className="text-gray-300">—</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-2 px-3 text-right">¥{fmt(e.monthlySalary)}</td>
|
||||
<td className="py-2 px-3">
|
||||
{(() => {
|
||||
|
||||
Reference in New Issue
Block a user