From 62fc9aeb10edb2295ec221d4a814f3fb9feaf5ae Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:38:07 +0800
Subject: [PATCH] 1.报表等修改 2.商品分类下拉查询
---
pages/report/finance/index.vue | 217 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 180 insertions(+), 37 deletions(-)
diff --git a/pages/report/finance/index.vue b/pages/report/finance/index.vue
index a6cdb12..e3c4fd4 100644
--- a/pages/report/finance/index.vue
+++ b/pages/report/finance/index.vue
@@ -1,20 +1,21 @@
<template>
<div>
<div v-loading="statisticLoading">
+
<el-row :gutter="20">
- <el-col :span="4" class="mb-10">
+ <el-col :span="3" class="mb-2">
<el-card>
<div class="statistic-title">销售合计(原订单)</div>
<div class="statistic-num">{{ statistic.orderTotal || 0 }}</div>
</el-card>
</el-col>
- <el-col :span="4" class="mb-10">
+ <el-col :span="3" class="mb-2">
<el-card>
<div class="statistic-title">销售合计(实付)</div>
<div class="statistic-num">{{ statistic.totalAmount || 0 }}</div>
</el-card>
</el-col>
- <el-col :span="4" class="mb-10">
+ <el-col :span="3" class="mb-2">
<el-card>
<div class="statistic-title">底价合计</div>
<div class="statistic-num">
@@ -22,7 +23,7 @@
</div>
</el-card>
</el-col>
- <el-col :span="4" class="mb-10">
+ <el-col :span="3" class="mb-2">
<el-card>
<div class="statistic-title">区间加价</div>
<div class="statistic-num">
@@ -30,7 +31,7 @@
</div>
</el-card>
</el-col>
- <el-col :span="4" class="mb-10">
+ <el-col :span="3" class="mb-2">
<el-card>
<div class="statistic-title">平台加价</div>
<div class="statistic-num">
@@ -38,7 +39,7 @@
</div>
</el-card>
</el-col>
- <el-col :span="4" class="mb-10">
+ <el-col :span="3" class="mb-2">
<el-card>
<div class="statistic-title">合伙人加价</div>
<div class="statistic-num">
@@ -46,27 +47,7 @@
</div>
</el-card>
</el-col>
- <el-col :span="4" class="mb-10">
- <el-card>
- <div class="statistic-title">质检扣款</div>
- <div class="statistic-num">{{ statistic.checkTotalFee || 0 }}</div>
- </el-card>
- </el-col>
- <el-col :span="4" class="mb-10">
- <el-card>
- <div class="statistic-title">售后扣款</div>
- <div class="statistic-num">{{ statistic.saleTotalFee || 0 }}</div>
- </el-card>
- </el-col>
- <el-col :span="4" class="mb-10">
- <el-card>
- <div class="statistic-title">优惠合计</div>
- <div class="statistic-num">
- {{ statistic.discountTotalFee || 0 }}
- </div>
- </el-card>
- </el-col>
- <el-col :span="4" class="mb-10">
+ <el-col :span="3" class="mb-2">
<el-card>
<div class="statistic-title">包干费合计</div>
<div class="statistic-num">
@@ -74,10 +55,148 @@
</div>
</el-card>
</el-col>
- <el-col :span="4" class="mb-10">
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="3" class="mb-2">
<el-card>
- <div class="statistic-title">销售扎数</div>
+ <div class="statistic-title">质检总扣款</div>
+ <div class="statistic-num">
+ <!-- {{ statistic.checkTotalFee || 0 }} -->
+ {{ statistic.orderCheckTotalFee || 0 }}
+ </div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">缺货扣款</div>
+ <div class="statistic-num">{{ statistic.orderLackFeeSupplier || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">补货扣款</div>
+ <div class="statistic-num">{{ statistic.orderReplaceFee || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">降级扣款</div>
+ <div class="statistic-num">{{ statistic.orderCheckFee || 0 }}</div>
+ </el-card>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <!-- <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后总扣款</div>
+ <div class="statistic-num">{{ statistic.saleTotalFee || 0 }}</div>
+ </el-card>
+ </el-col> -->
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后总扣款</div>
+ <div class="statistic-num">{{ statistic.orderTotalFee || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后供应商扣款</div>
+ <div class="statistic-num">{{ statistic.orderFeeSupplier || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后平台扣款</div>
+ <div class="statistic-num">{{ statistic.orderFeePlatform || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后合伙人扣款</div>
+ <div class="statistic-num">{{ statistic.orderFeePartner || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后打包扣款</div>
+ <div class="statistic-num">{{ statistic.orderFeePlatformPack || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后质检扣款</div>
+ <div class="statistic-num">{{ statistic.orderFeePlatformCheck || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后物流扣款</div>
+ <div class="statistic-num">{{ statistic.orderFeePlatformTransport || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">售后打包运费扣款</div>
+ <div class="statistic-num">{{ statistic.orderFeePackingTransport || 0 }}</div>
+ </el-card>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">优惠合计</div>
+ <div class="statistic-num">
+ <!-- {{ statistic.discountTotalFee || 0 }} -->
+ {{ statistic.orderDiscountTotalFee || 0 }}
+ </div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">会员折扣</div>
+ <div class="statistic-num">
+ {{ statistic.orderPriceDiscountAmount || 0 }}
+ </div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">优惠券</div>
+ <div class="statistic-num">
+ {{ statistic.orderCouponAmountTotal || 0 }}
+ </div>
+ </el-card>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">总销售扎数</div>
+ <div class="statistic-num">{{ statistic.orderNum || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">实际销售扎数</div>
<div class="statistic-num">{{ statistic.realSaleNum || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">缺货扎数</div>
+ <div class="statistic-num">{{ statistic.orderLackNum || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">降级扎数</div>
+ <div class="statistic-num">{{ statistic.orderReduceNum || 0 }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="3" class="mb-2">
+ <el-card>
+ <div class="statistic-title">补货扎数</div>
+ <div class="statistic-num">{{ statistic.orderReplaceNum || 0 }}</div>
</el-card>
</el-col>
</el-row>
@@ -178,21 +297,31 @@
prop: 'orderMarkupPartnerAmount',
minWidth: 120,
},
- {
- label: '会员折扣',
- prop: 'orderPriceDiscountAmount',
- minWidth: 120,
- },
+ { label: '优惠合计', prop: 'orderDiscountTotalFee', minWidth: 120,},
+ { label: '会员折扣', prop: 'orderPriceDiscountAmount',minWidth: 120,},
{ label: '优惠券', prop: 'orderCouponAmountTotal', minWidth: 120 },
+
+ { label: '质检总扣款', prop: 'orderCheckTotalFee', minWidth: 120 },
{ label: '降级扣款', prop: 'orderCheckFee', minWidth: 120 },
{ label: '缺货扣款', prop: 'orderLackFeeSupplier', minWidth: 120 },
{ label: '补货扣款', prop: 'orderReplaceFee', minWidth: 120 },
- { label: '售后扣合伙人款', prop: 'orderFeePartner', minWidth: 150 },
- { label: '售后扣花农款', prop: 'orderFeeSupplier', minWidth: 150 },
- { label: '售后扣平台款', prop: 'orderFeePlatform', minWidth: 150 },
+
+ { label: '售后总扣款', prop: 'orderTotalFee', minWidth: 150 },
+ { label: '售后供应商扣款', prop: 'orderFeeSupplier', minWidth: 150 },
+ { label: '售后平台扣款', prop: 'orderFeePlatform', minWidth: 150 },
+ { label: '售后合伙人扣款', prop: 'orderFeePartner', minWidth: 150 },
+ { label: '售后打包扣款', prop: 'orderFeePlatformPack', minWidth: 150 },
+ { label: '售后质检扣款', prop: 'orderFeePlatformCheck', minWidth: 150 },
+ { label: '售后物流扣款', prop: 'orderFeePlatformTransport', minWidth: 150 },
+ { label: '售后打包运费扣款', prop: 'orderFeePackingTransport', minWidth: 150 },
+
{ label: '总包干费', prop: 'partnerTotalFeeAmount', minWidth: 120 },
{ label: '总售扎数', prop: 'orderNum', minWidth: 120 },
{ label: '实际销售扎数', prop: 'realSaleNum', minWidth: 120 },
+ { label: '缺货扎数', prop: 'orderLackNum', minWidth: 120 },
+ { label: '降级扎数', prop: 'orderReduceNum', minWidth: 120 },
+ { label: '补货扎数', prop: 'orderReplaceNum', minWidth: 120 },
+
{
label: '利润',
prop: 'profitFeeAmount',
@@ -254,4 +383,18 @@
<style lang="scss" scoped>
@import '@/assets/statistic/index.scss';
+
+.statistic-title {
+ text-align: center;
+ font-size: 16px;
+ color: $main-title-color;
+ font-weight: bold;
+ margin-bottom: 6px;
+}
+.statistic-num {
+ text-align: center;
+ font-size: 16px;
+ color: $primary-color;
+}
+
</style>
--
Gitblit v1.9.3