From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/report/finance/_date.vue | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/pages/report/finance/_date.vue b/pages/report/finance/_date.vue
index 926643a..eb1869a 100644
--- a/pages/report/finance/_date.vue
+++ b/pages/report/finance/_date.vue
@@ -29,6 +29,7 @@
{ label: '合伙人', prop: 'partnerName', minWidth: '120px' },
{ label: '下单时间', prop: 'orderDate', minWidth: '180px' },
{ label: '订单金额', prop: 'orderTotal', minWidth: '120px' },
+ { label: '订单金额(实付)', prop: 'totalAmount', minWidth: '120px' },
{
label: '花农底价',
prop: 'orderSupplierPriceAmount',
@@ -59,44 +60,36 @@
prop: 'partnerSectionFeeAmount',
minWidth: '120px',
},
- {
- label: '会员折扣',
- prop: 'orderPriceDiscountAmount',
- minWidth: '100px',
- },
- {
- label: '优惠券',
- prop: 'orderCouponAmountTotal',
- minWidth: '100px',
- },
+
+ { label: '优惠合计', prop: 'orderDiscountTotalFee', minWidth: 120,},
+ { label: '会员折扣', prop: 'orderPriceDiscountAmount', minWidth: 120,},
+ { label: '优惠券', prop: 'orderCouponAmountTotal',minWidth: '100px',},
+
+ { label: '质检总扣款', prop: 'orderCheckTotalFee', minWidth: 120 },
{ label: '质检降级扣款', prop: 'orderCheckFee', minWidth: '100px' },
- {
- label: '质检缺货扣款',
- prop: 'orderLackFeeSupplier',
- minWidth: '100px',
- },
+ { label: '质检缺货扣款', prop: 'orderLackFeeSupplier', minWidth: '100px',},
{ label: '质检补货扣款', prop: 'orderReplaceFee', minWidth: '100px' },
- {
- label: '售后扣合伙人款',
- prop: 'orderFeePartner',
- minWidth: '120px',
- },
- {
- label: '售后扣花农款',
- prop: 'orderFeeSupplier',
- minWidth: '100px',
- },
- {
- label: '售后扣平台款',
- prop: 'orderFeePlatform',
- minWidth: '100px',
- },
+
+ { 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: '100px',
},
- { label: '销售扎数', prop: 'realSaleNum', minWidth: '100px' },
+ { label: '总销售扎数', prop: 'orderNum', minWidth: '100px' },
+ { label: '实际销售扎数', prop: 'realSaleNum', minWidth: '100px' },
+ { label: '缺货扎数', prop: 'orderLackNum', minWidth: 120 },
+ { label: '降级扎数', prop: 'orderReduceNum', minWidth: 120 },
+ { label: '补货扎数', prop: 'orderReplaceNum', minWidth: 120 },
+
{
label: '利润',
prop: 'profitFeeAmount',
--
Gitblit v1.9.3