From 83ce8afefc8522474f687142cce4073e2ecc06f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=90=A6?= Date: Mon, 13 Jul 2026 12:54:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=8E=A8=E5=B9=BF=E5=91=98=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clinic-salesperson/commission.vue | 6 ++--- .../business/clinic-salesperson/earnings.vue | 2 +- .../business/clinic-salesperson/index.vue | 2 +- .../settings/components/SalespersonCard.vue | 2 +- .../SalespersonCommissionDrawer.vue | 26 +++++++++---------- .../SalespersonCommissionDrawer.vue | 26 +++++++++---------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/apps/web-antd/src/views/business/clinic-salesperson/commission.vue b/apps/web-antd/src/views/business/clinic-salesperson/commission.vue index 59e6288d..287ad35e 100644 --- a/apps/web-antd/src/views/business/clinic-salesperson/commission.vue +++ b/apps/web-antd/src/views/business/clinic-salesperson/commission.vue @@ -17,7 +17,7 @@ const orderNo = ref(''); const columns = [ { title: '订单号', dataIndex: 'order_no', key: 'order_no', width: 180 }, { title: '明细', dataIndex: 'drug_info', key: 'drug_info', ellipsis: true }, - { title: '分成金额', dataIndex: 'commission_amount', key: 'commission_amount', width: 100 }, + { title: '服务费', dataIndex: 'commission_amount', key: 'commission_amount', width: 100 }, { title: '状态', key: 'status', width: 90 }, { title: '支付时间', dataIndex: 'order_pay_at_text', key: 'order_pay_at_text', width: 170 }, ]; @@ -50,7 +50,7 @@ function onPageChange(p: number, ps: number) { diff --git a/apps/web-antd/src/views/system/store/components/SalespersonCommissionDrawer.vue b/apps/web-antd/src/views/system/store/components/SalespersonCommissionDrawer.vue index ec547200..5e9b7a70 100644 --- a/apps/web-antd/src/views/system/store/components/SalespersonCommissionDrawer.vue +++ b/apps/web-antd/src/views/system/store/components/SalespersonCommissionDrawer.vue @@ -57,7 +57,7 @@ const orderCommissionColumns = [ { title: '订单号', dataIndex: 'order_no', width: 150 }, { title: '订单状态', key: 'order_status', width: 90 }, { title: '明细数', dataIndex: 'item_count', width: 70 }, - { title: '净分成', key: 'net_commission', width: 90 }, + { title: '服务费', key: 'net_commission', width: 90 }, { title: '支付时间', dataIndex: 'order_pay_at_text', width: 160 }, { title: '操作', key: 'action', width: 140 }, ]; @@ -65,15 +65,15 @@ const orderCommissionColumns = [ const commissionDetailColumns = [ { title: '类型', dataIndex: 'record_type_text', width: 90 }, { title: '药品信息', dataIndex: 'drug_info', ellipsis: true }, - { title: '分成金额', key: 'commission_amount', width: 100 }, - { title: '分成时间', dataIndex: 'order_pay_at_text', width: 160 }, + { title: '服务费', key: 'commission_amount', width: 100 }, + { title: '服务费时间', dataIndex: 'order_pay_at_text', width: 160 }, ]; const settlementLineColumns = [ { title: '订单号', dataIndex: 'order_no', width: 160 }, { title: '药品信息', dataIndex: 'drug_info', ellipsis: true }, - { title: '分成金额', dataIndex: 'commission_amount', width: 100 }, - { title: '分成时间', dataIndex: 'order_pay_at_text', width: 170 }, + { title: '服务费', dataIndex: 'commission_amount', width: 100 }, + { title: '服务费时间', dataIndex: 'order_pay_at_text', width: 170 }, ]; const settlementColumns = [ @@ -169,7 +169,7 @@ async function showOrderDetail(record: { order_id: number; order_no: string }) { const reversingOrderIds = ref([]); -/** 手动退回分成(仅已退款/已取消订单) */ +/** 手动退回服务费(仅已退款/已取消订单) */ async function handleReverseCommission(record: { order_id: number; can_reverse_commission?: boolean; @@ -184,10 +184,10 @@ async function handleReverseCommission(record: { store_id: storeId.value, salesperson_id: salespersonId.value, }); - message.success('退回分成成功'); + message.success('退回服务费成功'); await loadCommission(); } catch (error: any) { - message.error(error?.message || '退回分成失败'); + message.error(error?.message || '退回服务费失败'); } finally { reversingOrderIds.value = reversingOrderIds.value.filter((id) => id !== record.order_id); } @@ -272,7 +272,7 @@ defineExpose({ open }); @@ -351,11 +351,11 @@ defineExpose({ open });