From 0b8ccd4602f69e8b5dde75ddddd05fb649821def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 6 Feb 2025 11:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ss/reconciliationDate/index.vue | 26 ++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/ss/reconciliationDate/index.vue b/src/views/ss/reconciliationDate/index.vue
index 675a217..015716d 100644
--- a/src/views/ss/reconciliationDate/index.vue
+++ b/src/views/ss/reconciliationDate/index.vue
@@ -59,7 +59,7 @@
         <div style="margin-right: 32px;">实际分成 = 总分成 - 分成退款</div>
         <div style="margin-right: 32px;">收支差额 = 订单实收 - 实际分成</div>
         <div style="margin-right: 32px;">应收金额 = 月费 + 订单手机号服务费 + 其他费用</div>
-        <div style="margin-right: 32px;">平台收益 = 平台分成 + 应收金额 + 提现服务费 - 平台分成退款 - 渠道成本</div>
+        <div style="margin-right: 32px;">平台收益 = 订单服务费 + 应收金额 + 提现服务费 - 服务费退款 - 渠道成本</div>
       </div>
     </el-alert>
 
@@ -87,10 +87,10 @@
       <el-table-column label="渠道" align="center" prop="channelName" sortable v-if="isShow('channelName')"/>
       <el-table-column label="订单" align="center">
         <template v-for="column of showColumns.filter(item => 
-          ['orderAmount', 'vipOrderAmount', 'orderTotalAmount', 'refundAmount', 'orderReceiveAmount'].includes(item.key))">
+          ['orderAmount', 'vipOrderAmount', 'orderTotalAmount', 'refundAmount', 'orderReceiveAmount', 'totalBonus', 'totalBonusRefund', 'actualBonus'].includes(item.key))">
           <el-table-column :key="column.key" :label="column.label" :prop="column.key" :align="column.align" :min-width="column.minWidth" :sort-orders="orderSorts" :sortable="column.sortable" :show-overflow-tooltip="column.overflow" :width="column.width">
             <template slot-scope="d">
-              <template v-if="column.key === 'orderReceiveAmount' && d.row.difference > 0" >
+              <template v-if="column.key === 'orderReceiveAmount' && d.row.difference !== 0" >
                 <el-tooltip
                   placement="top"
                   width="200"
@@ -99,27 +99,27 @@
                   <i class="el-icon-warning" style="color: red;"/>
                 </el-tooltip>
               </template>
-              {{d.row[column.key] | fix2}}
+              <span :style="{color: ['orderReceiveAmount'].includes(column.key) ? 'red' : ''}">{{d.row[column.key] | fix2}}</span>
             </template>
           </el-table-column>
         </template>
       </el-table-column>
       <el-table-column label="用户" align="center">
         <template v-for="column of showColumns.filter(item => 
-          ['userBonus', 'totalBonus', 'userBonusRefund', 'totalBonusRefund', 'actualBonus', 'difference', 'withdrawAmount'].includes(item.key))">
+          ['userBonus',  'userActualBonus', 'userBonusRefund', 'difference', 'withdrawAmount'].includes(item.key))">
           <el-table-column :key="column.key" :label="column.label" :prop="column.key" :align="column.align" :min-width="column.minWidth" :sort-orders="orderSorts" :sortable="column.sortable" :show-overflow-tooltip="column.overflow" :width="column.width">
             <template slot-scope="d">
-              {{d.row[column.key] | fix2}}
+              <span :style="{color: ['userActualBonus'].includes(column.key) ? 'red' : ''}">{{d.row[column.key] | fix2}}</span>
             </template>
           </el-table-column>
         </template>
       </el-table-column>
       <el-table-column label="平台" align="center">
         <template v-for="column of showColumns.filter(item => 
-          ['platformBonus', 'withdrawServiceFee', 'platformBonusRefund', 'channelCost', 'receiveAmount', 'platformIncome'].includes(item.key))">
+          ['platformBonus', 'platformActualBonus', 'withdrawServiceFee', 'platformBonusRefund', 'channelCost', 'receiveAmount', 'platformIncome'].includes(item.key))">
           <el-table-column :key="column.key" :label="column.label" :prop="column.key" :align="column.align" :min-width="column.minWidth" :sort-orders="orderSorts" :sortable="column.sortable" :show-overflow-tooltip="column.overflow" :width="column.width">
             <template slot-scope="d">
-              {{d.row[column.key] | fix2}}
+              <span :style="{color: ['platformActualBonus','platformIncome'].includes(column.key) ? 'red' : ''}">{{d.row[column.key] | fix2}}</span>
             </template>
           </el-table-column>
         </template>
@@ -173,16 +173,18 @@ export default {
         {key: 'orderTotalAmount', visible: true, label: '订单总额', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'refundAmount', visible: true, label: '订单退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'orderReceiveAmount', visible: true, label: '订单实收', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
-        {key: 'userBonus', visible: true, label: '用户分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'totalBonus', visible: false, label: '分成总计', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
-        {key: 'userBonusRefund', visible: true, label: '用户退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'totalBonusRefund', visible: false, label: '分成退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'actualBonus', visible: false, label: '实际分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'userBonus', visible: true, label: '用户分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'userBonusRefund', visible: true, label: '用户退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'userActualBonus', visible: true, label: '用户结算', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'difference', visible: false, label: '收支差额', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'withdrawAmount', visible: true, label: '提现金额', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
-        {key: 'platformBonus', visible: true, label: '订单服务费', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'platformBonus', visible: false, label: '平台分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'platformBonusRefund', visible: false, label: '平台分成退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'platformActualBonus', visible: true, label: '订单服务费实收', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'withdrawServiceFee', visible: true, label: '提现服务费', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
-        {key: 'platformBonusRefund', visible: true, label: '服务费退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'channelCost', visible: true, label: '渠道成本', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'receiveAmount', visible: true, label: '应收账', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
         {key: 'platformIncome', visible: true, label: '平台收益', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},