fix: 提成奖金、证据链条、风险中心姓名显示身份证号
后端: - commission-bonus.service.ts: listByMonth 查询加上 idCardNumber 并解密 - evidence.service.ts: getEvidenceList 加上 idCardNumber 并解密返回 employeeIdCardNumber - roster.routes.ts: 证据链接口返回 employee.idCardNumber,Excel 导出加上身份证号 前端: - CommissionBonus.tsx: 列表姓名下显示身份证号,下拉选项和编辑弹窗也加上 - EvidenceChain.tsx: 两处姓名显示加上身份证号,文本导出加上身份证号 - Evidence.tsx: 证据链列表页姓名后显示身份证号
This commit is contained in:
@@ -171,7 +171,10 @@ export default function CommissionBonus() {
|
||||
<tr><td colSpan={5} className="px-4 py-8 text-center text-gray-400">{month} 无提成奖金记录</td></tr>
|
||||
) : paged.map((r: any) => (
|
||||
<tr key={r.id} className="hover:bg-gray-50">
|
||||
<td className="px-4 py-2.5 text-sm text-gray-900">{r.employee?.name || '-'}</td>
|
||||
<td className="px-4 py-2.5 text-sm text-gray-900">
|
||||
{r.employee?.name || '-'}
|
||||
{r.employee?.idCardNumber && <div className="text-xs text-gray-400 font-mono">{r.employee.idCardNumber}</div>}
|
||||
</td>
|
||||
<td className="px-4 py-2.5 text-sm text-gray-500">{r.employee?.department || '-'}</td>
|
||||
<td className={`px-4 py-2.5 text-sm text-right font-medium ${r.amount >= 0 ? 'text-safe' : 'text-danger'}`}>
|
||||
{r.amount >= 0 ? '+' : ''}{fmt(r.amount)}
|
||||
@@ -241,7 +244,7 @@ function AddModal({ employees, month, onClose, onSubmit, saving }: {
|
||||
<Select value={employeeId} onChange={(e) => setEmployeeId(e.target.value)}>
|
||||
<option value="">请选择员工</option>
|
||||
{employees.map((e: any) => (
|
||||
<option key={e.id} value={e.id}>{e.name}({e.department})</option>
|
||||
<option key={e.id} value={e.id}>{e.name}({e.department}){e.idCardNumber ? ` ${e.idCardNumber}` : ''}</option>
|
||||
))}
|
||||
</Select>
|
||||
</div>
|
||||
@@ -281,7 +284,7 @@ function EditModal({ record, onClose, onSubmit, saving }: {
|
||||
const [remark, setRemark] = useState(record.remark || '')
|
||||
|
||||
return (
|
||||
<Modal open onClose={onClose} title={`编辑 - ${record.employee?.name || ''}`} size="md">
|
||||
<Modal open onClose={onClose} title={`编辑 - ${record.employee?.name || ''}${record.employee?.idCardNumber ? `(${record.employee.idCardNumber})` : ''}`} size="md">
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<Label>金额 *(正=奖金,负=扣款)</Label>
|
||||
|
||||
Reference in New Issue
Block a user