feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -887,9 +887,10 @@
|
||||
<div v-if="state.detail.partner_split" style="font-size:13px;font-weight:400;color:var(--sa-subfont)">
|
||||
<span v-if="Number(state.detail.partner_split.total_cash) > 0" style="margin-right: 14px;">
|
||||
本单现金合计 <strong style="color:#ff4d4f;font-size:14px">¥{{ state.detail.partner_split.total_cash }}</strong>
|
||||
<el-tag size="small" type="success" style="margin-left: 6px;">直入商城余额</el-tag>
|
||||
</span>
|
||||
<span v-if="Number(state.detail.partner_split.total_voucher) > 0" style="margin-right: 14px;">
|
||||
兑换券释放额度 <strong style="color:#e6a23c;font-size:14px">{{ state.detail.partner_split.total_voucher }}</strong>
|
||||
兑换券释放额度 <strong style="color:#e6a23c;font-size:14px">{{ state.detail.partner_split.total_voucher }} 个</strong>
|
||||
</span>
|
||||
<span v-if="state.detail.partner_split.settle_date">
|
||||
均分日 {{ state.detail.partner_split.settle_date }}
|
||||
@@ -941,7 +942,7 @@
|
||||
</template>
|
||||
<template v-else>
|
||||
<div v-if="scope.row.reward_type === 'voucher_grant'" style="font-weight: 600; color: #e6a23c;">
|
||||
{{ scope.row.amount_text || (scope.row.base_amount + ' 兑换券') }}
|
||||
{{ scope.row.amount_text || (scope.row.base_amount + ' 个') }}
|
||||
</div>
|
||||
<div v-else-if="Number(scope.row.amount) > 0" style="font-weight: 600; color: #ff4d4f;">
|
||||
¥{{ scope.row.amount }}
|
||||
@@ -955,6 +956,16 @@
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="入账账户" min-width="110">
|
||||
<template #default="scope">
|
||||
<el-tag
|
||||
size="small"
|
||||
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'commission' ? 'warning' : (scope.row.wallet_type === 'madow' ? 'primary' : 'info'))"
|
||||
>
|
||||
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红马豆' : '平台留存')) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" min-width="100">
|
||||
<template #default="scope">
|
||||
<el-tag
|
||||
|
||||
在新工单中引用
屏蔽一个用户