feat: 20260815 系统优化 - 全部31项问题修复(P0×6+P1×14+P2×9+P3×2)

P0紧急修复(6项):
- 草稿保存完整恢复所有字段(含socialAvgWage)
- 补偿金批次从compensationBreakdown读取
- 违法解除风险确认UI
- 合同结束日期前后校验(前后端双保险)

P1高优先级(14项):
- 离职日期联动社保/公积金截止月(15号规则)
- 合规检查+工作交接改为软阻断(生成待办)
- 补偿月数(N/N+1/2N/自定义)+计算基数(近12月/合同/自定义)
- 解聘并入花名册操作栏(类型选择跳转向导)
- 合同续签开始日期自动推导(原合同结束日+1天)
- 年龄合规筛查(童工阻断/未成年工/退休警告)
- 编辑入职日期后状态联动(待入职↔在职)
- 转正移植到花名册操作栏+薪资回写
- 男职工无法选择三期

P2体验优化(9项):
- "劳动合同"调整为"用工关系"
- 费用结算新增剩余年假折算(300%日工资)
- 身份证号全域改为"证件号码"(前后端18个文件)
- 手机号查重
- 开具证明+合同续签移植到花名册操作栏
- 批量转正+批量开具证明
- 去掉用工办理模块

P3规划(2项):
- 组织架构+审批流(Department/Position/ApprovalFlow/ApprovalInstance)
- 客服工作台(Ticket/ChatSession+SUPPORT角色)

新增模型: Department/Position/ApprovalFlow/ApprovalInstance/Ticket/TicketMessage/ChatSession/ChatMessage
新增字段: Employee.departmentId/supervisorId
新增角色: SUPPORT

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>

frontend/package-lock.json

@@ -16,7 +16,7 @@
         "file-saver": "^2.0.5",
         "jspdf": "^4.2.1",
         "lucide-react": "^0.428.0",
-        "mammoth": "^1.12.0",
+        "mammoth": "^1.12.1",
         "qrcode.react": "^4.0.1",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
@@ -3348,9 +3348,9 @@
       }
     },
     "node_modules/mammoth": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmmirror.com/mammoth/-/mammoth-1.12.0.tgz",
-      "integrity": "sha512-cwnK1RIcRdDMi2HRx2EXGYlxqIEh0Oo3bLhorgnsVJi2UkbX1+jKxuBNR9PC5+JaX7EkmJxFPmo6mjLpqShI2w==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmmirror.com/mammoth/-/mammoth-1.12.1.tgz",
+      "integrity": "sha512-nCH9KKjWi3jQ+i8bUKs7k1yrXtSEGpWgF8IYkzsFMcbn+5S6l4bZEBbyx2hOQErFiXPuAs9RPa6qjXVxhyx/8g==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@xmldom/xmldom": "^0.8.6",

frontend/package.json

@@ -17,7 +17,7 @@
     "file-saver": "^2.0.5",
     "jspdf": "^4.2.1",
     "lucide-react": "^0.428.0",
-    "mammoth": "^1.12.0",
+    "mammoth": "^1.12.1",
     "qrcode.react": "^4.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

frontend/src/App.tsx

@@ -19,6 +19,8 @@ const Dashboard = lazy(() => import('./pages/Dashboard'))
 const Money = lazy(() => import('./pages/Money'))
 const SocialInsurance = lazy(() => import('./pages/SocialInsurance'))
 const Roster = lazy(() => import('./pages/Roster'))
+const OrgChart = lazy(() => import('./pages/OrgChart'))
+const SupportDashboard = lazy(() => import('./pages/support/SupportDashboard'))
 const Termination = lazy(() => import('./pages/Termination'))
 const AIAssistant = lazy(() => import('./pages/AIAssistant'))
 const Settings = lazy(() => import('./pages/Settings'))
@@ -185,6 +187,8 @@ export default function App() {
       {/* 管理端业务页面 */}
       <Route path="/" element={<ProtectedRoute><AdminLayout><Dashboard /></AdminLayout></ProtectedRoute>} />
       <Route path="/roster" element={<ProtectedRoute><AdminLayout><Roster /></AdminLayout></ProtectedRoute>} />
+      <Route path="/org-chart" element={<ProtectedRoute><AdminLayout><OrgChart /></AdminLayout></ProtectedRoute>} />
+      <Route path="/support" element={<ProtectedRoute><AdminLayout><SupportDashboard /></AdminLayout></ProtectedRoute>} />
       <Route path="/money" element={<ProtectedRoute><AdminLayout><Money /></AdminLayout></ProtectedRoute>} />
       <Route path="/social" element={<ProtectedRoute><AdminLayout><SocialInsurance /></AdminLayout></ProtectedRoute>} />
       <Route path="/termination" element={<ProtectedRoute><AdminLayout><Termination /></AdminLayout></ProtectedRoute>} />

frontend/src/components/HelpModal.tsx

@@ -139,13 +139,13 @@ const categories: HelpCategory[] = [
       {
         id: 'update-termination-cert',
         question: '修复：离职证明下载内容为乱码',
-        answer: '修复离职证明下载后打开为乱码的问题：\n• 使用 Word HTML 格式生成 .doc 文件，设置 charset=utf-8\n• 指定 SimSun（宋体）字体，确保中文正常显示\n• 离职证明内容包含：员工姓名、身份证号、入职日期、离职日期、企业名称等',
+        answer: '修复离职证明下载后打开为乱码的问题：\n• 使用 Word HTML 格式生成 .doc 文件，设置 charset=utf-8\n• 指定 SimSun（宋体）字体，确保中文正常显示\n• 离职证明内容包含：员工姓名、证件号码、入职日期、离职日期、企业名称等',
         tip: '路径：离职管理 → 已完成解聘 → 下载离职证明',
       },
       {
         id: 'update-attendance-template',
         question: '优化：考勤导入模板合并Sheet，减少重复录入',
-        answer: '考勤月度导入模板从多个Sheet合并为单Sheet：\n• 考勤记录和加班记录合并为「考勤与加班」一个Sheet\n• 不再需要分别填写考勤Sheet和加班Sheet\n• 导入时自动识别合并Sheet或独立Sheet，兼容旧模板\n• 减少重复录入姓名和身份证号',
+        answer: '考勤月度导入模板从多个Sheet合并为单Sheet：\n• 考勤记录和加班记录合并为「考勤与加班」一个Sheet\n• 不再需要分别填写考勤Sheet和加班Sheet\n• 导入时自动识别合并Sheet或独立Sheet，兼容旧模板\n• 减少重复录入姓名和证件号码',
         tip: '路径：考勤管理 → 考勤确认 → 导入考勤 → 下载模板',
       },
       {
@@ -240,14 +240,14 @@ const categories: HelpCategory[] = [
       },
       {
         id: 'update-idcard-dedup',
-        question: '新增：用工办理按身份证号查重',
-        answer: '创建员工时自动按身份证号查重：\n• 后端创建员工前先检查身份证号是否已存在\n• 如果已存在，返回已有员工姓名、部门、在职状态\n• 前端显示明确的重复提示信息，避免重复录入',
+        question: '新增：用工办理按证件号码查重',
+        answer: '创建员工时自动按证件号码查重：\n• 后端创建员工前先检查证件号码是否已存在\n• 如果已存在，返回已有员工姓名、部门、在职状态\n• 前端显示明确的重复提示信息，避免重复录入',
         tip: '路径：用工办理 → 入职办理 / 花名册 → 添加员工',
       },
       {
         id: 'update-income-cert-select',
         question: '优化：收入证明支持员工下拉选择并自动填充',
-        answer: '用工办理中收入证明和离职证明支持员工下拉选择：\n• 员工字段从手动输入改为下拉搜索选择\n• 选择员工后自动填充：姓名、身份证号、职务、月收入、入职日期、部门、手机号\n• 减少手动输入，避免信息不一致',
+        answer: '用工办理中收入证明和离职证明支持员工下拉选择：\n• 员工字段从手动输入改为下拉搜索选择\n• 选择员工后自动填充：姓名、证件号码、职务、月收入、入职日期、部门、手机号\n• 减少手动输入，避免信息不一致',
         tip: '路径：用工办理 → 收入证明/离职证明 → 选择员工',
       },
       {
@@ -496,7 +496,7 @@ const categories: HelpCategory[] = [
         id: 'attendance-import',
         question: '怎么导入考勤数据？',
         answer: '在考勤管理「考勤确认」标签页中，点击「导入考勤」按钮，下载模板填写后上传。系统会自动匹配员工并生成考勤记录。',
-        tip: '身份证号优先匹配，未填时用姓名匹配。',
+        tip: '证件号码优先匹配，未填时用姓名匹配。',
       },
       {
         id: 'attendance-correct',
@@ -613,7 +613,7 @@ const categories: HelpCategory[] = [
       {
         id: 'data-safe',
         question: '我的数据安全吗？',
-        answer: '您的数据存储在加密的云端服务器上，只有您本人登录后才能查看。我们不会将您的数据分享给任何第三方。所有敏感信息（如身份证号）都经过加密存储。',
+        answer: '您的数据存储在加密的云端服务器上，只有您本人登录后才能查看。我们不会将您的数据分享给任何第三方。所有敏感信息（如证件号码）都经过加密存储。',
       },
       {
         id: 'data-export',

frontend/src/components/layout/SidebarNav.tsx

@@ -44,7 +44,7 @@ const navGroups: NavGroup[] = [
     title: '团队',
     items: [
       { path: '/roster', label: '花名册', icon: Users },
-      { path: '/work-process', label: '用工办理', icon: ClipboardList },
+      { path: '/org-chart', label: '组织架构', icon: Building2 },
       { path: '/termination', label: '离职管理', icon: UserX },
       { path: '/training-records', label: '培训记录', icon: GraduationCap },
       { path: '/performance-records', label: '绩效考核', icon: TrendingUp },

frontend/src/data/surveyData.ts

@@ -274,7 +274,7 @@ export const surveyPages: SurveyPage[] = [
   {
     id: 24, name: 'Onboarding（入职信息填报）', file: 'frontend/src/pages/portal/Onboarding.tsx', menu: '员工端 > 入职填报',
     features: [
-      { id: '24.1', name: '入职表单填写', desc: '填写姓名、手机号、身份证号、紧急联系人等' },
+      { id: '24.1', name: '入职表单填写', desc: '填写姓名、手机号、证件号码、紧急联系人等' },
       { id: '24.2', name: '入职材料上传', desc: '上传身份证、学历证明、银行卡等材料' },
       { id: '24.3', name: '文件类型选择', desc: '选择上传文件的类型（身份证正反面、学历、银行卡、其他）' },
       { id: '24.4', name: '已传文件管理', desc: '查看和删除已上传文件' },

frontend/src/lib/api-services.ts

@@ -69,6 +69,9 @@ export const employeeApi = {
   /** 身份证查重 */
   checkIdCard: (idCard: string) =>
     get('/employees/check-id-card', { params: { idCard } }).then(unwrap<{ exists: boolean; employee?: any }>()),
+  /** 手机号查重 */
+  checkPhone: (phone: string) =>
+    get('/employees/check-phone', { params: { phone } }).then(unwrap<{ exists: boolean; employee?: any }>()),
   /** 更新员工 */
   update: (id: string, data: Record<string, unknown>) =>
     put(`/employees/${id}`, data),

frontend/src/pages/Attendance.tsx

@@ -555,7 +555,7 @@ function ConfirmTab({ onGoToTab }: { onGoToTab?: (tab: string) => void }) {
                 </div>
 
                 <div className="text-xs text-gray-500 bg-blue-50/50 rounded-md p-2">
-                  模板中「考勤与加班」Sheet 包含：姓名、身份证号、日期、考勤状态、上下班时间、各类加班时长。身份证号优先匹配，未填时用姓名匹配。加班时长为0的行只导入考勤。
+                  模板中「考勤与加班」Sheet 包含：姓名、证件号码、日期、考勤状态、上下班时间、各类加班时长。证件号码优先匹配，未填时用姓名匹配。加班时长为0的行只导入考勤。
                 </div>
 
                 <div className="border-2 border-dashed border-gray-200 rounded-lg p-6 text-center">

frontend/src/pages/Contracts.tsx

@@ -78,7 +78,7 @@ export default function Contracts() {
           <FileText className="h-5 w-5 text-primary" />
           <div>
             <h1 className="text-base font-semibold">合同管理</h1>
-            <p className="mt-1 text-sm text-gray-500">集中管理劳动合同、签署状态及到期风险</p>
+            <p className="mt-1 text-sm text-gray-500">集中管理用工关系（劳动合同/劳务协议/实习协议）、签署状态及到期风险</p>
           </div>
         </div>
         <Button onClick={() => setShowAddModal(true)}>

frontend/src/pages/OrgChart.tsx

@@ -0,0 +1,294 @@
+/**
+ * 组织架构页面
+ * 树形部门管理 + 岗位字典
+ */
+import { useState } from 'react'
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
+import { toast } from 'sonner'
+import { Plus, Edit, Trash2, ChevronRight, ChevronDown, Building2, Briefcase } from 'lucide-react'
+import Card from '../components/ui/Card'
+import Button from '../components/ui/Button'
+import { Input, Label, Select } from '../components/ui/Input'
+import Modal from '../components/ui/Modal'
+import api from '../lib/api'
+
+export default function OrgChart() {
+  const queryClient = useQueryClient()
+  const [tab, setTab] = useState<'dept' | 'position'>('dept')
+  const [showModal, setShowModal] = useState(false)
+  const [editing, setEditing] = useState<any>(null)
+  const [expanded, setExpanded] = useState<Set<string>>(new Set())
+  const [form, setForm] = useState<any>({ name: '', parentId: '', sortOrder: 0, description: '' })
+
+  const { data: departments = [], isLoading } = useQuery({
+    queryKey: ['departments'],
+    queryFn: () => api.get('/departments').then(r => r.data.data),
+  })
+
+  const { data: positions = [] } = useQuery({
+    queryKey: ['positions'],
+    queryFn: () => api.get('/positions').then(r => r.data.data),
+    enabled: tab === 'position',
+  })
+
+  const createMutation = useMutation({
+    mutationFn: (data: any) => api.post(editing ? `/departments/${editing.id}` : '/departments', data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['departments'] })
+      setShowModal(false)
+      toast.success(editing ? '部门已更新' : '部门已创建')
+    },
+    onError: (err: any) => toast.error(err?.response?.data?.error?.message || '操作失败'),
+  })
+
+  const deleteMutation = useMutation({
+    mutationFn: (id: string) => api.delete(`/departments/${id}`),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['departments'] })
+      toast.success('部门已删除')
+    },
+    onError: (err: any) => toast.error(err?.response?.data?.error?.message || '删除失败'),
+  })
+
+  const toggleExpand = (id: string) => {
+    setExpanded(prev => {
+      const next = new Set(prev)
+      if (next.has(id)) next.delete(id)
+      else next.add(id)
+      return next
+    })
+  }
+
+  const renderTree = (items: any[], parentId: string | null, level: number = 0) => {
+    return items.filter(d => d.parentId === parentId).map(d => (
+      <div key={d.id}>
+        <div
+          className="flex items-center gap-2 py-2 px-3 hover:bg-gray-50 rounded-md"
+          style={{ marginLeft: level * 24 }}
+        >
+          {items.some(c => c.parentId === d.id) ? (
+            <button onClick={() => toggleExpand(d.id)} className="text-gray-400 hover:text-gray-600">
+              {expanded.has(d.id) ? <ChevronDown className="w-4 h-4" /> : <ChevronRight className="w-4 h-4" />}
+            </button>
+          ) : (
+            <span className="w-4" />
+          )}
+          <Building2 className="w-4 h-4 text-primary" />
+          <span className="flex-1 text-sm">{d.name}</span>
+          <span className="text-xs text-gray-400">{d._count?.employees || 0}人</span>
+          <button
+            onClick={() => {
+              setEditing(d)
+              setForm({ name: d.name, parentId: d.parentId || '', sortOrder: d.sortOrder, description: d.description || '' })
+              setShowModal(true)
+            }}
+            className="text-gray-400 hover:text-primary"
+          >
+            <Edit className="w-3.5 h-3.5" />
+          </button>
+          <button
+            onClick={() => { if (confirm(`确认删除部门"${d.name}"？`)) deleteMutation.mutate(d.id) }}
+            className="text-gray-400 hover:text-danger"
+          >
+            <Trash2 className="w-3.5 h-3.5" />
+          </button>
+        </div>
+        {expanded.has(d.id) && renderTree(items, d.id, level + 1)}
+      </div>
+    ))
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-xl font-semibold text-gray-900">组织架构</h1>
+          <p className="text-sm text-gray-500 mt-1">管理部门、岗位及上下级关系</p>
+        </div>
+      </div>
+
+      <div className="flex gap-2 border-b">
+        <button
+          onClick={() => setTab('dept')}
+          className={`px-4 py-2 text-sm font-medium border-b-2 ${tab === 'dept' ? 'border-primary text-primary' : 'border-transparent text-gray-500'}`}
+        >
+          部门管理
+        </button>
+        <button
+          onClick={() => setTab('position')}
+          className={`px-4 py-2 text-sm font-medium border-b-2 ${tab === 'position' ? 'border-primary text-primary' : 'border-transparent text-gray-500'}`}
+        >
+          岗位字典
+        </button>
+      </div>
+
+      {tab === 'dept' ? (
+        <Card className="p-4">
+          <div className="flex justify-between items-center mb-3">
+            <span className="text-sm font-medium">部门列表</span>
+            <Button size="sm" onClick={() => {
+              setEditing(null)
+              setForm({ name: '', parentId: '', sortOrder: 0, description: '' })
+              setShowModal(true)
+            }}>
+              <Plus className="w-4 h-4 mr-1" />新增部门
+            </Button>
+          </div>
+          {isLoading ? (
+            <div className="text-center py-8 text-gray-400 text-sm">加载中...</div>
+          ) : departments.length === 0 ? (
+            <div className="text-center py-8 text-gray-400 text-sm">暂无部门数据</div>
+          ) : (
+            <div className="space-y-1">{renderTree(departments, null)}</div>
+          )}
+        </Card>
+      ) : (
+        <PositionTab positions={positions} departments={departments} />
+      )}
+
+      {showModal && (
+        <Modal open onClose={() => setShowModal(false)} title={editing ? '编辑部门' : '新增部门'}>
+          <div className="space-y-3">
+            <div>
+              <Label>部门名称 *</Label>
+              <Input value={form.name} onChange={(e) => setForm({ ...form, name: e.target.value })} placeholder="如：技术部" />
+            </div>
+            <div>
+              <Label>上级部门</Label>
+              <Select value={form.parentId} onChange={(e) => setForm({ ...form, parentId: e.target.value })}>
+                <option value="">无（根部门）</option>
+                {departments.filter((d: any) => d.id !== editing?.id).map((d: any) => (
+                  <option key={d.id} value={d.id}>{d.name}</option>
+                ))}
+              </Select>
+            </div>
+            <div>
+              <Label>排序</Label>
+              <Input type="number" value={form.sortOrder} onChange={(e) => setForm({ ...form, sortOrder: Number(e.target.value) || 0 })} />
+            </div>
+            <div>
+              <Label>描述</Label>
+              <Input value={form.description} onChange={(e) => setForm({ ...form, description: e.target.value })} placeholder="选填" />
+            </div>
+            <div className="flex justify-end gap-2 pt-2">
+              <Button variant="secondary" onClick={() => setShowModal(false)}>取消</Button>
+              <Button onClick={() => createMutation.mutate(form)} disabled={!form.name}>
+                {editing ? '保存' : '创建'}
+              </Button>
+            </div>
+          </div>
+        </Modal>
+      )}
+    </div>
+  )
+}
+
+/** 岗位字典子组件 */
+function PositionTab({ positions, departments }: { positions: any[]; departments: any[] }) {
+  const queryClient = useQueryClient()
+  const [showModal, setShowModal] = useState(false)
+  const [editing, setEditing] = useState<any>(null)
+  const [form, setForm] = useState<any>({ name: '', departmentId: '', headcount: 0, level: '', description: '' })
+
+  const createMutation = useMutation({
+    mutationFn: (data: any) => api.post(editing ? `/positions/${editing.id}` : '/positions', data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['positions'] })
+      setShowModal(false)
+      toast.success(editing ? '岗位已更新' : '岗位已创建')
+    },
+    onError: (err: any) => toast.error(err?.response?.data?.error?.message || '操作失败'),
+  })
+
+  const deleteMutation = useMutation({
+    mutationFn: (id: string) => api.delete(`/positions/${id}`),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['positions'] })
+      toast.success('岗位已删除')
+    },
+    onError: (err: any) => toast.error(err?.response?.data?.error?.message || '删除失败'),
+  })
+
+  return (
+    <Card className="p-4">
+      <div className="flex justify-between items-center mb-3">
+        <span className="text-sm font-medium">岗位列表</span>
+        <Button size="sm" onClick={() => {
+          setEditing(null)
+          setForm({ name: '', departmentId: '', headcount: 0, level: '', description: '' })
+          setShowModal(true)
+        }}>
+          <Plus className="w-4 h-4 mr-1" />新增岗位
+        </Button>
+      </div>
+      {positions.length === 0 ? (
+        <div className="text-center py-8 text-gray-400 text-sm">暂无岗位数据</div>
+      ) : (
+        <div className="space-y-1">
+          {positions.map(p => (
+            <div key={p.id} className="flex items-center gap-2 py-2 px-3 hover:bg-gray-50 rounded-md">
+              <Briefcase className="w-4 h-4 text-primary" />
+              <span className="flex-1 text-sm">{p.name}</span>
+              {p.department && <span className="text-xs text-gray-400">{p.department.name}</span>}
+              {p.level && <span className="text-xs text-gray-400">职级：{p.level}</span>}
+              <span className="text-xs text-gray-400">编制：{p.headcount}</span>
+              <button
+                onClick={() => {
+                  setEditing(p)
+                  setForm({ name: p.name, departmentId: p.departmentId || '', headcount: p.headcount, level: p.level || '', description: p.description || '' })
+                  setShowModal(true)
+                }}
+                className="text-gray-400 hover:text-primary"
+              >
+                <Edit className="w-3.5 h-3.5" />
+              </button>
+              <button
+                onClick={() => { if (confirm(`确认删除岗位"${p.name}"？`)) deleteMutation.mutate(p.id) }}
+                className="text-gray-400 hover:text-danger"
+              >
+                <Trash2 className="w-3.5 h-3.5" />
+              </button>
+            </div>
+          ))}
+        </div>
+      )}
+      {showModal && (
+        <Modal open onClose={() => setShowModal(false)} title={editing ? '编辑岗位' : '新增岗位'}>
+          <div className="space-y-3">
+            <div>
+              <Label>岗位名称 *</Label>
+              <Input value={form.name} onChange={(e) => setForm({ ...form, name: e.target.value })} placeholder="如：前端工程师" />
+            </div>
+            <div>
+              <Label>所属部门</Label>
+              <Select value={form.departmentId} onChange={(e) => setForm({ ...form, departmentId: e.target.value })}>
+                <option value="">无</option>
+                {departments.map(d => <option key={d.id} value={d.id}>{d.name}</option>)}
+              </Select>
+            </div>
+            <div className="grid grid-cols-2 gap-3">
+              <div>
+                <Label>编制人数</Label>
+                <Input type="number" value={form.headcount} onChange={(e) => setForm({ ...form, headcount: Number(e.target.value) || 0 })} />
+              </div>
+              <div>
+                <Label>职级</Label>
+                <Input value={form.level} onChange={(e) => setForm({ ...form, level: e.target.value })} placeholder="如 P1/M1" />
+              </div>
+            </div>
+            <div>
+              <Label>描述</Label>
+              <Input value={form.description} onChange={(e) => setForm({ ...form, description: e.target.value })} placeholder="选填" />
+            </div>
+            <div className="flex justify-end gap-2 pt-2">
+              <Button variant="secondary" onClick={() => setShowModal(false)}>取消</Button>
+              <Button onClick={() => createMutation.mutate(form)} disabled={!form.name}>
+                {editing ? '保存' : '创建'}
+              </Button>
+            </div>
+          </div>
+        </Modal>
+      )}
+    </Card>
+  )
+}

frontend/src/pages/Roster.tsx

@@ -5,8 +5,8 @@ import { toast } from 'sonner'
 import { toastError } from '../lib/errorToast'
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
 import { useConfirm } from '../hooks/useConfirm'
-import { Users, Plus, Check, UserX, UserPlus, DollarSign, Building2, RotateCcw, Upload, Wallet, Download, Phone, MapPin, Search, Settings2 } from 'lucide-react'
-import { rosterApi, employeeApi, terminationApi } from '../lib/api-services'
+import { Users, Plus, Check, UserX, UserPlus, DollarSign, Building2, RotateCcw, Upload, Wallet, Download, Phone, MapPin, Search, Settings2, CheckCircle, FileText } from 'lucide-react'
+import { rosterApi, employeeApi, terminationApi, workProcessApi } from '../lib/api-services'
 import { copyToClipboard } from '../lib/clipboard'
 import { useAuthStore } from '../store/authStore'
 import { useDebouncedValue } from '../hooks/useDebouncedValue'
@@ -19,7 +19,7 @@ import { fmt, terminateReasonMap } from './roster/shared'
 import PageGuide from '../components/ui/PageGuide'
 import EmployeeProfile from './roster/EmployeeProfile'
 import { InlineAlert } from '../components/ui/InlineAlert'
-import { AddEmployeeModal, ResignModal, RehireModal, SalaryChangeModal, DeptChangeModal } from './roster/modals'
+import { AddEmployeeModal, ResignModal, RehireModal, SalaryChangeModal, DeptChangeModal, ConfirmModal } from './roster/modals'
 import { ImportSettings } from './Settings'
 import QueryError from '../components/ui/QueryError'
 
@@ -77,6 +77,8 @@ export default function Roster() {
   const [salaryEmployee, setSalaryEmployee] = useState<any>(null)
   const [showDeptModal, setShowDeptModal] = useState(false)
   const [deptEmployee, setDeptEmployee] = useState<any>(null)
+  const [showConfirmModal, setShowConfirmModal] = useState(false)
+  const [confirmEmployee, setConfirmEmployee] = useState<any>(null)
   const pageSize = usePageSize()
   const [page, setPage] = useState(1)
   const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
@@ -210,6 +212,21 @@ export default function Roster() {
     },
   })
 
+  // 转正 mutation
+  const confirmMutation = useMutation({
+    mutationFn: (data: { employeeId: string; confirmDate: string; regularSalary?: number }) =>
+      workProcessApi.create({ type: 'CONFIRM', title: '转正', employeeId: data.employeeId, formData: { employeeId: data.employeeId, confirmDate: data.confirmDate, regularSalary: data.regularSalary }, status: 'DRAFT' }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['roster'] })
+      queryClient.invalidateQueries({ queryKey: ['dashboard'] })
+      queryClient.invalidateQueries({ queryKey: ['roster-profile'] })
+      setShowConfirmModal(false)
+      setConfirmEmployee(null)
+      toast.success('转正已提交')
+    },
+    onError: (err: any) => toast.error(err?.response?.data?.error?.message || '转正失败'),
+  })
+
   const batchRenewMutation = useMutation({
     mutationFn: (data: { contractIds: string[]; years: number }) => employeeApi.batchRenew(data),
     onSuccess: () => {
@@ -264,6 +281,49 @@ export default function Roster() {
     },
   })
 
+  /** 批量转正：为选中的试用期员工创建转正草稿 */
+  const handleBatchConfirm = async () => {
+    const probationEmployees = employees.filter((e: any) => selectedIds.has(e.id) && e.probationInfo?.isProbation)
+    if (probationEmployees.length === 0) {
+      toast.error('选中的员工中没有试用期员工')
+      return
+    }
+    const confirmDate = new Date().toISOString().slice(0, 10)
+    let success = 0
+    let failed = 0
+    await Promise.all(
+      probationEmployees.map(async (emp: any) => {
+        try {
+          await workProcessApi.create({
+            type: 'CONFIRM',
+            title: '批量转正',
+            employeeId: emp.id,
+            formData: { employeeId: emp.id, confirmDate },
+            status: 'DRAFT',
+          })
+          success++
+        } catch {
+          failed++
+        }
+      })
+    )
+    queryClient.invalidateQueries({ queryKey: ['roster'] })
+    queryClient.invalidateQueries({ queryKey: ['dashboard'] })
+    if (success > 0) toast.success(`已为 ${success} 名员工创建转正草稿`)
+    if (failed > 0) toast.error(`${failed} 名员工转正失败`)
+    setSelectedIds(new Set())
+  }
+
+  /** 批量开具证明：跳转到用工办理批量开具收入证明 */
+  const handleBatchCert = () => {
+    if (selectedIds.size === 0) {
+      toast.error('请至少选择一名员工')
+      return
+    }
+    const ids = Array.from(selectedIds).join(',')
+    window.location.href = `/work-process?type=INCOME_CERT&employeeIds=${ids}`
+  }
+
   const toggleSelect = (id: string) => {
     setSelectedIds((prev) => {
       const next = new Set(prev)
@@ -450,6 +510,12 @@ export default function Roster() {
             <Button variant="secondary" onClick={() => setShowBatchRenewModal(true)} className="shrink-0">
               <Check className="mr-1 h-4 w-4" />批量续签
             </Button>
+            <Button variant="secondary" onClick={handleBatchConfirm} className="shrink-0">
+              <CheckCircle className="mr-1 h-4 w-4" />批量转正
+            </Button>
+            <Button variant="secondary" onClick={handleBatchCert} className="shrink-0">
+              <FileText className="mr-1 h-4 w-4" />批量开具证明
+            </Button>
             <Button variant="danger" onClick={() => setShowBatchTerminateModal(true)} className="shrink-0">
               <UserX className="mr-1 h-4 w-4" />批量解聘
             </Button>
@@ -540,10 +606,10 @@ export default function Roster() {
                     </td>
                     <td className="px-4 py-3 font-medium">
                       <div>{e.name}</div>
-                      <div className="text-gray-400 text-xs font-mono cursor-pointer hover:text-primary transition-colors" title="点击复制完整身份证号" onClick={(ev) => {
+                      <div className="text-gray-400 text-xs font-mono cursor-pointer hover:text-primary transition-colors" title="点击复制完整证件号码" onClick={(ev) => {
                         ev.stopPropagation()
                         if (e.idCardNumber) {
-                          copyToClipboard(e.idCardNumber, '已复制身份证号')
+                          copyToClipboard(e.idCardNumber, '已复制证件号码')
                         }
                       }}>{e.idCardMasked || '—'}</div>
                     </td>
@@ -713,18 +779,35 @@ export default function Roster() {
                           >
                             <DollarSign className="h-4 w-4" />
                           </button>
-                          <button
-                            type="button"
-                            title="发薪"
-                            aria-label={`为${e.name}发薪`}
-                            className="rounded-md p-1.5 text-gray-500 transition hover:bg-primary/10 hover:text-primary"
-                            onClick={(ev) => {
-                              ev.stopPropagation()
-                              navigate('/money')
-                            }}
-                          >
-                            <Wallet className="h-4 w-4" />
-                          </button>
+                          {/* 试用期员工显示转正按钮，其他员工显示发薪按钮 */}
+                          {e.probationInfo?.isProbation ? (
+                            <button
+                              type="button"
+                              title="转正"
+                              aria-label={`为${e.name}办理转正`}
+                              className="rounded-md p-1.5 text-gray-500 transition hover:bg-primary/10 hover:text-primary"
+                              onClick={(ev) => {
+                                ev.stopPropagation()
+                                setConfirmEmployee(e)
+                                setShowConfirmModal(true)
+                              }}
+                            >
+                              <CheckCircle className="h-4 w-4" />
+                            </button>
+                          ) : (
+                            <button
+                              type="button"
+                              title="发薪"
+                              aria-label={`为${e.name}发薪`}
+                              className="rounded-md p-1.5 text-gray-500 transition hover:bg-primary/10 hover:text-primary"
+                              onClick={(ev) => {
+                                ev.stopPropagation()
+                                navigate('/money')
+                              }}
+                            >
+                              <Wallet className="h-4 w-4" />
+                            </button>
+                          )}
                           <button
                             type="button"
                             title="调部门"
@@ -738,6 +821,30 @@ export default function Roster() {
                           >
                             <Building2 className="h-4 w-4" />
                           </button>
+                          <button
+                            type="button"
+                            title="开具证明"
+                            aria-label={`为${e.name}开具证明`}
+                            className="rounded-md p-1.5 text-gray-500 transition hover:bg-primary/10 hover:text-primary"
+                            onClick={(ev) => {
+                              ev.stopPropagation()
+                              window.location.href = `/work-process?type=INCOME_CERT&employeeId=${e.id}`
+                            }}
+                          >
+                            <FileText className="h-4 w-4" />
+                          </button>
+                          <button
+                            type="button"
+                            title="续签合同"
+                            aria-label={`为${e.name}续签合同`}
+                            className="rounded-md p-1.5 text-gray-500 transition hover:bg-primary/10 hover:text-primary"
+                            onClick={(ev) => {
+                              ev.stopPropagation()
+                              window.location.href = `/work-process?type=RENEW&employeeId=${e.id}`
+                            }}
+                          >
+                            <RotateCcw className="h-4 w-4" />
+                          </button>
                           <button
                             type="button"
                             title="离职"
@@ -865,6 +972,16 @@ export default function Roster() {
         />
       )}
 
+      {showConfirmModal && confirmEmployee && (
+        <ConfirmModal
+          employee={confirmEmployee}
+          onClose={() => { setShowConfirmModal(false); setConfirmEmployee(null) }}
+          onSubmit={(data) => confirmMutation.mutate(data)}
+          loading={confirmMutation.isPending}
+          error={confirmMutation.error as any}
+        />
+      )}
+
       {showBatchRenewModal && (
         <Modal open={showBatchRenewModal} onClose={() => { setShowBatchRenewModal(false); setPreviewData(null); }} title="批量续签">
           <div className="space-y-3">

frontend/src/pages/Settings.tsx

@@ -1148,7 +1148,7 @@ function InitImport() {
                 <div className="text-amber-600">跳过 {result.skipped} 条（数据不完整或格式错误）</div>
               )}
               {result.duplicates > 0 && (
-                <div className="text-amber-600">重复 {result.duplicates} 条（身份证号已存在）</div>
+                <div className="text-amber-600">重复 {result.duplicates} 条（证件号码已存在）</div>
               )}
               {result.errors?.length > 0 && (
                 <div className="mt-2 pt-2 border-t border-green-200">
@@ -1214,12 +1214,12 @@ function InitImport() {
       <Card>
         <div className="text-xs text-gray-500 space-y-1">
           <div className="font-medium text-gray-700 mb-1">Sheet 页说明</div>
-          <div>- <b>员工信息</b>：姓名、部门、性别、手机号、身份证号、入职日期、月工资、社保基数、公积金基数等</div>
-          <div>- <b>劳动合同</b>：身份证号（优先匹配）、姓名（备选）、合同类型、签订日期、起止日期、试用期等</div>
-          <div>- <b>加班记录</b>：身份证号（优先匹配）、姓名（备选）、日期、加班时长、加班类型</div>
-          <div>- <b>违纪记录</b>：身份证号（优先匹配）、姓名（备选）、日期、违纪类型、描述、处罚</div>
-          <div>- <b>考勤记录</b>：身份证号（优先匹配）、姓名（备选）、日期、考勤状态、上下班时间</div>
-          <div className="mt-2 text-gray-500">各 Sheet 优先用「身份证号」精确匹配员工，未填身份证号时用「姓名」兑底（重名可能匹配错误）</div>
+          <div>- <b>员工信息</b>：姓名、部门、性别、手机号、证件号码、入职日期、月工资、社保基数、公积金基数等</div>
+          <div>- <b>劳动合同</b>：证件号码（优先匹配）、姓名（备选）、合同类型、签订日期、起止日期、试用期等</div>
+          <div>- <b>加班记录</b>：证件号码（优先匹配）、姓名（备选）、日期、加班时长、加班类型</div>
+          <div>- <b>违纪记录</b>：证件号码（优先匹配）、姓名（备选）、日期、违纪类型、描述、处罚</div>
+          <div>- <b>考勤记录</b>：证件号码（优先匹配）、姓名（备选）、日期、考勤状态、上下班时间</div>
+          <div className="mt-2 text-gray-500">各 Sheet 优先用「证件号码」精确匹配员工，未填证件号码时用「姓名」兑底（重名可能匹配错误）</div>
         </div>
       </Card>
     </div>
@@ -1377,12 +1377,12 @@ function MonthlyImport() {
       <Card>
         <div className="text-xs text-gray-500 space-y-1">
           <div className="font-medium text-gray-700 mb-1">Sheet 页说明</div>
-          <div>- <b>考勤记录</b>：身份证号（优先匹配）、姓名（备选）、日期、考勤状态、上下班时间（同日重复导入会覆盖）</div>
-          <div>- <b>加班记录</b>：身份证号（优先匹配）、姓名（备选）、日期、加班时长、加班类型（同月重复导入会累加）</div>
-          <div>- <b>薪资调整</b>：身份证号（优先匹配）、姓名（备选）、调整后月薪、生效日期、调薪原因（自动关闭旧薪资记录）</div>
-          <div>- <b>社保变动</b>：身份证号（优先匹配）、姓名（备选）、变动类型（增员/调基/减员）、缴费基数</div>
-          <div>- <b>公积金变动</b>：身份证号（优先匹配）、姓名（备选）、变动类型（增员/调基/减员）、缴费基数</div>
-          <div className="mt-2 text-gray-500">所有 Sheet 优先用「身份证号」精确匹配员工，未填时用「姓名」兑底（重名可能匹配错误）</div>
+          <div>- <b>考勤记录</b>：证件号码（优先匹配）、姓名（备选）、日期、考勤状态、上下班时间（同日重复导入会覆盖）</div>
+          <div>- <b>加班记录</b>：证件号码（优先匹配）、姓名（备选）、日期、加班时长、加班类型（同月重复导入会累加）</div>
+          <div>- <b>薪资调整</b>：证件号码（优先匹配）、姓名（备选）、调整后月薪、生效日期、调薪原因（自动关闭旧薪资记录）</div>
+          <div>- <b>社保变动</b>：证件号码（优先匹配）、姓名（备选）、变动类型（增员/调基/减员）、缴费基数</div>
+          <div>- <b>公积金变动</b>：证件号码（优先匹配）、姓名（备选）、变动类型（增员/调基/减员）、缴费基数</div>
+          <div className="mt-2 text-gray-500">所有 Sheet 优先用「证件号码」精确匹配员工，未填时用「姓名」兑底（重名可能匹配错误）</div>
         </div>
       </Card>
     </div>

frontend/src/pages/SpecialStatus.tsx

@@ -450,7 +450,12 @@ export default function SpecialStatus() {
               {/* 员工选择 */}
               <div>
                 <Label>员工</Label>
-                <Select value={form.employeeId} onChange={(e) => setForm({ ...form, employeeId: e.target.value })} disabled={!!editing}>
+                <Select value={form.employeeId} onChange={(e) => {
+                  const emp = employees.find(em => em.id === e.target.value)
+                  // 选择员工后，若当前类型为三期但员工为男性，自动切换为其他类型
+                  const newType = emp?.gender === '男' && form.type === 'PREGNANCY' ? 'WORK_INJURY' : form.type
+                  setForm({ ...form, employeeId: e.target.value, type: newType })
+                }} disabled={!!editing}>
                   <option value="">请选择员工</option>
                   {employees.map((emp) => (
                     <option key={emp.id} value={emp.id}>{emp.name} - {emp.department}</option>
@@ -463,11 +468,23 @@ export default function SpecialStatus() {
                 <div>
                   <Label>类型</Label>
                   <Select value={form.type} onChange={(e) => setForm({ ...form, type: e.target.value })}>
-                    <option value="PREGNANCY">三期</option>
+                    {/* 三期仅适用于女性员工，男职工不显示该选项 */}
+                    {(() => {
+                      const selectedEmp = employees.find(em => em.id === form.employeeId)
+                      const isMale = selectedEmp?.gender === '男'
+                      return isMale ? null : <option value="PREGNANCY">三期</option>
+                    })()}
                     <option value="WORK_INJURY">工伤</option>
                     <option value="MEDICAL_PERIOD">医疗期</option>
                     <option value="OTHER">其他</option>
                   </Select>
+                  {(() => {
+                    const selectedEmp = employees.find(em => em.id === form.employeeId)
+                    if (selectedEmp?.gender === '男') {
+                      return <p className="text-xs text-gray-400 mt-1">三期仅适用于女性员工</p>
+                    }
+                    return null
+                  })()}
                 </div>
                 <div>
                   <Label>状态</Label>

frontend/src/pages/Templates.tsx

@@ -25,7 +25,7 @@ const CATEGORY_LABELS: Record<string, string> = {
 const VARIABLE_LABELS: Record<string, string> = {
   companyName: '公司名称',
   employeeName: '员工姓名',
-  idCard: '身份证号',
+  idCard: '证件号码',
   address: '地址',
   startDate: '开始日期',
   position: '岗位',

frontend/src/pages/Termination.tsx

@@ -1,4 +1,5 @@
 import { useState, useMemo, useEffect } from 'react'
+import { useSearchParams } from 'react-router-dom'
 import { usePageSize } from '../hooks/usePageSize'
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
@@ -162,12 +163,26 @@ interface EmployeeProfile {
 export default function Termination() {
   const queryClient = useQueryClient()
   const confirm = useConfirm()
+  const [searchParams] = useSearchParams()
   const [view, setView] = useState<'list' | 'wizard' | 'detail'>('list')
   const [draftId, setDraftId] = useState<string | null>(null)
   const [step, setStep] = useState(0)
   const [reason, setReason] = useState('')
   const [employeeId, setEmployeeId] = useState('')
   const [terminationDate, setTerminationDate] = useState('')
+
+  // 从 URL 参数预填员工和解聘类型（从花名册操作栏跳转）
+  useEffect(() => {
+    const urlEmployeeId = searchParams.get('employeeId')
+    const urlReason = searchParams.get('reason')
+    if (urlEmployeeId) {
+      setEmployeeId(urlEmployeeId)
+      setView('wizard')
+    }
+    if (urlReason) {
+      setReason(urlReason)
+    }
+  }, [searchParams])
   const [socialInsEndMonth, setSocialInsEndMonth] = useState('')
   const [housingFundEndMonth, setHousingFundEndMonth] = useState('')
   const [checklist, setChecklist] = useState<Record<string, boolean>>({})
@@ -181,6 +196,18 @@ export default function Termination() {
   const [editCompValue, setEditCompValue] = useState<number>(0)
   const [editCompReason, setEditCompReason] = useState('')
   const [approvalComment, setApprovalComment] = useState('')
+  /** 违法解除且实际补偿金低于法定2N时需确认风险 */
+  const [illegalRiskAcknowledged, setIllegalRiskAcknowledged] = useState(false)
+  /** 补偿月数模式：N/N+1/2N/自定义 */
+  const [compMonthMode, setCompMonthMode] = useState<'N' | 'N+1' | '2N' | 'CUSTOM'>('N')
+  const [customCompMonths, setCustomCompMonths] = useState<number>(0)
+  const [customCompReason, setCustomCompReason] = useState('')
+  /** 计算基数来源：近12月平均/合同工资/自定义 */
+  const [wageBaseType, setWageBaseType] = useState<'AVG_12' | 'CONTRACT' | 'CUSTOM'>('AVG_12')
+  const [customWageBase, setCustomWageBase] = useState<number>(0)
+  const [customWageReason, setCustomWageReason] = useState('')
+  /** 剩余年假天数及折算金额 */
+  const [annualLeaveDays, setAnnualLeaveDays] = useState<number>(0)
   const [savedItems, setSavedItems] = useState<Array<{
     id: string
     employeeId: string
@@ -479,6 +506,28 @@ export default function Termination() {
       capped = true
     }
 
+    // 支持自定义计算基数（近12月平均/合同工资/自定义）
+    let effectiveWageBase = cappedWage
+    if (wageBaseType === 'CONTRACT') {
+      effectiveWageBase = selectedEmployee.latestContract?.monthlySalary || wage
+    } else if (wageBaseType === 'CUSTOM' && customWageBase > 0) {
+      effectiveWageBase = customWageBase
+      // 自定义基数时提示三倍社平封顶但不强制
+      if (socialAvgWage > 0 && customWageBase > socialAvgWage * 3) {
+        capped = true // 仅标记提示
+      }
+    }
+
+    // 支持自定义补偿月数（N/N+1/2N/其他）
+    let effectiveMonths = cappedMonths
+    if (compMonthMode === 'N+1') {
+      effectiveMonths = compMonths + 1
+    } else if (compMonthMode === '2N') {
+      effectiveMonths = compMonths * 2
+    } else if (compMonthMode === 'CUSTOM' && customCompMonths > 0) {
+      effectiveMonths = customCompMonths
+    }
+
     const reasonMap: Record<string, { multiplier: number; notice: boolean }> = {
       NEGOTIATED: { multiplier: 1, notice: false },
       FAULT: { multiplier: 0, notice: false },
@@ -488,9 +537,9 @@ export default function Termination() {
       ILLEGAL: { multiplier: 2, notice: false },
     }
     const r = reasonMap[reason] || { multiplier: 1, notice: false }
-    const basePay = cappedWage * cappedMonths
+    const basePay = effectiveWageBase * effectiveMonths
     const severancePay = basePay * r.multiplier
-    const noticePay = r.notice ? cappedWage : 0
+    const noticePay = r.notice ? effectiveWageBase : 0
     const totalSeverance = severancePay + noticePay
 
     // 双倍工资计算（未签合同）
@@ -525,35 +574,45 @@ export default function Termination() {
       isIllegal: r.multiplier === 2,
       grandTotal: totalSeverance + doublePay,
     }
-  }, [selectedEmployee, terminationDate, socialAvgWage, reason])
+  }, [selectedEmployee, terminationDate, socialAvgWage, reason, compMonthMode, customCompMonths, wageBaseType, customWageBase])
 
-  // 计算调整后的实际补偿金（系统预估 + 手动调整差额）
+  // 年假折算金额：日工资 × 剩余年假天数 × 3（未休年假按300%支付）
+  const annualLeavePay = useMemo(() => {
+    if (!costResult || annualLeaveDays <= 0) return 0
+    const dailyWage = (costResult.cappedWage || 0) / 21.75
+    return Math.round(dailyWage * annualLeaveDays * 3 * 100) / 100
+  }, [costResult, annualLeaveDays])
+
+  // 计算调整后的实际补偿金（系统预估 + 手动调整差额 + 年假折算）
   const adjustedTotal = useMemo(() => {
     if (!costResult) return 0
     let total = costResult.grandTotal
     compAdjustments.forEach(adj => {
       total += (adj.to - adj.from)
     })
+    total += annualLeavePay
     return total
-  }, [costResult, compAdjustments])
+  }, [costResult, compAdjustments, annualLeavePay])
 
   const canProceed = () => {
     if (step === 0) return !!employeeId && (!!draftId || !selectedEmployee?.hasTermination || selectedEmployee?.latestTerminationStatus === 'CANCELLED' || selectedEmployee?.latestTerminationStatus === 'COMPLETED')
     if (step === 1) return !!reason && !!terminationDate && (!riskAssessment?.warnings.length || acknowledgeRisk)
-    // step 2: 合规检查 — required 项必须勾选
+    // step 2: 合规检查 — 改为软阻断，未勾选 required 项可下一步但会生成待办
     if (step === 2) {
-      if (!checklistItems) return true
-      const requiredItems = checklistItems.filter(item => item.suggestionType === 'required')
-      if (requiredItems.length === 0) return true
-      return requiredItems.every(item => checklist[item.key] === true)
+      // 法定禁止情形（孕期/工伤/医疗期）仍硬阻断
+      if (riskAssessment?.warnings.length && !acknowledgeRisk) return false
+      return true
     }
-    // step 3: 费用结算 — 有补偿金时需确认
-    if (step === 3) return true
-    // step 4: 工作交接 — 关键项需完成
+    // step 3: 费用结算 — 违法解除且实际补偿金低于法定2N时需确认风险
+    if (step === 3) {
+      if (reason === 'ILLEGAL' && costResult && adjustedTotal < costResult.grandTotal) {
+        return illegalRiskAcknowledged
+      }
+      return true
+    }
+    // step 4: 工作交接 — 改为软阻断，未完成可下一步但会生成待办
     if (step === 4) {
-      const keyItems = handoverItems.filter(item => item.key === 'work_handover' || item.key === 'equipment_return' || item.key === 'access_revoke')
-      if (keyItems.length === 0) return true
-      return keyItems.every(item => item.done)
+      return true
     }
     return false
   }
@@ -568,6 +627,13 @@ export default function Termination() {
       total: adjustedTotal,
       systemTotal: costResult.grandTotal,
       adjustments: compAdjustments,
+      riskAcknowledged: reason === 'ILLEGAL' && adjustedTotal < costResult.grandTotal ? {
+        acknowledged: illegalRiskAcknowledged,
+        legalAmount: costResult.grandTotal,
+        actualAmount: adjustedTotal,
+        difference: costResult.grandTotal - adjustedTotal,
+        timestamp: new Date().toISOString(),
+      } : null,
     } : null
 
     saveDraftMutation.mutate({
@@ -583,18 +649,53 @@ export default function Termination() {
       compensationBreakdown: breakdown,
       handoverItems,
       checklistOverrides,
+      compMonthMode,
+      customCompMonths: compMonthMode === 'CUSTOM' ? customCompMonths : undefined,
+      customCompReason: compMonthMode === 'CUSTOM' ? customCompReason : undefined,
+      wageBaseType,
+      customWageBase: wageBaseType === 'CUSTOM' ? customWageBase : undefined,
+      customWageReason: wageBaseType === 'CUSTOM' ? customWageReason : undefined,
+      annualLeaveDays: annualLeaveDays > 0 ? annualLeaveDays : undefined,
+      annualLeavePay: annualLeavePay > 0 ? annualLeavePay : undefined,
+      socialAvgWage: socialAvgWage > 0 ? socialAvgWage : undefined,
       remark: '',
     })
   }
 
-  /** 编辑已有草稿 */
-  const handleEditDraft = (item: any) => {
+  /** 编辑已有草稿（拉取完整详情后恢复所有字段） */
+  const handleEditDraft = async (item: any) => {
     setDraftId(item.id)
     setEmployeeId(item.employeeId)
     setReason(item.reason)
     setTerminationDate(item.terminationDate)
     setStep(item.currentStep || 0)
     setView('wizard')
+    // 恢复所有已保存的字段
+    if (item.socialInsEndMonth) setSocialInsEndMonth(item.socialInsEndMonth)
+    if (item.housingFundEndMonth) setHousingFundEndMonth(item.housingFundEndMonth)
+    if (item.checklist) setChecklist(item.checklist)
+    if (item.compensationBreakdown) {
+      setCompBreakdown(item.compensationBreakdown)
+      if (item.compensationBreakdown.adjustments) {
+        setCompAdjustments(item.compensationBreakdown.adjustments)
+      }
+      // 恢复违法解除风险确认状态
+      if (item.compensationBreakdown.riskAcknowledged?.acknowledged) {
+        setIllegalRiskAcknowledged(true)
+      }
+    }
+    if (item.handoverItems) setHandoverItems(item.handoverItems)
+    if (item.checklistOverrides) setChecklistOverrides(item.checklistOverrides)
+    // 恢复补偿月数和计算基数设置
+    if (item.compMonthMode) setCompMonthMode(item.compMonthMode)
+    if (item.customCompMonths) setCustomCompMonths(item.customCompMonths)
+    if (item.customCompReason) setCustomCompReason(item.customCompReason)
+    if (item.wageBaseType) setWageBaseType(item.wageBaseType)
+    if (item.customWageBase) setCustomWageBase(item.customWageBase)
+    if (item.customWageReason) setCustomWageReason(item.customWageReason)
+    if (item.annualLeaveDays) setAnnualLeaveDays(item.annualLeaveDays)
+    // 恢复社平工资
+    if (item.socialAvgWage) setSocialAvgWage(item.socialAvgWage)
   }
 
   /** 查看详情 */
@@ -675,6 +776,14 @@ export default function Termination() {
     setChecklistOverrides({})
     setEditingCompField(null)
     setApprovalComment('')
+    setIllegalRiskAcknowledged(false)
+    setCompMonthMode('N')
+    setCustomCompMonths(0)
+    setCustomCompReason('')
+    setWageBaseType('AVG_12')
+    setCustomWageBase(0)
+    setCustomWageReason('')
+    setAnnualLeaveDays(0)
   }
 
   const handleReset = resetWizard
@@ -1079,7 +1188,7 @@ body { font-family: SimSun, serif; font-size: 14pt; line-height: 2; text-align:
 </style></head>
 <body>
 <div class="title">解除/终止劳动合同证明书</div>
-<div class="body">兹证明 ${draftDetail.employeeName}（身份证号：${draftDetail.idCardNumber || '—'}），原系我公司 ${draftDetail.department || '—'} 部门员工，于 ${draftDetail.terminationDate} 因 ${reasonLabel} 原因，正式解除/终止劳动合同。</div>
+<div class="body">兹证明 ${draftDetail.employeeName}（证件号码：${draftDetail.idCardNumber || '—'}），原系我公司 ${draftDetail.department || '—'} 部门员工，于 ${draftDetail.terminationDate} 因 ${reasonLabel} 原因，正式解除/终止劳动合同。</div>
 <div class="body">经济补偿金已结清：¥${fmt(draftDetail.compensation)}。社保截止月份：${draftDetail.socialInsEndMonth || '—'}，公积金截止月份：${draftDetail.housingFundEndMonth || '—'}。</div>
 <div class="body">特此证明。</div>
 <div class="sign">公司（盖章）<br/>${new Date().toISOString().slice(0, 10)}</div>
@@ -1275,7 +1384,26 @@ ${items}
             })()}
             <div>
               <Label>解聘日期</Label>
-              <Input type="date" value={terminationDate} onChange={(e) => setTerminationDate(e.target.value)} />
+              <Input type="date" value={terminationDate} onChange={(e) => {
+                const date = e.target.value
+                setTerminationDate(date)
+                // 自动推导社保/公积金截止月：15号前（含）截止上月，15号后截止当月
+                if (date) {
+                  const d = new Date(date)
+                  const day = d.getDate()
+                  const monthStr = date.slice(0, 7)
+                  if (day <= 15) {
+                    // 上月
+                    const prev = new Date(d.getFullYear(), d.getMonth() - 1, 1)
+                    const prevMonth = `${prev.getFullYear()}-${String(prev.getMonth() + 1).padStart(2, '0')}`
+                    setSocialInsEndMonth(prevMonth)
+                    setHousingFundEndMonth(prevMonth)
+                  } else {
+                    setSocialInsEndMonth(monthStr)
+                    setHousingFundEndMonth(monthStr)
+                  }
+                }
+              }} />
             </div>
             {/* 实时费用预览 - 当有足够数据时在解聘方式下方显示 */}
             {step === 1 && costResult && (
@@ -1428,6 +1556,57 @@ ${items}
                   )}
                 </div>
 
+                {/* 补偿月数和计算基数选择 */}
+                {!costResult.noComp && (
+                  <div className="border rounded-md p-3 space-y-3 bg-blue-50/30">
+                    <div className="text-xs font-medium text-gray-700">补偿金计算参数（支持多种来源）</div>
+                    {/* 补偿月数模式 */}
+                    <div>
+                      <Label>补偿月数</Label>
+                      <div className="flex gap-2 flex-wrap">
+                        {(['N', 'N+1', '2N', 'CUSTOM'] as const).map(mode => (
+                          <button
+                            key={mode}
+                            type="button"
+                            onClick={() => setCompMonthMode(mode)}
+                            className={`px-3 py-1 rounded text-xs border ${compMonthMode === mode ? 'bg-primary text-white border-primary' : 'bg-white text-gray-600 border-gray-300 hover:border-primary'}`}
+                          >
+                            {mode === 'N' ? 'N（法定）' : mode === 'N+1' ? 'N+1（含代通知）' : mode === '2N' ? '2N（违法解除）' : '自定义'}
+                          </button>
+                        ))}
+                      </div>
+                      {compMonthMode === 'CUSTOM' && (
+                        <div className="mt-2 space-y-1">
+                          <Input type="number" value={customCompMonths || ''} onChange={(e) => setCustomCompMonths(Number(e.target.value) || 0)} placeholder="自定义补偿月数" />
+                          <Input value={customCompReason} onChange={(e) => setCustomCompReason(e.target.value)} placeholder="自定义原因（必填）" />
+                        </div>
+                      )}
+                    </div>
+                    {/* 计算基数来源 */}
+                    <div>
+                      <Label>计算基数来源</Label>
+                      <div className="flex gap-2 flex-wrap">
+                        {(['AVG_12', 'CONTRACT', 'CUSTOM'] as const).map(bt => (
+                          <button
+                            key={bt}
+                            type="button"
+                            onClick={() => setWageBaseType(bt)}
+                            className={`px-3 py-1 rounded text-xs border ${wageBaseType === bt ? 'bg-primary text-white border-primary' : 'bg-white text-gray-600 border-gray-300 hover:border-primary'}`}
+                          >
+                            {bt === 'AVG_12' ? '近12月平均工资' : bt === 'CONTRACT' ? '合同约定工资' : '自定义基数'}
+                          </button>
+                        ))}
+                      </div>
+                      {wageBaseType === 'CUSTOM' && (
+                        <div className="mt-2 space-y-1">
+                          <Input type="number" value={customWageBase || ''} onChange={(e) => setCustomWageBase(Number(e.target.value) || 0)} placeholder="自定义月工资基数" />
+                          <Input value={customWageReason} onChange={(e) => setCustomWageReason(e.target.value)} placeholder="自定义原因（必填）" />
+                        </div>
+                      )}
+                    </div>
+                  </div>
+                )}
+
                 {/* 经济补偿金 / 赔偿金 */}
                 {costResult.noComp ? (
                   <div className="px-3 py-2 rounded-md bg-gray-50 text-gray-700 text-xs">
@@ -1496,8 +1675,55 @@ ${items}
                 {/* 合计 */}
                 <div className="border-t pt-3">
                   <div className="flex items-center justify-between">
-                    <span className="font-medium">合计应付</span>
-                    <span className="text-lg font-bold text-danger">¥{fmt(costResult.grandTotal)}</span>
+                    <span className="font-medium">系统预估合计</span>
+                    <span className="text-lg font-bold text-gray-700">¥{fmt(costResult.grandTotal)}</span>
+                  </div>
+                  {compAdjustments.length > 0 && (
+                    <div className="flex items-center justify-between mt-1">
+                      <span className="font-medium text-primary">调整后实际合计</span>
+                      <span className="text-lg font-bold text-danger">¥{fmt(adjustedTotal)}</span>
+                    </div>
+                  )}
+                </div>
+
+                {/* 违法解除风险提醒：实际补偿金低于法定2N时需确认 */}
+                {reason === 'ILLEGAL' && costResult && adjustedTotal < costResult.grandTotal && (
+                  <div className="border border-danger rounded-md p-3 space-y-2 bg-red-50">
+                    <div className="text-xs font-medium text-danger flex items-center gap-1.5">
+                      <AlertTriangle className="w-4 h-4" />违法解除合规风险提醒
+                    </div>
+                    <p className="text-xs text-danger">
+                      违法解除劳动合同应按经济补偿金的2倍支付赔偿金（《劳动合同法》第87条）。当前实际补偿金 ¥{fmt(adjustedTotal)} 低于法定标准 ¥{fmt(costResult.grandTotal)}，差额 ¥{fmt(costResult.grandTotal - adjustedTotal)}。
+                    </p>
+                    <p className="text-xs text-danger">降低补偿金存在被劳动者申请劳动仲裁要求补足差额的风险，请确认已知晓风险后再继续。</p>
+                    <label className="flex items-center gap-2 text-xs text-danger cursor-pointer">
+                      <input
+                        type="checkbox"
+                        checked={illegalRiskAcknowledged}
+                        onChange={(e) => setIllegalRiskAcknowledged(e.target.checked)}
+                      />
+                      <span>我已知晓降低补偿金的风险，确认继续</span>
+                    </label>
+                  </div>
+                )}
+
+                {/* 剩余年假折算 */}
+                <div className="border rounded-md p-3 space-y-2 bg-green-50/30">
+                  <div className="text-xs font-medium flex items-center gap-1.5">
+                    <Calculator className="w-3.5 h-3.5" />剩余年假折算
+                  </div>
+                  <div className="text-xs text-gray-500">未休年假按日工资的300%支付（《职工带薪年休假条例》第5条）</div>
+                  <div className="flex items-center gap-3">
+                    <div className="flex-1">
+                      <Label>剩余年假天数</Label>
+                      <Input type="number" min="0" step="0.5" value={annualLeaveDays || ''} onChange={(e) => setAnnualLeaveDays(Number(e.target.value) || 0)} placeholder="0" />
+                    </div>
+                    {annualLeaveDays > 0 && costResult && (
+                      <div className="text-xs text-gray-600">
+                        <div>日工资：¥{fmt((costResult.cappedWage || 0) / 21.75)}/天</div>
+                        <div className="font-medium text-danger">年假折算金额：¥{fmt(annualLeavePay)}</div>
+                      </div>
+                    )}
                   </div>
                 </div>
 
@@ -1884,11 +2110,11 @@ ${items}
             </Button>
             {step < 4 ? (
               <div className="flex items-center gap-2">
-                {!canProceed() && step === 2 && checklistItems?.some(item => item.suggestionType === 'required' && !checklist[item.key]) && (
-                  <span className="text-xs text-danger">请先勾选所有必检项</span>
+                {step === 2 && checklistItems?.some(item => item.suggestionType === 'required' && !checklist[item.key]) && (
+                  <span className="text-xs text-amber-600">未勾选的必检项将生成待办项</span>
                 )}
-                {!canProceed() && step === 4 && handoverItems.some(item => (item.key === 'work_handover' || item.key === 'equipment_return' || item.key === 'access_revoke') && !item.done) && (
-                  <span className="text-xs text-danger">请先完成工作交接、设备归还、权限收回</span>
+                {step === 4 && handoverItems.some(item => (item.key === 'work_handover' || item.key === 'equipment_return' || item.key === 'access_revoke') && !item.done) && (
+                  <span className="text-xs text-amber-600">未完成的交接项将生成待办项</span>
                 )}
                 <Button onClick={() => setStep(step + 1)} disabled={!canProceed()}>
                   下一步<ChevronRight className="w-4 h-4 ml-1" />

frontend/src/pages/WorkProcess.tsx

@@ -57,7 +57,7 @@ const FORM_FIELDS: Record<string, { key: string; label: string; type: 'text' | '
     { key: 'hireDate', label: '入职日期', type: 'date', required: true },
     { key: 'monthlySalary', label: '月薪', type: 'number' },
     { key: 'phone', label: '手机号', type: 'text', required: true },
-    { key: 'idCardNumber', label: '身份证号', type: 'text', required: true },
+    { key: 'idCardNumber', label: '证件号码', type: 'text', required: true },
     { key: 'gender', label: '性别', type: 'select', options: ['男', '女'] },
     { key: 'contractStartDate', label: '合同开始日期', type: 'date' },
     { key: 'contractEndDate', label: '合同结束日期', type: 'date' },
@@ -92,7 +92,7 @@ const FORM_FIELDS: Record<string, { key: string; label: string; type: 'text' | '
   ],
   RENEW: [
     { key: 'employeeId', label: '选择员工', type: 'employee-select', required: true },
-    { key: 'oldContractId', label: '原合同ID', type: 'text' },
+    { key: 'oldContractId', label: '原合同', type: 'contract-select' },
     { key: 'newStartDate', label: '新合同开始日期', type: 'date', required: true },
     { key: 'newEndDate', label: '新合同结束日期', type: 'date' },
     { key: 'newSalary', label: '新薪资', type: 'number' },
@@ -106,7 +106,7 @@ const FORM_FIELDS: Record<string, { key: string; label: string; type: 'text' | '
     { key: 'enterpriseTemplateId', label: '关联企业模板（选填）', type: 'enterprise-template' },
     { key: 'employeeId', label: '选择员工', type: 'employee-select', required: true },
     { key: 'employeeName', label: '员工姓名', type: 'text' },
-    { key: 'idCardNumber', label: '身份证号', type: 'text' },
+    { key: 'idCardNumber', label: '证件号码', type: 'text' },
     { key: 'position', label: '职务', type: 'text' },
     { key: 'monthlyIncome', label: '月收入', type: 'text' },
     { key: 'purpose', label: '用途', type: 'text' },
@@ -129,7 +129,7 @@ const FORM_FIELDS: Record<string, { key: string; label: string; type: 'text' | '
     { key: 'enterpriseTemplateId', label: '关联企业模板（选填）', type: 'enterprise-template' },
     { key: 'employeeId', label: '选择员工', type: 'employee-select', required: true },
     { key: 'employeeName', label: '员工姓名', type: 'text' },
-    { key: 'idCardNumber', label: '身份证号', type: 'text' },
+    { key: 'idCardNumber', label: '证件号码', type: 'text' },
     { key: 'position', label: '职务', type: 'text' },
     { key: 'hireDate', label: '入职日期', type: 'date' },
     { key: 'leaveDate', label: '离职日期', type: 'date', required: true },
@@ -137,7 +137,7 @@ const FORM_FIELDS: Record<string, { key: string; label: string; type: 'text' | '
   FLEXIBLE: [
     { key: 'name', label: '姓名', type: 'text', required: true },
     { key: 'phone', label: '手机号', type: 'text' },
-    { key: 'idCardNumber', label: '身份证号', type: 'text', required: true },
+    { key: 'idCardNumber', label: '证件号码', type: 'text', required: true },
     { key: 'department', label: '部门', type: 'text' },
     { key: 'agreementStartDate', label: '协议开始日期', type: 'date', required: true },
     { key: 'agreementEndDate', label: '协议结束日期', type: 'date' },
@@ -151,6 +151,28 @@ const FIELD_LABEL_MAP: Record<string, string> = Object.values(FORM_FIELDS).flat(
   return acc
 }, {} as Record<string, string>)
 
+/** 日期字段对配置：各流程类型的开始/结束日期字段对 */
+const DATE_RANGE_FIELDS: Record<string, Array<{ start: string; end: string; startLabel: string; endLabel: string }>> = {
+  HIRE: [{ start: 'contractStartDate', end: 'contractEndDate', startLabel: '合同开始日期', endLabel: '合同结束日期' }],
+  CUSTOM_CONTRACT: [{ start: 'contractStartDate', end: 'contractEndDate', startLabel: '合同开始日期', endLabel: '合同结束日期' }],
+  RENEW: [{ start: 'newStartDate', end: 'newEndDate', startLabel: '新合同开始日期', endLabel: '新合同结束日期' }],
+  FLEXIBLE: [{ start: 'agreementStartDate', end: 'agreementEndDate', startLabel: '协议开始日期', endLabel: '协议结束日期' }],
+}
+
+/** 校验日期前后关系：结束日期不能早于开始日期 */
+function validateDateRange(type: string, data: Record<string, any>): string | null {
+  const pairs = DATE_RANGE_FIELDS[type]
+  if (!pairs) return null
+  for (const pair of pairs) {
+    const start = data[pair.start]
+    const end = data[pair.end]
+    if (start && end && new Date(end) < new Date(start)) {
+      return `${pair.endLabel}不能早于${pair.startLabel}`
+    }
+  }
+  return null
+}
+
 export default function WorkProcess() {
   const navigate = useNavigate()
   const queryClient = useQueryClient()
@@ -277,6 +299,12 @@ export default function WorkProcess() {
       toast.error(`请填写必填项：${missingFields.map(f => f.label).join('、')}`)
       return
     }
+    // 校验日期前后关系
+    const dateError = validateDateRange(selectedType, formData)
+    if (dateError) {
+      toast.error(dateError)
+      return
+    }
     createMutation.mutate({
       type: selectedType,
       title: PROCESS_TYPES[selectedType].label,
@@ -291,6 +319,12 @@ export default function WorkProcess() {
       toast.error('请选择流程类型')
       return
     }
+    // 校验日期前后关系
+    const dateError = validateDateRange(selectedType, formData)
+    if (dateError) {
+      toast.error(dateError)
+      return
+    }
     createMutation.mutate(
       { type: selectedType, title: PROCESS_TYPES[selectedType].label, employeeId: formData.employeeId || undefined, formData, status: 'DRAFT' },
       {
@@ -325,6 +359,19 @@ export default function WorkProcess() {
           department: emp.department || prev.department,
           phone: emp.phone || prev.phone,
         }))
+        // RENEW 类型：自动推导新合同开始日期 = 原合同结束日期 + 1天
+        if (selectedType === 'RENEW' && emp.contracts?.length > 0) {
+          const latestContract = emp.contracts[0]
+          if (latestContract?.endDate) {
+            const endDate = new Date(latestContract.endDate)
+            endDate.setDate(endDate.getDate() + 1)
+            setFormData(prev => ({
+              ...prev,
+              oldContractId: latestContract.id,
+              newStartDate: endDate.toISOString().slice(0, 10),
+            }))
+          }
+        }
       }).catch(() => {})
     }
   }

frontend/src/pages/portal/Onboarding.tsx

@@ -131,8 +131,8 @@ export default function Onboarding() {
               <Input type="tel" value={form.phone} onChange={(e) => setForm({ ...form, phone: e.target.value })} placeholder="请输入手机号" maxLength={11} />
             </div>
             <div>
-              <Label>身份证号 *</Label>
-              <Input value={form.idCard} onChange={(e) => setForm({ ...form, idCard: e.target.value })} placeholder="请输入身份证号" maxLength={18} />
+              <Label>证件号码 *</Label>
+              <Input value={form.idCard} onChange={(e) => setForm({ ...form, idCard: e.target.value })} placeholder="请输入证件号码" maxLength={18} />
             </div>
             <div>
               <Label>紧急联系人</Label>

frontend/src/pages/roster/BasicInfo.tsx

@@ -3,6 +3,7 @@ import { useState, useRef } from "react"
 import { toast } from "sonner"
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
 import { attachmentApi, employeeApi, socialInsuranceApi } from '../../lib/api-services'
+import { useConfirm } from '../../hooks/useConfirm'
 import { copyToClipboard } from '../../lib/clipboard'
 import Card from "../../components/ui/Card"
 import Button from "../../components/ui/Button"
@@ -12,6 +13,7 @@ import { fmt } from "./shared"
 
 export default function BasicInfo({ profile, employeeId, attachments }: { profile: any; employeeId: string; attachments: any[] }) {
   const queryClient = useQueryClient()
+  const confirm = useConfirm()
   const [editing, setEditing] = useState(false)
   const fileInputRef = useRef<HTMLInputElement>(null)
   const [fileType, setFileType] = useState<'ID_CARD' | 'BANK_CARD' | 'EDUCATION' | 'CERTIFICATE' | 'CONTRACT' | 'PHOTO' | 'OTHER'>('ID_CARD')
@@ -109,11 +111,36 @@ export default function BasicInfo({ profile, employeeId, attachments }: { profil
     enabled: !editing && !!profile.socialInsBase && !!profile.city,
   })
 
-  const handleSave = () => {
+  const handleSave = async () => {
     if (form.city !== (profile.city || '') && !form.cityChangeReason.trim()) {
       toast.error('参保城市变更必须填写变更原因')
       return
     }
+    // 入职日期变更联动状态确认
+    const originalHireDate = profile.hireDate?.toString().slice(0, 10) || ''
+    let statusUpdate: string | undefined
+    if (form.hireDate && form.hireDate !== originalHireDate) {
+      const today = new Date()
+      today.setHours(0, 0, 0, 0)
+      const newHireDate = new Date(form.hireDate)
+      const currentStatus = profile.status || 'ACTIVE'
+      let newStatus = currentStatus
+      if (newHireDate > today) {
+        newStatus = 'PENDING_ONBOARD'
+      } else {
+        newStatus = 'ACTIVE'
+      }
+      if (newStatus !== currentStatus) {
+        const statusLabel = newStatus === 'PENDING_ONBOARD' ? '待入职' : '在职'
+        const currentLabel = currentStatus === 'PENDING_ONBOARD' ? '待入职' : currentStatus === 'ACTIVE' ? '在职' : currentStatus
+        const confirmed = await confirm({
+          title: '入职日期变更确认',
+          message: `入职日期从 ${originalHireDate} 变更为 ${form.hireDate}，员工状态将从"${currentLabel}"变更为"${statusLabel}"，是否继续？`,
+        })
+        if (!confirmed) return
+        statusUpdate = newStatus
+      }
+    }
     const data: any = {
       department: form.department,
       gender: form.gender,
@@ -137,6 +164,7 @@ export default function BasicInfo({ profile, employeeId, attachments }: { profil
       position: form.position || undefined,
       cityChangeReason: form.city !== profile.city ? form.cityChangeReason || undefined : undefined,
     }
+    if (statusUpdate) data.status = statusUpdate
     updateMutation.mutate(data)
   }
 
@@ -147,7 +175,7 @@ export default function BasicInfo({ profile, employeeId, attachments }: { profil
     ...(profile.gender === '女'
       ? [{ label: '女性岗位', value: profile.femaleWorkerType === 'CADRE' ? '干部/管理岗' : profile.femaleWorkerType === 'WORKER' ? '工人/操作岗' : '未填写' }]
       : []),
-    { label: '身份证号', value: profile.idCardNumber || '未填写' },
+    { label: '证件号码', value: profile.idCardNumber || '未填写' },
     { label: '手机号', value: profile.phone || '未填写' },
     { label: '学历', value: profile.education || '未填写' },
     { label: '职务/岗位', value: profile.position || '未填写' },
@@ -221,13 +249,13 @@ export default function BasicInfo({ profile, employeeId, attachments }: { profil
                   <span className="text-gray-500 shrink-0">{f.label}</span>
                   <span className="font-medium text-right truncate ml-2 flex items-center gap-1">
                     {f.value}
-                    {f.label === '身份证号' && profile.idCardNumber && (
+                    {f.label === '证件号码' && profile.idCardNumber && (
                       <button
                         type="button"
                         className="text-gray-400 hover:text-primary transition-colors shrink-0"
-                        title="复制身份证号"
+                        title="复制证件号码"
                         onClick={() => {
-                          copyToClipboard(profile.idCardNumber, '已复制身份证号')
+                          copyToClipboard(profile.idCardNumber, '已复制证件号码')
                         }}
                       >
                         <Copy className="w-3 h-3" />
@@ -317,7 +345,7 @@ export default function BasicInfo({ profile, employeeId, attachments }: { profil
       ) : (
         <div className="grid md:grid-cols-2 gap-3">
           <div><Label>姓名（不可编辑）</Label><Input value={profile.name} disabled /></div>
-          <div><Label>身份证号（不可编辑）</Label><Input value={profile.idCardNumber || ''} disabled /></div>
+          <div><Label>证件号码（不可编辑）</Label><Input value={profile.idCardNumber || ''} disabled /></div>
           <div><Label>部门</Label><Input value={form.department} onChange={(e) => setForm({ ...form, department: e.target.value })} /></div>
           <div><Label>性别</Label><Select value={form.gender} onChange={(e) => setForm({ ...form, gender: e.target.value as '男' | '女' })}><option value="男">男</option><option value="女">女</option></Select></div>
           {form.gender === '女' && (

frontend/src/pages/roster/modals.tsx

@@ -1,5 +1,6 @@
 import { useState, useEffect } from "react"
 import { useQuery } from "@tanstack/react-query"
+import { toast } from "sonner"
 import { rosterApi, socialInsuranceApi, employeeApi } from '../../lib/api-services'
 import Button from "../../components/ui/Button"
 import { Input, Label, Select } from "../../components/ui/Input"
@@ -152,69 +153,159 @@ export function ResignModal({ employee, onClose, onSubmit, loading, error }: {
     socialInsEndMonth: '',
     housingFundEndMonth: '',
   })
+  /** 离职/解聘类型：主动离职走快速流程，其他类型跳转解聘向导 */
+  const [termType, setTermType] = useState<'RESIGNATION' | 'NEGOTIATED' | 'FAULT' | 'NONFAULT' | 'LAYOFF' | 'EXPIRED' | 'ILLEGAL'>('RESIGNATION')
 
   const terminationMonth = form.terminationDate ? form.terminationDate.slice(0, 7) : ''
 
   const reasons = ['个人原因', '职业发展', '薪资不满意', '家庭原因', '身体原因', '其他']
 
+  const handleSubmit = () => {
+    if (termType === 'RESIGNATION') {
+      onSubmit({
+        employeeId: employee.id,
+        terminationDate: new Date(form.terminationDate).toISOString(),
+        resignationReason: form.resignationReason,
+        remark: form.remark || undefined,
+        socialInsEndMonth: form.socialInsEndMonth || terminationMonth,
+        housingFundEndMonth: form.housingFundEndMonth || terminationMonth,
+      })
+    } else {
+      // 非主动离职：跳转 Termination 向导，通过 URL 参数传递
+      const params = new URLSearchParams({
+        employeeId: employee.id,
+        reason: termType,
+      })
+      window.location.href = `/termination?${params.toString()}`
+    }
+  }
+
+  return (
+    <Modal open onClose={onClose} title={`办理离职/解聘 - ${employee.name}`}>
+      <div className="space-y-3">
+        {/* 解聘类型选择 */}
+        <div>
+          <Label>离职/解聘类型</Label>
+          <Select value={termType} onChange={(e) => setTermType(e.target.value as any)}>
+            <option value="RESIGNATION">主动离职（快速办理）</option>
+            <option value="NEGOTIATED">协商解除</option>
+            <option value="FAULT">过错解除</option>
+            <option value="NONFAULT">非过错解除</option>
+            <option value="LAYOFF">裁员</option>
+            <option value="EXPIRED">到期不续签</option>
+            <option value="ILLEGAL">违法解除</option>
+          </Select>
+        </div>
+        {termType === 'RESIGNATION' ? (
+          <>
+            <div className="bg-blue-50 text-blue-700 text-xs px-3 py-2 rounded-md">
+              员工主动离职，不涉及经济补偿金。离职日期可在未来（提前办理），到日期后状态自动变为离职。
+            </div>
+            <div>
+              <Label>员工</Label>
+              <div className="text-xs text-gray-600">{employee.name} - {employee.department}</div>
+            </div>
+            <div>
+              <Label>离职日期</Label>
+              <Input
+                type="date"
+                value={form.terminationDate}
+                onChange={(e) => setForm({ ...form, terminationDate: e.target.value })}
+              />
+            </div>
+            <div>
+              <Label>离职原因</Label>
+              <Select value={form.resignationReason} onChange={(e) => setForm({ ...form, resignationReason: e.target.value })}>
+                {reasons.map((r) => <option key={r} value={r}>{r}</option>)}
+              </Select>
+            </div>
+            <div className="border-t pt-3">
+              <Label>社保公积金截止缴费年月</Label>
+              <div className="text-xs text-gray-400 mb-2">默认与离职日期同月，可手动修改</div>
+              <div className="grid grid-cols-2 gap-3">
+                <div>
+                  <Label>社保截止年月</Label>
+                  <Input type="month" value={form.socialInsEndMonth || terminationMonth} onChange={(e) => setForm({ ...form, socialInsEndMonth: e.target.value })} />
+                </div>
+                <div>
+                  <Label>公积金截止年月</Label>
+                  <Input type="month" value={form.housingFundEndMonth || terminationMonth} onChange={(e) => setForm({ ...form, housingFundEndMonth: e.target.value })} />
+                </div>
+              </div>
+              {((form.socialInsEndMonth && form.socialInsEndMonth !== terminationMonth) || (form.housingFundEndMonth && form.housingFundEndMonth !== terminationMonth)) && (
+                <div className="flex items-center gap-2 px-3 py-2 rounded-md bg-amber-50 text-warning text-xs mt-2">
+                  <AlertTriangle className="w-4 h-4 shrink-0" />
+                  截止缴费年月与离职日期不在同月，请确认是否为多缴/少缴月份。
+                </div>
+              )}
+            </div>
+            <div>
+              <Label>备注（选填）</Label>
+              <Input value={form.remark} onChange={(e) => setForm({ ...form, remark: e.target.value })} placeholder="补充说明" />
+            </div>
+          </>
+        ) : (
+          <div className="bg-amber-50 text-amber-700 text-xs px-3 py-2 rounded-md space-y-1">
+            <div className="font-medium">解聘流程</div>
+            <p>选择"{termType === 'NEGOTIATED' ? '协商解除' : termType === 'FAULT' ? '过错解除' : termType === 'NONFAULT' ? '非过错解除' : termType === 'LAYOFF' ? '裁员' : termType === 'EXPIRED' ? '到期不续签' : '违法解除'}"将进入解聘向导，支持补偿金计算、合规检查、工作交接等完整流程。</p>
+            <p>点击"进入解聘向导"跳转到解聘补偿页面。</p>
+          </div>
+        )}
+        {error && (
+          <div className="text-xs text-danger">
+            {(error as any)?.response?.data?.error?.message || '操作失败，请重试'}
+          </div>
+        )}
+        <div className="flex justify-end gap-2 pt-2">
+          <Button variant="secondary" onClick={onClose}>取消</Button>
+          <Button onClick={handleSubmit} disabled={loading}>
+            {termType === 'RESIGNATION' ? (loading ? '提交中...' : '确认离职') : '进入解聘向导'}
+          </Button>
+        </div>
+      </div>
+    </Modal>
+  )
+}
+
+/** 转正确认弹窗 */
+export function ConfirmModal({ employee, onClose, onSubmit, loading, error }: {
+  employee: any
+  onClose: () => void
+  onSubmit: (data: any) => void
+  loading: boolean
+  error: any
+}) {
+  const [form, setForm] = useState({
+    confirmDate: new Date().toISOString().slice(0, 10),
+    regularSalary: '',
+  })
+
   const handleSubmit = () => {
     onSubmit({
       employeeId: employee.id,
-      terminationDate: new Date(form.terminationDate).toISOString(),
-      resignationReason: form.resignationReason,
-      remark: form.remark || undefined,
-      socialInsEndMonth: form.socialInsEndMonth || terminationMonth,
-      housingFundEndMonth: form.housingFundEndMonth || terminationMonth,
+      confirmDate: new Date(form.confirmDate).toISOString(),
+      regularSalary: form.regularSalary ? Number(form.regularSalary) : undefined,
     })
   }
 
   return (
-    <Modal open onClose={onClose} title={`办理离职 - ${employee.name}`}>
+    <Modal open onClose={onClose} title={`办理转正 - ${employee.name}`}>
       <div className="space-y-3">
         <div className="bg-blue-50 text-blue-700 text-xs px-3 py-2 rounded-md">
-          员工主动离职，不涉及经济补偿金。离职日期可在未来（提前办理），到日期后状态自动变为离职。
+          员工试用期结束，确认转正。转正后薪资将更新到花名册。
         </div>
         <div>
           <Label>员工</Label>
           <div className="text-xs text-gray-600">{employee.name} - {employee.department}</div>
         </div>
         <div>
-          <Label>离职日期</Label>
-          <Input
-            type="date"
-            value={form.terminationDate}
-            onChange={(e) => setForm({ ...form, terminationDate: e.target.value })}
-          />
+          <Label>转正日期 *</Label>
+          <Input type="date" value={form.confirmDate} onChange={(e) => setForm({ ...form, confirmDate: e.target.value })} />
         </div>
         <div>
-          <Label>离职原因</Label>
-          <Select value={form.resignationReason} onChange={(e) => setForm({ ...form, resignationReason: e.target.value })}>
-            {reasons.map((r) => <option key={r} value={r}>{r}</option>)}
-          </Select>
-        </div>
-        <div className="border-t pt-3">
-          <Label>社保公积金截止缴费年月</Label>
-          <div className="text-xs text-gray-400 mb-2">默认与离职日期同月，可手动修改</div>
-          <div className="grid grid-cols-2 gap-3">
-            <div>
-              <Label>社保截止年月</Label>
-              <Input type="month" value={form.socialInsEndMonth || terminationMonth} onChange={(e) => setForm({ ...form, socialInsEndMonth: e.target.value })} />
-            </div>
-            <div>
-              <Label>公积金截止年月</Label>
-              <Input type="month" value={form.housingFundEndMonth || terminationMonth} onChange={(e) => setForm({ ...form, housingFundEndMonth: e.target.value })} />
-            </div>
-          </div>
-          {((form.socialInsEndMonth && form.socialInsEndMonth !== terminationMonth) || (form.housingFundEndMonth && form.housingFundEndMonth !== terminationMonth)) && (
-            <div className="flex items-center gap-2 px-3 py-2 rounded-md bg-amber-50 text-warning text-xs mt-2">
-              <AlertTriangle className="w-4 h-4 shrink-0" />
-              截止缴费年月与离职日期不在同月，请确认是否为多缴/少缴月份。
-            </div>
-          )}
-        </div>
-        <div>
-          <Label>备注（选填）</Label>
-          <Input value={form.remark} onChange={(e) => setForm({ ...form, remark: e.target.value })} placeholder="补充说明" />
+          <Label>转正薪资（选填）</Label>
+          <Input type="number" value={form.regularSalary} onChange={(e) => setForm({ ...form, regularSalary: e.target.value })} placeholder="不填则保持原薪资" />
+          <div className="text-xs text-gray-400 mt-1">填写后将更新员工月工资并记录薪资变更</div>
         </div>
         {error && (
           <div className="text-xs text-danger">
@@ -224,7 +315,7 @@ export function ResignModal({ employee, onClose, onSubmit, loading, error }: {
         <div className="flex justify-end gap-2 pt-2">
           <Button variant="secondary" onClick={onClose}>取消</Button>
           <Button onClick={handleSubmit} disabled={loading}>
-            {loading ? '提交中...' : '确认离职'}
+            {loading ? '提交中...' : '确认转正'}
           </Button>
         </div>
       </div>
@@ -554,8 +645,10 @@ export function AddEmployeeModal({ onClose, onSubmit, loading, error }: {
     }
   }
 
-  // 根据身份证号自动计算性别（第17位：奇数=男，偶数=女）+ 查重
+  // 根据证件号码自动计算性别（第17位：奇数=男，偶数=女）+ 查重 + 年龄合规筛查
   const [idCardDuplicate, setIdCardDuplicate] = useState<{ exists: boolean; employee?: any } | null>(null)
+  const [ageWarning, setAgeWarning] = useState<{ type: 'BLOCK' | 'WARN'; message: string } | null>(null)
+  const [phoneDuplicate, setPhoneDuplicate] = useState<{ exists: boolean; employee?: any } | null>(null)
   const handleIdCardChange = (idCard: string) => {
     let gender = form.gender
     if (idCard.length >= 17) {
@@ -564,10 +657,32 @@ export function AddEmployeeModal({ onClose, onSubmit, loading, error }: {
     }
     setForm({ ...form, idCardNumber: idCard, gender })
     setIdCardDuplicate(null)
+    setAgeWarning(null)
     if (idCard.length === 18) {
       employeeApi.checkIdCard(idCard).then((data: { exists: boolean; employee?: any }) => {
         setIdCardDuplicate(data)
       }).catch(() => {})
+      // 年龄合规筛查：从证件号码提取出生日期计算年龄
+      const birthYear = parseInt(idCard.substring(6, 10))
+      const birthMonth = parseInt(idCard.substring(10, 12))
+      const birthDay = parseInt(idCard.substring(12, 14))
+      if (!isNaN(birthYear) && !isNaN(birthMonth) && !isNaN(birthDay)) {
+        const today = new Date()
+        let age = today.getFullYear() - birthYear
+        const monthDiff = today.getMonth() - (birthMonth - 1)
+        if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDay)) {
+          age--
+        }
+        if (age < 16) {
+          setAgeWarning({ type: 'BLOCK', message: `该员工年龄 ${age} 岁，未满16周岁，禁止招用童工（《劳动法》第15条）` })
+        } else if (age < 18) {
+          setAgeWarning({ type: 'WARN', message: `该员工年龄 ${age} 岁，未满18周岁，属于未成年工，需遵守特殊保护规定（《劳动法》第58条）` })
+        } else if (gender === '男' && age >= 60) {
+          setAgeWarning({ type: 'WARN', message: `该员工年龄 ${age} 岁，已达法定退休年龄（男60岁），建议确认是否按退休处理` })
+        } else if (gender === '女' && age >= 50) {
+          setAgeWarning({ type: 'WARN', message: `该员工年龄 ${age} 岁，已达或接近法定退休年龄（女工人50岁/干部55岁），建议确认是否按退休处理` })
+        }
+      }
     }
   }
 
@@ -633,6 +748,11 @@ export function AddEmployeeModal({ onClose, onSubmit, loading, error }: {
   }
 
   const handleSubmit = () => {
+    // 童工阻断：未满16周岁禁止录入
+    if (ageWarning?.type === 'BLOCK') {
+      toast.error(ageWarning.message)
+      return
+    }
     const data: any = {
       name: form.name, department: form.department,
       position: form.position || undefined,
@@ -684,11 +804,17 @@ export function AddEmployeeModal({ onClose, onSubmit, loading, error }: {
           <div><Label>姓名 *</Label><Input value={form.name} onChange={(e) => setForm({ ...form, name: e.target.value })} placeholder="员工姓名" /></div>
           <div><Label>部门 *</Label><Input value={form.department} onChange={(e) => setForm({ ...form, department: e.target.value })} placeholder="如：技术部" /></div>
           <div><Label>职务/岗位</Label><Input value={form.position} onChange={(e) => setForm({ ...form, position: e.target.value })} placeholder="如：前端工程师" /></div>
-          <div><Label>身份证号 *</Label><Input value={form.idCardNumber} onChange={(e) => handleIdCardChange(e.target.value)} placeholder="18位" maxLength={18} /></div>
+          <div><Label>证件号码 *</Label><Input value={form.idCardNumber} onChange={(e) => handleIdCardChange(e.target.value)} placeholder="18位" maxLength={18} /></div>
           {idCardDuplicate?.exists && (
             <div className="col-span-4 px-3 py-2 rounded-md bg-amber-50 text-amber-700 text-xs flex items-center gap-2">
               <AlertTriangle className="w-4 h-4 shrink-0" />
-              <span>该身份证号已存在：{idCardDuplicate.employee?.name}（{idCardDuplicate.employee?.department}），请确认是否重复录入</span>
+              <span>该证件号码已存在：{idCardDuplicate.employee?.name}（{idCardDuplicate.employee?.department}），请确认是否重复录入</span>
+            </div>
+          )}
+          {ageWarning && (
+            <div className={`col-span-4 px-3 py-2 rounded-md text-xs flex items-center gap-2 ${ageWarning.type === 'BLOCK' ? 'bg-red-50 text-danger' : 'bg-amber-50 text-amber-700'}`}>
+              <AlertTriangle className="w-4 h-4 shrink-0" />
+              <span>{ageWarning.message}</span>
             </div>
           )}
           <div><Label>性别</Label><div className="text-sm text-gray-600 py-2">{form.idCardNumber.length >= 17 ? form.gender : '自动识别'}</div></div>
@@ -699,8 +825,23 @@ export function AddEmployeeModal({ onClose, onSubmit, loading, error }: {
         <div className="grid grid-cols-4 gap-4">
           <div><Label>入职日期 *</Label><Input type="date" value={form.hireDate} onChange={(e) => handleHireDateChange(e.target.value)} /></div>
           <div><Label>月工资 *</Label><Input type="number" value={form.monthlySalary} onChange={(e) => setForm({ ...form, monthlySalary: e.target.value })} placeholder="元" /></div>
-          <div><Label>手机号</Label><Input value={form.phone} onChange={(e) => setForm({ ...form, phone: e.target.value })} placeholder="选填" maxLength={11} /></div>
+          <div><Label>手机号</Label><Input value={form.phone} onChange={(e) => {
+            const phone = e.target.value.replace(/\D/g, '').slice(0, 11)
+            setForm({ ...form, phone })
+            setPhoneDuplicate(null)
+            if (phone.length === 11) {
+              employeeApi.checkPhone(phone).then((data: { exists: boolean; employee?: any }) => {
+                setPhoneDuplicate(data)
+              }).catch(() => {})
+            }
+          }} placeholder="选填" maxLength={11} /></div>
         </div>
+        {phoneDuplicate?.exists && (
+          <div className="px-3 py-2 rounded-md bg-amber-50 text-amber-700 text-xs flex items-center gap-2">
+            <AlertTriangle className="w-4 h-4 shrink-0" />
+            <span>该手机号已存在：{phoneDuplicate.employee?.name}（{phoneDuplicate.employee?.department}），请确认是否重复录入</span>
+          </div>
+        )}
         <div className="grid grid-cols-4 gap-4">
           <div><Label>参保城市</Label><Select value={form.city} onChange={async (e) => {
             const city = e.target.value

frontend/src/pages/social-insurance/CommercialInsuranceTab.tsx

@@ -199,7 +199,7 @@ export default function CommercialInsuranceTab() {
                   <tr className="border-b text-xs text-gray-500">
                     <th className="py-2 text-left">姓名</th>
                     <th className="py-2 text-left">部门</th>
-                    <th className="py-2 text-left">身份证号</th>
+                    <th className="py-2 text-left">证件号码</th>
                     <th className="py-2 text-right">保费</th>
                     <th className="py-2 text-left">生效日期</th>
                     <th className="py-2 text-left">状态</th>

frontend/src/pages/support/SupportDashboard.tsx

@@ -0,0 +1,221 @@
+/**
+ * 客服工作台 - 工单管理
+ */
+import { useState } from 'react'
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
+import { toast } from 'sonner'
+import { Plus, MessageSquare, Ticket as TicketIcon, Users, Building } from 'lucide-react'
+import Card from '../../components/ui/Card'
+import Button from '../../components/ui/Button'
+import { Input, Label, Select } from '../../components/ui/Input'
+import Modal from '../../components/ui/Modal'
+import api from '../../lib/api'
+
+export default function SupportDashboard() {
+  const [tab, setTab] = useState<'tickets' | 'tenants' | 'chat'>('tickets')
+  const [showCreate, setShowCreate] = useState(false)
+  const [form, setForm] = useState({ title: '', content: '', category: '', priority: 'NORMAL' })
+  const [selectedTicket, setSelectedTicket] = useState<any>(null)
+  const [reply, setReply] = useState('')
+  const queryClient = useQueryClient()
+
+  const { data: tickets = [], isLoading } = useQuery({
+    queryKey: ['support-tickets'],
+    queryFn: () => api.get('/support/tickets').then(r => r.data.data),
+  })
+
+  const { data: tenants = [] } = useQuery({
+    queryKey: ['support-tenants'],
+    queryFn: () => api.get('/support/tenants').then(r => r.data.data),
+    enabled: tab === 'tenants',
+  })
+
+  const createMutation = useMutation({
+    mutationFn: (data: any) => api.post('/support/tickets', data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['support-tickets'] })
+      setShowCreate(false)
+      setForm({ title: '', content: '', category: '', priority: 'NORMAL' })
+      toast.success('工单已创建')
+    },
+  })
+
+  const replyMutation = useMutation({
+    mutationFn: (data: { id: string; content: string }) => api.post(`/support/tickets/${data.id}/messages`, { content: data.content }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['support-tickets'] })
+      setReply('')
+    },
+  })
+
+  const closeMutation = useMutation({
+    mutationFn: (id: string) => api.post(`/support/tickets/${id}/close`),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['support-tickets'] })
+      setSelectedTicket(null)
+      toast.success('工单已关闭')
+    },
+  })
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <h1 className="text-xl font-semibold text-gray-900">客服工作台</h1>
+        <p className="text-sm text-gray-500 mt-1">工单管理、客户会话、租户数据穿透</p>
+      </div>
+
+      <div className="flex gap-2 border-b">
+        <button onClick={() => setTab('tickets')} className={`px-4 py-2 text-sm font-medium border-b-2 ${tab === 'tickets' ? 'border-primary text-primary' : 'border-transparent text-gray-500'}`}>
+          <TicketIcon className="w-4 h-4 inline mr-1" />工单管理
+        </button>
+        <button onClick={() => setTab('tenants')} className={`px-4 py-2 text-sm font-medium border-b-2 ${tab === 'tenants' ? 'border-primary text-primary' : 'border-transparent text-gray-500'}`}>
+          <Building className="w-4 h-4 inline mr-1" />租户管理
+        </button>
+        <button onClick={() => setTab('chat')} className={`px-4 py-2 text-sm font-medium border-b-2 ${tab === 'chat' ? 'border-primary text-primary' : 'border-transparent text-gray-500'}`}>
+          <MessageSquare className="w-4 h-4 inline mr-1" />客户会话
+        </button>
+      </div>
+
+      {tab === 'tickets' && (
+        <Card className="p-4">
+          <div className="flex justify-between items-center mb-3">
+            <span className="text-sm font-medium">工单列表</span>
+            <Button size="sm" onClick={() => setShowCreate(true)}>
+              <Plus className="w-4 h-4 mr-1" />提交工单
+            </Button>
+          </div>
+          {isLoading ? (
+            <div className="text-center py-8 text-gray-400 text-sm">加载中...</div>
+          ) : tickets.length === 0 ? (
+            <div className="text-center py-8 text-gray-400 text-sm">暂无工单</div>
+          ) : (
+            <div className="space-y-2">
+              {tickets.map((t: any) => (
+                <div
+                  key={t.id}
+                  className="border rounded-md p-3 hover:bg-gray-50 cursor-pointer"
+                  onClick={() => setSelectedTicket(t)}
+                >
+                  <div className="flex items-center justify-between">
+                    <span className="text-sm font-medium">{t.title}</span>
+                    <div className="flex items-center gap-2">
+                      <span className={`text-xs px-2 py-0.5 rounded ${t.status === 'OPEN' ? 'bg-blue-50 text-blue-600' : t.status === 'IN_PROGRESS' ? 'bg-amber-50 text-amber-600' : t.status === 'RESOLVED' ? 'bg-green-50 text-green-600' : 'bg-gray-100 text-gray-500'}`}>
+                        {t.status === 'OPEN' ? '待处理' : t.status === 'IN_PROGRESS' ? '处理中' : t.status === 'RESOLVED' ? '已解决' : '已关闭'}
+                      </span>
+                      <span className={`text-xs px-2 py-0.5 rounded ${t.priority === 'URGENT' ? 'bg-red-50 text-red-600' : t.priority === 'HIGH' ? 'bg-orange-50 text-orange-600' : 'bg-gray-100 text-gray-500'}`}>
+                        {t.priority === 'URGENT' ? '紧急' : t.priority === 'HIGH' ? '高' : t.priority === 'NORMAL' ? '普通' : '低'}
+                      </span>
+                    </div>
+                  </div>
+                  <div className="text-xs text-gray-500 mt-1">{t.org?.name} · {t._count?.messages || 0}条回复 · {new Date(t.createdAt).toLocaleString()}</div>
+                </div>
+              ))}
+            </div>
+          )}
+        </Card>
+      )}
+
+      {tab === 'tenants' && (
+        <Card className="p-4">
+          <div className="text-sm font-medium mb-3">租户列表</div>
+          {tenants.length === 0 ? (
+            <div className="text-center py-8 text-gray-400 text-sm">暂无租户</div>
+          ) : (
+            <div className="space-y-2">
+              {tenants.map((t: any) => (
+                <div key={t.id} className="border rounded-md p-3">
+                  <div className="flex items-center justify-between">
+                    <div>
+                      <span className="text-sm font-medium">{t.name}</span>
+                      <span className="text-xs text-gray-400 ml-2">{t.plan}套餐</span>
+                    </div>
+                    <div className="text-xs text-gray-500">
+                      {t._count?.employees || 0}员工 · {t._count?.users || 0}用户
+                    </div>
+                  </div>
+                  <div className="text-xs text-gray-400 mt-1">
+                    联系人：{t.contactName || '未设置'} · {t.contactPhone || '无'}
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </Card>
+      )}
+
+      {tab === 'chat' && (
+        <Card className="p-4">
+          <div className="text-center py-8 text-gray-400 text-sm">客户会话功能开发中</div>
+        </Card>
+      )}
+
+      {/* 创建工单弹窗 */}
+      {showCreate && (
+        <Modal open onClose={() => setShowCreate(false)} title="提交工单">
+          <div className="space-y-3">
+            <div>
+              <Label>标题 *</Label>
+              <Input value={form.title} onChange={(e) => setForm({ ...form, title: e.target.value })} placeholder="简要描述问题" />
+            </div>
+            <div>
+              <Label>内容 *</Label>
+              <textarea value={form.content} onChange={(e) => setForm({ ...form, content: e.target.value })} placeholder="详细描述问题" rows={4} />
+            </div>
+            <div className="grid grid-cols-2 gap-3">
+              <div>
+                <Label>分类</Label>
+                <Select value={form.category} onChange={(e) => setForm({ ...form, category: e.target.value })}>
+                  <option value="">请选择</option>
+                  <option value="BUG">系统Bug</option>
+                  <option value="CONSULT">功能咨询</option>
+                  <option value="DATA">数据问题</option>
+                  <option value="OTHER">其他</option>
+                </Select>
+              </div>
+              <div>
+                <Label>优先级</Label>
+                <Select value={form.priority} onChange={(e) => setForm({ ...form, priority: e.target.value })}>
+                  <option value="LOW">低</option>
+                  <option value="NORMAL">普通</option>
+                  <option value="HIGH">高</option>
+                  <option value="URGENT">紧急</option>
+                </Select>
+              </div>
+            </div>
+            <div className="flex justify-end gap-2 pt-2">
+              <Button variant="secondary" onClick={() => setShowCreate(false)}>取消</Button>
+              <Button onClick={() => createMutation.mutate(form)} disabled={!form.title || !form.content}>提交</Button>
+            </div>
+          </div>
+        </Modal>
+      )}
+
+      {/* 工单详情弹窗 */}
+      {selectedTicket && (
+        <Modal open onClose={() => setSelectedTicket(null)} title={selectedTicket.title} size="lg">
+          <div className="space-y-3">
+            <div className="text-xs text-gray-500">{selectedTicket.org?.name} · {new Date(selectedTicket.createdAt).toLocaleString()}</div>
+            <div className="text-sm text-gray-700 bg-gray-50 p-3 rounded-md">{selectedTicket.content}</div>
+            {selectedTicket.messages?.map((m: any, i: number) => (
+              <div key={i} className={`text-sm p-2 rounded-md ${m.senderRole === 'SUPPORT' ? 'bg-blue-50 text-right' : 'bg-gray-50'}`}>
+                <div className="text-xs text-gray-400 mb-1">{m.senderRole === 'SUPPORT' ? '客服' : '客户'} · {new Date(m.createdAt).toLocaleString()}</div>
+                {m.content}
+              </div>
+            ))}
+            {selectedTicket.status !== 'CLOSED' && (
+              <>
+                <div className="flex gap-2">
+                  <Input value={reply} onChange={(e) => setReply(e.target.value)} placeholder="输入回复内容" onKeyDown={(e) => { if (e.key === 'Enter' && reply) replyMutation.mutate({ id: selectedTicket.id, content: reply }) }} />
+                  <Button onClick={() => reply && replyMutation.mutate({ id: selectedTicket.id, content: reply })}>回复</Button>
+                </div>
+                <div className="flex justify-end">
+                  <Button variant="secondary" onClick={() => closeMutation.mutate(selectedTicket.id)}>关闭工单</Button>
+                </div>
+              </>
+            )}
+          </div>
+        </Modal>
+      )}
+    </div>
+  )
+}