更新对账

2025-01-25 18:04:37 +08:00 · 2025-01-25 18:04:37 +08:00 · 5cd9a40550
commit 5cd9a40550
parent 77b0f8877a
4 changed files with 343 additions and 23 deletions
--- 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',
+            }
+          },
        },
        ]
      })
--- a/src/views/ss/bonus/index.vue
+++ b/src/views/ss/bonus/index.vue
@ -53,6 +53,18 @@
          <el-option label="否" :value="false" />
        </el-select>
      </el-form-item>
+      <el-form-item label="日期" prop="createDateRange">
+        <el-date-picker
+          v-model="queryParams.createDateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          clearable
+          @change="handleQuery"
+        />
+      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -296,6 +308,7 @@ export default {
        isAsc: defaultSort.order,
        arrivalTypes: [],
        hasRefund: null,
+        createDateRange: [],
        id: null,
        billId: null,
        billNo: null,
--- a/src/views/ss/reconciliationDate/components/ReconcilicationDateChart.vue
+++ b/src/views/ss/reconciliationDate/components/ReconcilicationDateChart.vue
@ -0,0 +1,260 @@
+<template>
+  <div class="chart-container">
+    <div ref="chartRef" style="width: 100%; height: 600px;"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+
+export default {
+  name: 'ReconcilicationDateChart',
+  props: {
+    data: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      // 默认显示的字段
+      defaultFields: [
+        'orderTotalAmount',
+        'orderReceiveAmount',
+        'refundAmount',
+        'totalBonus',
+        'totalBonusRefund',
+        'actualBonus',
+        'difference'
+      ],
+      // 使用右侧Y轴的字段
+      rightYAxisFields: [
+        'withdrawServiceFee',
+        'receiveAmount',
+        'platformIncome',
+        'channelCost',
+        'platformBonus',
+        'platformBonusRefund',
+      ],
+      // 字段颜色映射
+      fieldColors: {
+        // 主要数据（默认显示）
+        orderTotalAmount: '#2F54EB', // 深蓝色 - 表示总量
+        orderReceiveAmount: '#389E0D', // 深绿色 - 表示收入/正向
+        refundAmount: '#CF1322', // 深红色 - 表示退款/负向
+        totalBonus: '#531DAB', // 深紫色 - 表示分成总量
+        totalBonusRefund: '#D4380D', // 深橙红色 - 表示退款
+        actualBonus: '#006D75', // 深青色 - 表示实际数据
+        difference: '#D46B08', // 深橙色 - 表示差额
+        
+        // 其他字段的颜色（非默认显示）
+        orderAmount: '#595959', // 深灰色
+        vipOrderAmount: '#8C8C8C', // 中灰色
+        userBonus: '#9254DE', // 暗紫色
+        platformBonus: '#73D13D', // 暗绿色
+        userBonusRefund: '#FF7875', // 暗红色
+        platformBonusRefund: '#FF9C6E', // 暗橙色
+        withdrawAmount: '#D4B106', // 暗金色
+        withdrawServiceFee: '#40A9FF', // 中蓝色
+        receiveAmount: '#36CFC9', // 中青色
+        platformIncome: '#FFA940', // 中橙色
+        channelCost: '#D48806' // 暗金色
+      },
+      chartOptions: {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          },
+          formatter: function(params) {
+            let result = params[0].axisValueLabel + '<br/>';
+            // 分成两组：主轴和次轴
+            const mainAxis = [];
+            const secondAxis = [];
+            
+            params.forEach(param => {
+              const item = param.marker + param.seriesName + ': ' + param.value;
+              if (param.seriesName.includes('服务费') || 
+                  param.seriesName.includes('应收金额') || 
+                  param.seriesName.includes('平台收益') ||
+                  param.seriesName.includes('平台分成') ||
+                  param.seriesName.includes('平台退款') ||
+                  param.seriesName.includes('渠道成本')) {
+                secondAxis.push(item);
+              } else {
+                mainAxis.push(item);
+              }
+            });
+            
+            // 先显示主轴数据
+            result += mainAxis.join('<br/>');
+            // 如果有次轴数据，添加分隔线并显示次轴数据
+            if (secondAxis.length > 0) {
+              result += '<br/>------------------------<br/>';
+              result += secondAxis.join('<br/>');
+            }
+            
+            return result;
+          }
+        },
+        legend: {
+          type: 'plain',
+          data: [],
+          bottom: 10,
+          itemWidth: 25,
+          itemHeight: 14,
+          textStyle: {
+            fontSize: 12
+          },
+          selected: {},
+          formatter: function(name) {
+            return name.length > 6 ? name.slice(0, 6) + '...' : name;
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '15%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: []
+        },
+        yAxis: [
+          {
+            type: 'value',
+            name: '大额数据',
+            position: 'left',
+            axisLabel: {
+              formatter: '{value} 元'
+            }
+          },
+          {
+            type: 'value',
+            name: '小额数据',
+            position: 'right',
+            axisLabel: {
+              formatter: '{value} 元'
+            }
+          }
+        ],
+        series: []
+      }
+    }
+  },
+  watch: {
+    data: {
+      handler(newVal) {
+        this.updateChart()
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.updateChart()
+  },
+  beforeDestroy() {
+    if (this.chart) {
+      this.chart.dispose()
+      this.chart = null
+    }
+    window.removeEventListener('resize', this.handleResize)
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$refs.chartRef)
+      window.addEventListener('resize', this.handleResize)
+    },
+    handleResize() {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    },
+    updateChart() {
+      if (!this.data.length || !this.chart) return
+
+      // 按时间排序
+      const sortedData = [...this.data].sort((a, b) => new Date(a.date) - new Date(b.date))
+
+      // 准备数据
+      const dates = sortedData.map(item => item.date)
+      const seriesData = {}
+      const fieldGroups = {
+        '订单相关': ['orderAmount', 'vipOrderAmount', 'orderTotalAmount', 'refundAmount', 'orderReceiveAmount'],
+        '分成相关': ['userBonus', 'platformBonus', 'totalBonus', 'userBonusRefund', 'platformBonusRefund', 'totalBonusRefund', 'actualBonus'],
+        '其他数据': ['difference', 'withdrawAmount', 'withdrawServiceFee', 'receiveAmount', 'platformIncome', 'channelCost']
+      }
+
+      // 字段中文名映射
+      const fieldNameMap = {
+        orderAmount: '充值订单',
+        vipOrderAmount: '会员订单',
+        orderTotalAmount: '订单总额',
+        refundAmount: '订单退款',
+        orderReceiveAmount: '订单实收',
+        userBonus: '用户分成',
+        platformBonus: '平台分成',
+        totalBonus: '分成总计',
+        userBonusRefund: '用户退款',
+        platformBonusRefund: '平台退款',
+        totalBonusRefund: '分成退款',
+        actualBonus: '实际分成',
+        difference: '收支差额',
+        withdrawAmount: '提现金额',
+        withdrawServiceFee: '提现服务费',
+        receiveAmount: '应收金额',
+        platformIncome: '平台收益',
+        channelCost: '渠道成本'
+      }
+
+      // 设置图例选中状态
+      const legendSelected = {}
+      Object.keys(fieldNameMap).forEach(field => {
+        legendSelected[fieldNameMap[field]] = this.defaultFields.includes(field)
+      })
+
+      // 准备所有系列数据
+      Object.keys(fieldGroups).forEach(group => {
+        fieldGroups[group].forEach(field => {
+          seriesData[field] = {
+            name: fieldNameMap[field],
+            type: 'line',
+            smooth: true,
+            showSymbol: false,
+            yAxisIndex: this.rightYAxisFields.includes(field) ? 1 : 0, // 设置使用哪个Y轴
+            lineStyle: {
+              width: 2
+            },
+            itemStyle: {
+              color: this.fieldColors[field]
+            },
+            data: sortedData.map(item => Number(item[field]).toFixed(2))
+          }
+        })
+      })
+
+      // 更新图表配置
+      this.chartOptions.xAxis.data = dates
+      this.chartOptions.legend.data = Object.values(fieldNameMap)
+      this.chartOptions.legend.selected = legendSelected
+      this.chartOptions.series = Object.values(seriesData)
+
+      // 设置图表
+      this.chart.setOption(this.chartOptions)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.chart-container {
+  background: #fff;
+  padding: 20px;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+}
+</style>
--- a/src/views/ss/reconciliationDate/index.vue
+++ b/src/views/ss/reconciliationDate/index.vue
@ -30,6 +30,16 @@
          v-hasPermi="['ss:reconciliationDate:export']"
        >导出</el-button>
      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          @click="handleViewChart"
+          v-hasPermi="['ss:reconciliationDate:export']"
+        >查看图表</el-button>
+      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
    </el-row>

@ -39,19 +49,26 @@
      show-icon>
      <div style="display: flex; flex-direction: row; flex-wrap: wrap; ">
        <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 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 style="margin-right: 32px;">收支差额 = 订单实收 - 实际分成</div>
+        <div style="margin-right: 32px;">应收金额 = 月费 + 订单手机号服务费 + 其他费用</div>
+        <div style="margin-right: 32px;">平台收益 = 平台分成 + 应收金额 + 提现服务费 - 平台分成退款 - 渠道成本</div>
      </div>
    </el-alert>

-    <el-table v-loading="loading" :data="reconciliationDateList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table 
+      v-loading="loading" 
+      :data="reconciliationDateList" 
+      @selection-change="handleSelectionChange" 
+      :default-sort="defaultSort"  
+      @sort-change="onSortChange"
+      header-row-class-name="header-row"
+      size="mini"
+    >
      <el-table-column label="ID" align="center" prop="id" sortable v-if="isShow('id')"/>
      <el-table-column label="日期" align="center" prop="date" sortable v-if="isShow('date')"/>
      <el-table-column label="订单" align="center">
@ -60,10 +77,10 @@
          <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="['orderReceiveAmount'].includes(column.key)">
-                <span :style="{color: d.row[column.key] > 0 ? 'red' : 'green'}">{{d.row[column.key] | fix2}} 元</span>
+                <span :style="{color: d.row[column.key] > 0 ? 'red' : 'green'}">{{d.row[column.key] | fix2}}</span>
              </template>
              <template v-else>
-                {{d.row[column.key] | fix2}} 元
+                {{d.row[column.key] | fix2}}
              </template>
            </template>
          </el-table-column>
@ -75,10 +92,10 @@
          <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="['actualBonus'].includes(column.key)">
-                <span :style="{color: d.row[column.key] > 0 ? 'red' : 'green'}">{{d.row[column.key] | fix2}} 元</span>
+                <span :style="{color: d.row[column.key] > 0 ? 'red' : 'green'}">{{d.row[column.key] | fix2}}</span>
              </template>
              <template v-else>
-                {{d.row[column.key] | fix2}} 元
+                {{d.row[column.key] | fix2}}
              </template>
            </template>
          </el-table-column>
@ -86,14 +103,14 @@
      </el-table-column>
      <el-table-column label="其他" align="center">
        <template v-for="column of showColumns.filter(item => 
-          ['difference', 'withdrawAmount', 'receiveAmount', 'platformIncome'].includes(item.key))">
+          ['difference', 'withdrawAmount', 'withdrawServiceFee', 'receiveAmount', 'platformIncome', 'channelCost'].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="['platformIncome', 'difference'].includes(column.key)">
-                <span :style="{color: d.row[column.key] > 0 ? 'red' : 'green'}">{{d.row[column.key] | fix2}} 元</span>
+                <span :style="{color: d.row[column.key] > 0 ? 'red' : 'green'}">{{d.row[column.key] | fix2}}</span>
              </template>
              <template v-else>
-                {{d.row[column.key] | fix2}} 元
+                {{d.row[column.key] | fix2}}
              </template>
            </template>
          </el-table-column>
@ -109,10 +126,15 @@
      @pagination="getList"
    />

+    <el-dialog title="图表" :visible.sync="chartVisible" width="80%">
+      <reconcilication-date-chart v-if="chartVisible" :data="reconciliationDateList" />
+    </el-dialog>
+
  </div>
 </template>

 <script>
+import ReconcilicationDateChart from '@/views/ss/reconciliationDate/components/ReconcilicationDateChart.vue';
 import { listReconciliationDate, getReconciliationDate, delReconciliationDate, addReconciliationDate, updateReconciliationDate } from "@/api/ss/reconciliationDate";
 import { $showColumns } from '@/utils/mixins';

@ -125,27 +147,33 @@ const defaultSort = {
 export default {
  name: "ReconciliationDate",
  mixins: [$showColumns],
+  components: {
+    ReconcilicationDateChart
+  },
  data() {
    return {
+      chartVisible: false,
      // 字段列表
      columns: [
        {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
        {key: 'date', visible: true, label: '日期', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
        {key: 'orderAmount', visible: true, label: '充值订单', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
-        {key: 'vipOrderAmount', visible: true, label: 'VIP订单', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'vipOrderAmount', visible: true, label: '会员订单', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
        {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: 'platformBonus', visible: true, label: '平台分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
-        {key: 'totalBonus', visible: true, label: '总分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'totalBonus', 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: 'platformBonusRefund', visible: true, label: '平台退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
        {key: 'totalBonusRefund', visible: true, label: '分成退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
        {key: 'actualBonus', visible: true, label: '实际分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
-        {key: 'difference', visible: true, 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: 'receiveAmount', visible: true, label: '应收账', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+        {key: 'difference', visible: true, 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: 'withdrawServiceFee', 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},
      ],
      // 排序方式
@ -191,6 +219,9 @@ export default {
    this.getList();
  },
  methods: {
+    handleViewChart() {
+      this.chartVisible = true;
+    },
    /** 当排序按钮被点击时触发 **/
    onSortChange(column) {
      if (column.order == null) {
@ -302,3 +333,10 @@ export default {
  }
 };
 </script>
+
+<style scoped>
+.header-row {
+  background-color: #f0f2f5;
+  font-size: 12px !important;
+}
+</style>