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/supplier.vue |  112 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/pages/report/supplier.vue b/pages/report/supplier.vue
index aad9201..72616af 100644
--- a/pages/report/supplier.vue
+++ b/pages/report/supplier.vue
@@ -1,57 +1,75 @@
 <template>
   <div>
     <div v-loading="statisticLoading">
-      <el-row :gutter="20" type="flex" justify="center">
-        <el-col :span="6" class="mb-10">
-          <el-card class="is-total">
+      <el-row :gutter="20">
+        <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.orderSupplierPriceAmount || 0 }}
+              {{ statistic.orderCheckFee || 0 }}
             </div>
           </el-card>
         </el-col>
-        <el-col :span="12" class="mb-10">
-          <el-row :gutter="20">
-            <el-col :span="12" class="mb-10">
-              <el-card>
-                <div class="statistic-title">降级扣款</div>
-                <div class="statistic-num">
-                  {{ statistic.orderCheckFee || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12" class="mb-10">
-              <el-card>
-                <div class="statistic-title">缺货扣款</div>
-                <div class="statistic-num">
-                  {{ statistic.orderLackFeeSupplier || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card>
-                <div class="statistic-title">售后扣款</div>
-                <div class="statistic-num">
-                  {{ statistic.salesFeeSupplier || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card>
-                <div class="statistic-title">实际销售扎数</div>
-                <div class="statistic-num">
-                  {{ statistic.realSaleNum || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="6" class="mb-10">
-          <el-card class="is-total">
-            <div class="statistic-title">结算合计</div>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">缺货扣款</div>
             <div class="statistic-num">
-              {{ statistic.profitFeeAmount || 0 }}
+              {{ statistic.orderLackFeeSupplier || 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.salesFeeSupplier || 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.orderNum || 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-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">缺货扎数</div>
+            <div class="statistic-num">{{ statistic.orderLackNum || 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.orderReduceNum || 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.orderReplaceNum || 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.profitFeeAmount || 0 }}</div>
           </el-card>
         </el-col>
       </el-row>
@@ -113,7 +131,13 @@
             minWidth: 150,
           },
           { label: '售后扣花农款', prop: 'salesFeeSupplier', 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',

--
Gitblit v1.9.3