From dad43931cf830f58fde934cf672beb3fd31593f5 Mon Sep 17 00:00:00 2001
From: freedakgmail <freedak.gemini@gmail.com>
Date: Thu, 23 Jul 2026 18:30:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=85=A5=E8=81=8C=E5=BC=B9=E7=AA=97=E5=AF=B9=E9=BD=90+?=
 =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E5=A2=9E=E5=8A=A0=E7=A6=BB=E8=81=8C?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 重新入职弹窗：移除孕期/医疗期/工伤，缺省日期=今天，合同双向计算，试用期校验
2. 花名册列表增加「离职日期」列：已离职显示日期，待离职显示预计日期(amber)
3. 后端 rehireEmployee 重置特殊状态为 false
---
 frontend/src/pages/Roster.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frontend/src/pages/Roster.tsx b/frontend/src/pages/Roster.tsx
index 7fd7703..7648f57 100644
--- a/frontend/src/pages/Roster.tsx
+++ b/frontend/src/pages/Roster.tsx
@@ -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">
                       {(() => {