修复押金与待解冻资金处理
This commit is contained in:
@@ -1935,7 +1935,7 @@ export default function WorkOrdersPanel() {
|
||||
type="warning"
|
||||
message={`该工单当前待解冻押金 ${formatMoney(
|
||||
deductOrder.pendingUnfreezeAmount,
|
||||
)},扣减后剩余部分仍按原计划解冻。`}
|
||||
)}(不含待解冻报酬),扣减后剩余部分仍按原计划解冻。`}
|
||||
style={{ marginBottom: 16 }}
|
||||
/>
|
||||
<Form.Item
|
||||
|
||||
@@ -28,7 +28,9 @@ const LEDGER_TYPE_LABELS: Record<string, string> = {
|
||||
deposit_freeze: '冻结押金',
|
||||
deposit_release: '释放押金',
|
||||
deposit_pending_unfreeze: '待解冻金额',
|
||||
reward_pending_unfreeze: '报酬待解冻',
|
||||
deposit_unfreeze: '押金已解冻',
|
||||
reward_unfreeze: '报酬已解冻',
|
||||
deposit_deduction: '扣除押金',
|
||||
reward_settlement: '结算报酬',
|
||||
sharing_reward: '拼单报酬',
|
||||
@@ -44,10 +46,15 @@ function formatLedgerType(ledgerType: string) {
|
||||
|
||||
function resolveLedgerTagColor(ledgerType: string) {
|
||||
if (
|
||||
['deposit_freeze', 'deposit_pending_unfreeze', 'after_sales_debt_offset'].includes(ledgerType)
|
||||
[
|
||||
'deposit_freeze',
|
||||
'deposit_pending_unfreeze',
|
||||
'reward_pending_unfreeze',
|
||||
'after_sales_debt_offset',
|
||||
].includes(ledgerType)
|
||||
)
|
||||
return 'gold'
|
||||
if (['deposit_release', 'deposit_unfreeze', 'after_sales_refund'].includes(ledgerType))
|
||||
if (['deposit_release', 'deposit_unfreeze', 'reward_unfreeze', 'after_sales_refund'].includes(ledgerType))
|
||||
return 'green'
|
||||
if (
|
||||
[
|
||||
@@ -206,6 +213,18 @@ function UnfreezesSection({ workerId }: { workerId: number }) {
|
||||
})
|
||||
const data = unfreezesQuery.data?.data
|
||||
const columns: TableColumnsType<WorkerDepositUnfreeze> = [
|
||||
{
|
||||
title: '资金类型',
|
||||
width: 110,
|
||||
render: (_, row) => {
|
||||
const labels: Record<string, string> = {
|
||||
deposit: '押金',
|
||||
reward: '报酬',
|
||||
legacy_combined: '历史合并',
|
||||
}
|
||||
return <Tag>{labels[row.fundType] || row.fundType}</Tag>
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '金额',
|
||||
width: 110,
|
||||
|
||||
Reference in New Issue
Block a user