feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -52,6 +52,16 @@
|
||||
<el-table-column label="结算金额" min-width="90">
|
||||
<template #default="scope"> {{ scope.row.amount }} </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 === 'madow' ? 'primary' : (scope.row.wallet_type === 'commission' ? 'warning' : '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="110">
|
||||
<template #default="scope"> {{ scope.row.madow }} </template>
|
||||
</el-table-column>
|
||||
@@ -143,7 +153,7 @@
|
||||
</el-row>
|
||||
<div v-if="orderTreeDialog.data.voucher_plan" style="margin-top:12px;background:#fff;padding:8px 12px;border-radius:4px;border:1px dashed #dcdfe6;font-size:12px;color:#606266;">
|
||||
<span style="font-weight:600;color:#303133;">1.5倍消费补贴履约计划:</span>
|
||||
总额 ¥ {{ orderTreeDialog.data.voucher_plan.total_amount }},已释放 ¥ {{ orderTreeDialog.data.voucher_plan.released_amount }} (已释放 {{ orderTreeDialog.data.voucher_plan.released_days }}/365天),状态:{{ orderTreeDialog.data.voucher_plan.status_text }}
|
||||
总额 {{ orderTreeDialog.data.voucher_plan.total_amount }} 个,已释放 {{ orderTreeDialog.data.voucher_plan.released_amount }} 个 (已释放 {{ orderTreeDialog.data.voucher_plan.released_days }}/365天),状态:{{ orderTreeDialog.data.voucher_plan.status_text }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -161,6 +171,16 @@
|
||||
<span style="font-weight:600;color:#f56c6c;">¥ {{ scope.row.amount }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="入账账户" width="100">
|
||||
<template #default="scope">
|
||||
<el-tag
|
||||
size="small"
|
||||
:type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : 'info')"
|
||||
>
|
||||
{{ scope.row.wallet_type_text || '商城余额' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="madow" label="马豆" width="100"></el-table-column>
|
||||
<el-table-column prop="status_text" label="状态" width="80">
|
||||
<template #default="scope">
|
||||
|
||||
在新工单中引用
屏蔽一个用户