diff --git a/backend/src/services/contract.service.ts b/backend/src/services/contract.service.ts index de7f813..d0e7702 100644 --- a/backend/src/services/contract.service.ts +++ b/backend/src/services/contract.service.ts @@ -232,6 +232,7 @@ export async function rehireEmployee(orgId: string, userId: string, id: string, data: { hireDate: newHireDate, status: 'ACTIVE', + department: data.department || employee.department, isPregnant: false, isInMedicalPeriod: false, isWorkInjured: false, diff --git a/frontend/src/pages/Roster.tsx b/frontend/src/pages/Roster.tsx index 93dcc40..9b8df84 100644 --- a/frontend/src/pages/Roster.tsx +++ b/frontend/src/pages/Roster.tsx @@ -809,6 +809,7 @@ function RehireModal({ employee, onClose, onSubmit, loading, error }: { })() const [form, setForm] = useState({ hireDate: todayStr, + department: employee.department || '', contractType: 'FIXED' as 'FIXED' | 'UNFIXED' | 'UNSIGNED', signDate: '', startDate: todayStr, @@ -908,6 +909,7 @@ function RehireModal({ employee, onClose, onSubmit, loading, error }: { const handleSubmit = () => { const data: any = { hireDate: new Date(form.hireDate).toISOString(), + department: form.department, } if (form.contractType !== 'UNSIGNED' && form.startDate) { data.contract = { @@ -939,8 +941,8 @@ function RehireModal({ employee, onClose, onSubmit, loading, error }: {
{employee.name}
- -
{employee.department}
+ + setForm({ ...form, department: e.target.value })} placeholder="如:技术部" />