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/_date.vue |   51 +++++++++++++++++++++------------------------------
 1 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/pages/report/finance/_date.vue b/pages/report/finance/_date.vue
index 540c591..eb1869a 100644
--- a/pages/report/finance/_date.vue
+++ b/pages/report/finance/_date.vue
@@ -60,38 +60,25 @@
             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',
@@ -99,6 +86,10 @@
           },
           { 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