From 80b581ee1e23b29ab3616d177b69745e13d4a54b Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Wed, 29 Apr 2026 11:39:03 +0800 Subject: [PATCH] f --- apps/bdrp-admin-web/src/api/agent/agent.ts | 4 ++ .../agent/agent-commission-deduction/data.ts | 18 ++++++--- .../src/views/agent/agent-reward/data.ts | 39 +++++++++++++------ 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/apps/bdrp-admin-web/src/api/agent/agent.ts b/apps/bdrp-admin-web/src/api/agent/agent.ts index 0192101..885fbf2 100644 --- a/apps/bdrp-admin-web/src/api/agent/agent.ts +++ b/apps/bdrp-admin-web/src/api/agent/agent.ts @@ -98,6 +98,8 @@ export namespace AgentApi { relation_agent_id: number; amount: number; type: string; + status: number; + remark: string; create_time: string; } @@ -112,6 +114,7 @@ export namespace AgentApi { agent_id?: number; relation_agent_id?: number; type?: string; + status?: number; } // 代理提现相关接口 @@ -186,6 +189,7 @@ export interface GetAgentLinkProductStatisticsParams {} agent_id: number; deducted_agent_id: number; amount: number; + refunded_amount: number; product_name: string; type: 'cost' | 'pricing'; status: number; diff --git a/apps/bdrp-admin-web/src/views/agent/agent-commission-deduction/data.ts b/apps/bdrp-admin-web/src/views/agent/agent-commission-deduction/data.ts index 4a9e655..67316ae 100644 --- a/apps/bdrp-admin-web/src/views/agent/agent-commission-deduction/data.ts +++ b/apps/bdrp-admin-web/src/views/agent/agent-commission-deduction/data.ts @@ -24,6 +24,12 @@ export function useCommissionDeductionColumns(): VxeTableGridOptions['columns'] width: 120, formatter: ({ cellValue }) => `¥${cellValue.toFixed(2)}`, }, + { + title: '已退款金额', + field: 'refunded_amount', + width: 120, + formatter: ({ cellValue }) => `¥${(cellValue || 0).toFixed(2)}`, + }, { title: '产品名称', field: 'product_name', @@ -48,9 +54,9 @@ export function useCommissionDeductionColumns(): VxeTableGridOptions['columns'] cellRender: { name: 'CellTag', options: [ - { value: 0, color: 'warning', label: '待结算' }, - { value: 1, color: 'success', label: '已结算' }, - { value: 2, color: 'error', label: '已取消' }, + { value: 0, color: 'success', label: '正常' }, + { value: 1, color: 'warning', label: '部分退款' }, + { value: 2, color: 'error', label: '已退款' }, ], }, }, @@ -90,9 +96,9 @@ export function useCommissionDeductionFormSchema(): VbenFormSchema[] { component: 'Select', componentProps: { options: [ - { label: '待结算', value: 0 }, - { label: '已结算', value: 1 }, - { label: '已取消', value: 2 }, + { label: '正常', value: 0 }, + { label: '部分退款', value: 1 }, + { label: '已退款', value: 2 }, ], allowClear: true, }, diff --git a/apps/bdrp-admin-web/src/views/agent/agent-reward/data.ts b/apps/bdrp-admin-web/src/views/agent/agent-reward/data.ts index 957e43b..b666c18 100644 --- a/apps/bdrp-admin-web/src/views/agent/agent-reward/data.ts +++ b/apps/bdrp-admin-web/src/views/agent/agent-reward/data.ts @@ -24,7 +24,7 @@ export function useRewardColumns(): VxeTableGridOptions['columns'] { { title: '奖励类型', field: 'type', - width: 120, + width: 130, formatter: ({ cellValue }) => rewardTypeMap[cellValue] || cellValue || '-', }, { @@ -33,26 +33,28 @@ export function useRewardColumns(): VxeTableGridOptions['columns'] { width: 120, formatter: ({ cellValue }) => `¥${cellValue.toFixed(2)}`, }, - { - title: '关联订单', - field: 'order_id', - width: 120, - }, { title: '状态', field: 'status', width: 100, + cellRender: { + name: 'CellTag', + options: [ + { value: 0, color: 'success', label: '正常' }, + { value: 1, color: 'error', label: '已取消' }, + ], + }, }, { - title: '创建时间', + title: '备注', + field: 'remark', + width: 200, + }, + { + title: '奖励时间', field: 'create_time', width: 180, }, - { - title: '发放时间', - field: 'pay_time', - width: 180, - }, ]; } @@ -78,5 +80,18 @@ export function useRewardFormSchema(): VbenFormSchema[] { options: rewardTypeOptions, }, }, + { + fieldName: 'status', + label: '状态', + component: 'Select', + componentProps: { + allowClear: true, + placeholder: '请选择状态', + options: [ + { label: '正常', value: 0 }, + { label: '已取消', value: 1 }, + ], + }, + }, ]; }