xkyy/xk-admin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

1. 推广员文案修改
Some checks failed
CI / Test (ubuntu-latest) (push) Has been cancelled
Details
CI / Test (windows-latest) (push) Has been cancelled
Details
CI / Lint (ubuntu-latest) (push) Has been cancelled
Details
CI / Lint (windows-latest) (push) Has been cancelled
Details
CI / Check (ubuntu-latest) (push) Has been cancelled
Details
CI / Check (windows-latest) (push) Has been cancelled
Details
CI / CI OK (push) Has been cancelled
Details
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Playground Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Docs Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Antd Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Element Ftp (push) Has been cancelled
Details
Deploy Website on push / Deploy Push Naive Ftp (push) Has been cancelled
Details
Release Drafter / update_release_draft (push) Has been cancelled
Details

Browse Source
This commit is contained in:
李琦
2026-07-13 12:54:57 +08:00
parent a524982b87
commit 83ce8afefc
6 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web-antd/src/views/business/clinic-salesperson/commission.vue
View File

@@ -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) {
</script>
<template>
<Page auto-content-height title="分成记录">
<Page auto-content-height title="服务费记录">
<div class="mb-4">
<Input
v-model:value="orderNo"
@@ -61,7 +61,7 @@ function onPageChange(p: number, ps: number) {
/>
</div>
<Spin :spinning="loading">
<Empty v-if="!loading && !list.length" description="暂无分成记录" />
<Empty v-if="!loading && !list.length" description="暂无服务费记录" />
<Table
v-else
:columns="columns"

2
apps/web-antd/src/views/business/clinic-salesperson/earnings.vue
View File

@@ -64,7 +64,7 @@ function openQrCode(item: any) {
</Col>
<Col :span="6">
<Card>
<div class="text-gray-500">累计分成</div>
<div class="text-gray-500">累计服务费</div>
<div class="text-2xl font-semibold">
¥{{ info.stats?.money ?? '0.00' }}
</div>

2
apps/web-antd/src/views/business/clinic-salesperson/index.vue
View File

@@ -219,7 +219,7 @@ function tcmBaseLabel(type: number) {
<Space wrap>
<Button size="small" @click="openEditModal(item)">编辑</Button>
<Button size="small" type="primary" @click="openCommission(item)">
分成与结算
服务费与结算
</Button>
<Button size="small" @click="invitedDrawerRef?.open(item)">
下级推广员

2
apps/web-antd/src/views/business/store/settings/components/SalespersonCard.vue
View File

@@ -189,7 +189,7 @@ function tcmBaseLabel(type: number) {
<Space wrap class="w-full">
<Button size="small" type="primary" @click="openCommissionDrawer(item)">
分成与结算
服务费与结算
</Button>
<Button size="small" @click="invitedDrawerRef?.open(item)">
下级推广员

26
apps/web-antd/src/views/business/store/settings/components/SalespersonCommissionDrawer.vue
View File

@@ -58,7 +58,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 },
];
@@ -66,15 +66,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 = [
@@ -164,7 +164,7 @@ async function showOrderDetail(record: { order_id: number; order_no: string }) {
const reversingOrderIds = ref<number[]>([]);
/** 手动退回分成（仅已退款/已取消订单） */
/** 手动退回服务费（仅已退款/已取消订单） */
async function handleReverseCommission(record: { order_id: number }) {
if (!salespersonId.value || reversingOrderIds.value.includes(record.order_id)) {
return;
@@ -176,10 +176,10 @@ async function handleReverseCommission(record: { order_id: number }) {
store_id: 0,
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);
}
@@ -258,7 +258,7 @@ defineExpose({ open });
<template>
<Drawer
v-model:open="visible"
:title="`分成与结算 - ${salespersonName}`"
:title="`服务费与结算 - ${salespersonName}`"
width="920"
destroy-on-close
>
@@ -317,11 +317,11 @@ defineExpose({ open });
</Button>
<Popconfirm
v-if="record.can_reverse_commission"
title="确认退回该订单的推广员分成？"
title="确认退回该订单的推广员服务费？"
@confirm="handleReverseCommission(record)"
>
<Button type="link" size="small" danger :loading="reversingOrderIds.includes(record.order_id)">
退回分成
退回服务费
</Button>
</Popconfirm>
</template>
@@ -359,11 +359,11 @@ defineExpose({ open });
</Button>
<Popconfirm
v-if="record.can_reverse_commission"
title="确认退回该订单的推广员分成？"
title="确认退回该订单的推广员服务费？"
@confirm="handleReverseCommission(record)"
>
<Button type="link" size="small" danger :loading="reversingOrderIds.includes(record.order_id)">
退回分成
退回服务费
</Button>
</Popconfirm>
</template>

26
apps/web-antd/src/views/system/store/components/SalespersonCommissionDrawer.vue
View File

@@ -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<number[]>([]);
/** 手动退回分成（仅已退款/已取消订单） */
/** 手动退回服务费（仅已退款/已取消订单） */
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 });
</script>
<template>
<Drawer v-model:open="visible" :title="`推广员分成 - ${storeName}`" width="920" destroy-on-close>
<Drawer v-model:open="visible" :title="`推广员服务费 - ${storeName}`" width="920" destroy-on-close>
<div class="mb-4 flex flex-wrap items-center gap-3">
<span>推广员</span>
<Select
@@ -316,11 +316,11 @@ defineExpose({ open });
<Button type="link" size="small" @click="showOrderDetail(record)">查看明细</Button>
<Popconfirm
v-if="record.can_reverse_commission"
title="确认退回该订单的推广员分成？"
title="确认退回该订单的推广员服务费？"
@confirm="handleReverseCommission(record)"
>
<Button type="link" size="small" danger :loading="reversingOrderIds.includes(record.order_id)">
退回分成
退回服务费
</Button>
</Popconfirm>
</template>
@@ -351,11 +351,11 @@ defineExpose({ open });
<Button type="link" size="small" @click="showOrderDetail(record)">查看明细</Button>
<Popconfirm
v-if="record.can_reverse_commission"
title="确认退回该订单的推广员分成？"
title="确认退回该订单的推广员服务费？"
@confirm="handleReverseCommission(record)"
>
<Button type="link" size="small" danger :loading="reversingOrderIds.includes(record.order_id)">
退回分成
退回服务费
</Button>
</Popconfirm>
</template>