From 1ea1958f67b5645128cd329732ce3d11ba968213 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 13:46:03 +0800
Subject: [PATCH] fix:填充商品评价字段
---
pages/report/finance/index.vue | 158 ++++++++++++++++++++++++++++------------------------
1 files changed, 85 insertions(+), 73 deletions(-)
diff --git a/pages/report/finance/index.vue b/pages/report/finance/index.vue
index 0e6a193..e04b403 100644
--- a/pages/report/finance/index.vue
+++ b/pages/report/finance/index.vue
@@ -1,77 +1,81 @@
<template>
<div>
- <el-row :gutter="20">
- <el-col :span="4" class="mb-10">
- <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-card>
- <div class="statistic-title">底价合计</div>
- <div class="statistic-num">
- {{ statistic.orderSupplierPriceAmount || 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.orderMarkupOneAmount || 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.orderMarkupTwoAmount || 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.orderMarkupPartnerAmount || 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.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-card>
- <div class="statistic-title">包干费合计</div>
- <div class="statistic-num">
- {{ statistic.partnerTotalFeeAmount || 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.realSaleNum || 0 }}</div>
- </el-card>
- </el-col>
- </el-row>
+ <div v-loading="statisticLoading">
+ <el-row :gutter="20">
+ <el-col :span="4" class="mb-10">
+ <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-card>
+ <div class="statistic-title">底价合计</div>
+ <div class="statistic-num">
+ {{ statistic.orderSupplierPriceAmount || 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.orderMarkupOneAmount || 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.orderMarkupTwoAmount || 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.orderMarkupPartnerAmount || 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.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-card>
+ <div class="statistic-title">包干费合计</div>
+ <div class="statistic-num">
+ {{ statistic.partnerTotalFeeAmount || 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.realSaleNum || 0 }}</div>
+ </el-card>
+ </el-col>
+ </el-row>
+ </div>
<el-bus-crud v-bind="tableConfig" />
</div>
</template>
@@ -89,12 +93,16 @@
.format('YYYY-MM-DD')} 23:59:59`
return {
statistic: {},
+ statisticLoading: false,
tableConfig: {
url: 'flower/v2/report/order/sale/page',
hasNew: false,
hasEdit: false,
hasDelete: false,
viewText: '明细',
+ hasExport: true,
+ exportUrl: 'flower/v2/report/order/sale/export',
+ exportText: '导出',
onResetView: (row) => {
const url = this.$router.resolve(
`/report/finance/${row.orderDate}`
@@ -106,11 +114,14 @@
fixed: 'right',
},
beforeRequest: async (params) => {
- const { code, data } = await this.$elBusHttp.request(
+ this.statisticLoading = true
+ // eslint-disable-next-line
+ let { code, data } = await this.$elBusHttp.request(
`flower/v2/report/order/sale/statis`,
{ params }
)
if (code === 0) {
+ data = data || {}
data.checkTotalFee = Number(
(
(data.orderCheckFee ?? 0) +
@@ -133,6 +144,7 @@
)
this.statistic = data || {}
}
+ this.statisticLoading = false
},
columns: [
{
--
Gitblit v1.9.3