feat(shopDealerOrder): 调整分销商收益计算逻辑与展示结构- 修改收益计算标签名称与展示逻辑

- 更新一级与二级分销商的收益计算比例- 调整收益金额展示方式,移除输入框- 增加三级分销商展示逻辑
- 根据thirdUserId动态展示收益类型标签
- 更新收益计算公式,适配新的分销规则
This commit is contained in:
2025-10-13 02:16:55 +08:00
parent bab631b7e1
commit 12b1f8c026

View File

@@ -24,36 +24,31 @@
</a-divider> </a-divider>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12">
<a-form-item label="用户ID" name="userId">
{{ form.userId }}
</a-form-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="客户名称" name="comments"> <a-form-item label="客户名称" name="comments">
{{ form.comments }} {{ form.comments }}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="结算电量" name="orderPrice"> <a-form-item label="结算电量" name="orderPrice">
{{ parseFloat(form.orderPrice || 0).toFixed(2) }} {{ parseFloat(form.orderPrice || 0).toFixed(2) }}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="税率" name="rate"> <a-form-item label="税率" name="rate">
{{ form.rate }} {{ form.rate }}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12">
<a-form-item label="单价" name="price">
{{ form.price }}
</a-form-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="结算金额" name="payPrice"> <a-form-item label="结算金额" name="payPrice">
{{ parseFloat(form.settledPrice || 0).toFixed(2) }} {{ parseFloat(form.settledPrice || 0).toFixed(2) }}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="实发金额" name="payPrice"> <a-form-item label="实发金额" name="payPrice">
{{ parseFloat(form.payPrice || 0).toFixed(2) }} {{ parseFloat(form.payPrice || 0).toFixed(2) }}
@@ -65,13 +60,13 @@
<!-- 分销商信息 --> <!-- 分销商信息 -->
<a-divider orientation="left"> <a-divider orientation="left">
<span style="color: #1890ff; font-weight: 600;">推荐收益</span> <span style="color: #1890ff; font-weight: 600;">收益计算</span>
</a-divider> </a-divider>
<!-- 级分销商 --> <!-- 级分销商 -->
<div class="dealer-section"> <div class="dealer-section">
<h4 class="dealer-title"> <h4 class="dealer-title">
<a-tag color="red">收益</a-tag> <a-tag color="orange">推收益</a-tag>
</h4> </h4>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
@@ -84,27 +79,62 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="占比" name="rate"> <a-form-item label="占比" name="rate">
{{ '70%' }} {{ '30%' }}
</a-form-item> </a-form-item>
<a-form-item label="获取收益" name="firstMoney"> <a-form-item label="获取收益" name="firstMoney">
<a-input-number {{ form.firstMoney }}
:min="0" <!-- <a-input-number-->
:precision="2" <!-- :min="0"-->
placeholder="请输入一级分销佣金" <!-- :precision="2"-->
v-model:value="form.firstMoney" <!-- placeholder="请输入一级分销佣金"-->
style="width: 100%" <!-- v-model:value=""-->
> <!-- style="width: 100%"-->
<template #addonAfter></template> <!-- >-->
</a-input-number> <!-- <template #addonAfter></template>-->
<!-- </a-input-number>-->
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</div> </div>
<!-- 级分销商 --> <!-- 级分销商 -->
<div class="dealer-section"> <div class="dealer-section">
<h4 class="dealer-title"> <h4 class="dealer-title">
<a-tag color="orange">间推收益</a-tag> <a-tag color="orange">{{ form.thirdUserId > 0 ? '推荐收益' : '获取收益' }}</a-tag>
</h4>
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="用户ID" name="userId">
{{ form.userId }}
</a-form-item>
<a-form-item label="昵称" name="nickname">
{{ form.nickname }}
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="占比" name="rate">
{{ form?.thirdUserId > 0 ? '10%' : '70%' }}
</a-form-item>
<a-form-item label="获取收益" name="firstMoney">
{{ form.secondMoney }}
<!-- <a-input-number-->
<!-- :min="0"-->
<!-- :precision="2"-->
<!-- placeholder="请输入一级分销佣金"-->
<!-- v-model:value=""-->
<!-- style="width: 100%"-->
<!-- >-->
<!-- <template #addonAfter></template>-->
<!-- </a-input-number>-->
</a-form-item>
</a-col>
</a-row>
</div>
<!-- 三级分销商 -->
<div class="dealer-section" v-if="form.thirdUserId > 0">
<h4 class="dealer-title">
<a-tag color="orange">{{ form.thirdUserId > 0 ? '获取收益' : '推荐收益' }}</a-tag>
</h4> </h4>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
@@ -117,18 +147,19 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="占比" name="rate"> <a-form-item label="占比" name="rate">
{{ '30%' }} {{ '60%' }}
</a-form-item> </a-form-item>
<a-form-item label="获取收益" name="secondMoney"> <a-form-item label="获取收益" name="thirdMoney">
<a-input-number {{ form.thirdMoney }}
:min="0" <!-- <a-input-number-->
:precision="2" <!-- :min="0"-->
placeholder="请输入二级分销佣金" <!-- :precision="2"-->
v-model:value="form.secondMoney" <!-- placeholder="请输入二级分销佣金"-->
style="width: 100%" <!-- v-model:value=""-->
> <!-- style="width: 100%"-->
<template #addonAfter></template> <!-- >-->
</a-input-number> <!-- <template #addonAfter></template>-->
<!-- </a-input-number>-->
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@@ -265,7 +296,13 @@
if (props.data) { if (props.data) {
assignObject(form, props.data); assignObject(form, props.data);
if(props.data.orderPrice && props.data.rate){ if(props.data.orderPrice && props.data.rate){
form.firstMoney = (Number(props.data.payPrice) * 0.7).toFixed(2) form.firstMoney = (Number(props.data.payPrice) * 0.3).toFixed(2)
if(props.data.thirdUserId > 0){
form.secondMoney = (Number(props.data.payPrice) * 0.1).toFixed(2)
}else {
form.secondMoney = (Number(props.data.payPrice) * 0.7).toFixed(2)
}
form.thirdMoney = (Number(props.data.payPrice) * 0.6).toFixed(2)
} }
isUpdate.value = true; isUpdate.value = true;
} else { } else {