diff --git a/src/views/dashboard/DailyProfitReport.vue b/src/views/dashboard/DailyProfitReport.vue index 063f1fb..dc3d0e4 100644 --- a/src/views/dashboard/DailyProfitReport.vue +++ b/src/views/dashboard/DailyProfitReport.vue @@ -113,7 +113,7 @@ export default { show: true, }, series: [{ - name: '订单服务费收入(元)', + name: '订单服务费收入', type: 'line', data: this.getChartData(this.billData, 'serviceAmount'), itemStyle: { @@ -122,7 +122,7 @@ export default { } }, },{ - name: '提现服务费收入(元)', + name: '提现服务费收入', type: 'line', data: this.getChartData(this.billData, 'withdrawServiceAmount'), itemStyle: { @@ -131,7 +131,7 @@ export default { } }, }, { - name: '月费收入(元)', + name: '月费收入', type: 'line', data: this.getChartData(this.billData, 'monthAmount'), itemStyle: { @@ -140,7 +140,7 @@ export default { } }, }, { - name: '订单手机号收入(元)', + name: '手机号收入', type: 'line', data: this.getChartData(this.billData, 'billMobileAmount'), itemStyle: { @@ -149,7 +149,7 @@ export default { } }, }, { - name: '渠道成本(元)', + name: '渠道成本', type: 'line', data: this.getChartData(this.billData, 'channelCost'), itemStyle: { @@ -157,6 +157,15 @@ export default { color: '#ffb731', } }, + }, { + name: '平台收益', + type: 'line', + data: this.billData.map(item => item.serviceAmount + item.monthAmount + item.billMobileAmount + item.withdrawServiceAmount - item.channelCost), + itemStyle: { + normal: { + color: '#ed4b4b', + } + }, }, ] }) diff --git a/src/views/ss/bonus/index.vue b/src/views/ss/bonus/index.vue index e894550..5273019 100644 --- a/src/views/ss/bonus/index.vue +++ b/src/views/ss/bonus/index.vue @@ -53,6 +53,18 @@ + + + 搜索 重置 @@ -296,6 +308,7 @@ export default { isAsc: defaultSort.order, arrivalTypes: [], hasRefund: null, + createDateRange: [], id: null, billId: null, billNo: null, diff --git a/src/views/ss/reconciliationDate/components/ReconcilicationDateChart.vue b/src/views/ss/reconciliationDate/components/ReconcilicationDateChart.vue new file mode 100644 index 0000000..61b1777 --- /dev/null +++ b/src/views/ss/reconciliationDate/components/ReconcilicationDateChart.vue @@ -0,0 +1,260 @@ + + + + + \ No newline at end of file diff --git a/src/views/ss/reconciliationDate/index.vue b/src/views/ss/reconciliationDate/index.vue index 949fb00..4a35707 100644 --- a/src/views/ss/reconciliationDate/index.vue +++ b/src/views/ss/reconciliationDate/index.vue @@ -30,6 +30,16 @@ v-hasPermi="['ss:reconciliationDate:export']" >导出 + + 查看图表 + @@ -39,19 +49,26 @@ show-icon>
订单实收 = 订单总额 - 订单退款总额
-
总分成 = 用户分成 + 平台分成
+
分成总计 = 用户分成 + 平台分成
用户退款 = 用户分成退款金额
平台退款 = 平台分成退款金额
分成退款 = 用户退款 + 平台退款
实际分成 = 总分成 - 分成退款
-
差额 = 订单实收 - 实际分成
-
应收账 = 月费 + 订单手机号服务费 + 其他费用
-
平台收益 = 平台分成 + 应收账 - 平台退款
+
收支差额 = 订单实收 - 实际分成
+
应收金额 = 月费 + 订单手机号服务费 + 其他费用
+
平台收益 = 平台分成 + 应收金额 + 提现服务费 - 平台分成退款 - 渠道成本
- - + @@ -60,10 +77,10 @@ @@ -75,10 +92,10 @@ @@ -86,14 +103,14 @@ + +