From e130380d2028a17d289cf12eee79861fdc2e4d84 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 24 Aug 2023 13:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=84=9F=E5=BA=94=E7=BB=8F=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E7=AB=AF=E4=B8=AD=E5=8F=B0=E6=9B=B4=E6=94=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/Count.vue | 27 +++++++++------------------
 src/views/sales/Offline.vue         | 15 +++++++++------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/views/home/components/Count.vue b/src/views/home/components/Count.vue
index 4f3de06..babeb3f 100644
--- a/src/views/home/components/Count.vue
+++ b/src/views/home/components/Count.vue
@@ -12,8 +12,8 @@
       >
         <chart-card :loading="loading" title="分公司总库存(瓶)" :total="info.middle.total">
           <template slot="footer">
-            <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend>
-            <trend flag="down" style="margin-left: 20px;">
+            <!-- <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend> -->
+            <trend flag="down">
               <span slot="term">{{ $t('线下库存') }}</span>{{ info.middle.offline_stock }}瓶
             </trend>
           </template>
@@ -77,16 +77,10 @@
       <a-card :bordered="false" title="累计销售数量">
         <a-row>
           <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上销售数量(瓶)" :value="''+info.sales_quantity.online_all" :bordered="true" />
+            <info title="累计销售数量(瓶)" :value="''+info.sales_quantity.online_all" :bordered="true" />
           </a-col>
           <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上零售数量(瓶)" :value="''+info.sales_quantity.online_retail" :bordered="true"/>
-          </a-col>
-          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上代理进货数量(瓶)" :value="''+info.sales_quantity.online_agent_in" :bordered="true"/>
-          </a-col>
-          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
-            <info title="线上创客进货数量(瓶)" :value="''+info.sales_quantity.online_maker_in" :bordered="true"/>
+            <info title="线上销售数量(瓶)" :value="''+info.sales_quantity.online_retail" :bordered="true"/>
           </a-col>
           <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
             <info title="线下出货数量(瓶)" :value="''+info.sales_quantity.offline" />
@@ -97,17 +91,14 @@
     <a-col :span="24" v-if="info.sales_amount">
       <a-card :bordered="false" title="售卖数据管理">
         <a-row>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
-            <info title="代理进货金额(元)" :value="''+info.sales_amount.online_agent_in" :bordered="true"/>
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
+            <info title="售卖数据管理总数(元)" :value="''+info.sales_amount.online_agent_all" :bordered="true"/>
           </a-col>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
-            <info title="创客进货金额(元)" :value="''+info.sales_amount.online_maker_in" :bordered="true"/>
-          </a-col>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
             <info title="线上销售金额(元)" :value="''+info.sales_amount.online_sell" :bordered="true"/>
           </a-col>
-          <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="mt20">
-            <info title="线下销售金额(元)" :value="''+info.sales_amount.offline_sell" />
+          <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
+            <info title="线下出货金额总和(元)" :value="''+info.sales_amount.offline_sell" />
           </a-col>
         </a-row>
       </a-card>
diff --git a/src/views/sales/Offline.vue b/src/views/sales/Offline.vue
index edbf189..2682e0a 100644
--- a/src/views/sales/Offline.vue
+++ b/src/views/sales/Offline.vue
@@ -61,12 +61,9 @@
           <div>{{ record.name }} {{ record.mobile?'('+record.mobile+')':'--' }}</div>
           <div>{{ record.address || '--' }}</div>
         </div>
-        <div slot="number" slot-scope="text, record">
-          {{ record.number }}件
-        </div>
-        <div slot="channel" slot-scope="text, record">
-          {{ record.channel == 'express' ?'快递':'自提' }}
-        </div>
+        <div slot="number" slot-scope="text, record">{{ record.number }}件</div>
+        <a slot="total" slot-scope="text, record">￥{{ record.total || '0.00' }}</a>
+        <div slot="channel" slot-scope="text, record">{{ record.channel == 'express' ?'快递':'自提' }}</div>
         <div slot="express" slot-scope="text, record">
           <div v-if="record.channel === 'express'">
             {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
@@ -100,6 +97,12 @@ const columns = [
     align: 'center',
     width: 120
   },
+  {
+    title: '金额',
+    scopedSlots: { customRender: 'total' },
+    align: 'center',
+    width: 120
+  },
   {
     title: '发货方式',
     scopedSlots: { customRender: 'channel' },