From fd65893af1e483c6b2d6314ff85af79997b2acef Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 17 Oct 2024 13:57:45 +0800
Subject: [PATCH] 10.16

---
 .../src/views/financialStatement/buy/list.vue |  1 +
 .../views/financialStatement/buy/tab/em.vue   | 69 ++++++++-------
 .../financialStatement/buy/tab/goods.vue      | 69 ++++++++-------
 .../views/financialStatement/buy/tab/gun.vue  | 70 ++++++++-------
 .../financialStatement/buy/tab/inter.vue      |  4 +-
 .../views/financialStatement/buy/tab/oil.vue  | 87 ++++++++-----------
 .../reconciliation/list.vue                   |  1 +
 .../financialStatement/runningWater/list.vue  |  3 +-
 .../runningWater/tab/day.vue                  | 85 ++++++++++--------
 .../runningWater/tab/oilDepot.vue             | 13 ++-
 10 files changed, 214 insertions(+), 188 deletions(-)

diff --git a/fuintAdmin/src/views/financialStatement/buy/list.vue b/fuintAdmin/src/views/financialStatement/buy/list.vue
index 8e461f697..23209433c 100644
--- a/fuintAdmin/src/views/financialStatement/buy/list.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/list.vue
@@ -86,6 +86,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   padding: 0px 50px;
+  border-top: 1px solid #eceff1;
 }
 
 .f-box {
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
index ad18a51e9..dc2f0d33a 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
@@ -6,6 +6,7 @@
       <div style="display: flex;align-items: center ">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
           <el-form-item label="">
+
             <el-date-picker
               v-model="beginTime"
               style="width: 140px"
@@ -33,7 +34,7 @@
       <div class="box-gang">
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole">0/0</div>
+            <div class="size-bole"  style="color: #0DC291">0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0DC291"></div>
@@ -42,7 +43,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#00CAFF;">0/0</div>
+            <div class="size-bole" style="color:#00CAFF;">0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -52,7 +53,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#F44522;" >0/0</div>
+            <div class="size-bole" style="color:#F44522;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -62,17 +63,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#E05295;" >0/0</div>
-          </el-tooltip>
-
-          <div class="size-hui">
-            <div class="dian" style="background: #E05295"></div>
-            <div class="nei">优惠总金额（元）</div>
-          </div>
-        </div>
-        <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#FF7E00;" >0/0</div>
+            <div class="size-bole"  style="color:#FF7E00;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -80,9 +71,19 @@
             <div class="nei">优惠总金额（元）</div>
           </div>
         </div>
+
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#0047FF;" >0/0</div>
+            <div class="size-bole"  style="color:#E05295;" >0</div>
+          </el-tooltip>
+          <div class="size-hui">
+            <div class="dian" style="background: #E05295"></div>
+            <div class="nei">实收总金额（元）</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole"  style="color:#0047FF;" >0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0047FF"></div>
@@ -90,23 +91,25 @@
           </div>
         </div>
       </div>
+
+
       <div class="table-box">
         <el-table
           :data="orderList"
           border
           style="width: 100%;margin-top: 15px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <!--          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>-->
-          <el-table-column prop="content" align="center" label="油站名称"> </el-table-column>
-          <el-table-column prop="goodsMoney" align="center" label="加油升数（元）"> </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="加油笔数"> </el-table-column>
-          <el-table-column prop="count" align="center" label="订单金额（元）"> </el-table-column>
-          <el-table-column prop="count" align="center" label="优惠金额（元）"> </el-table-column>
-          <el-table-column prop="parentStoreName" align="center" label="退款金额"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="实收金额（元）"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="统计周期">
-            {{this.beginTime }} 至 {{this.endTime}}
-          </el-table-column>
+          <el-table-column prop="content" align="center" label="员工姓名"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油升数（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油笔数"> </el-table-column>
+          <el-table-column prop="content" align="center" label="订单金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="优惠金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
+          <!--          <div slot="empty" class="empty">-->
+          <!--            <el-empty description="暂无数据"></el-empty>-->
+          <!--          </div>-->
         </el-table>
       </div>
       <div class="pagination-box">
@@ -271,7 +274,7 @@ export default {
 .container{
   background: #f4f5f9;
   box-sizing: border-box;
-  padding-bottom: 6px;
+  padding-bottom: 10px;
 }
 .app-top{
   width: 100%;
@@ -334,8 +337,8 @@ export default {
 }
 .size-bole{
   height: 31px;
-  font-family: YouSheBiaoTiHei;
-  font-weight: 400;
+  //font-family: YouSheBiaoTiHei;
+  font-weight: 600;
   font-size: 24px;
   color: #555555;
   //line-height: 0px;
@@ -368,7 +371,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80.5vh;
+  height: 80vh;
 }
 .pagination-box{
   width: 100%;
@@ -397,4 +400,10 @@ export default {
     height: 100%;
   }
 }
+.dian{
+  width: 6px;
+  height: 6px;
+  border-radius: 8px;
+  margin-right: 5px;
+}
 </style>
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue b/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
index 47a982948..23c4c5d91 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
@@ -1,6 +1,7 @@
 <!-- 收银台订单-->
 <template>
   <div class="container" >
+
     <div class="wgang">
       <div style="display: flex;align-items: center ">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
@@ -33,7 +34,7 @@
       <div class="box-gang">
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole">0/0</div>
+            <div class="size-bole"  style="color: #0DC291">0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0DC291"></div>
@@ -42,7 +43,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#00CAFF;">0/0</div>
+            <div class="size-bole" style="color:#00CAFF;">0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -52,7 +53,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#F44522;" >0/0</div>
+            <div class="size-bole" style="color:#F44522;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -62,17 +63,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#E05295;" >0/0</div>
-          </el-tooltip>
-
-          <div class="size-hui">
-            <div class="dian" style="background: #E05295"></div>
-            <div class="nei">优惠总金额（元）</div>
-          </div>
-        </div>
-        <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#FF7E00;" >0/0</div>
+            <div class="size-bole"  style="color:#FF7E00;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -80,9 +71,19 @@
             <div class="nei">优惠总金额（元）</div>
           </div>
         </div>
+
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#0047FF;" >0/0</div>
+            <div class="size-bole"  style="color:#E05295;" >0</div>
+          </el-tooltip>
+          <div class="size-hui">
+            <div class="dian" style="background: #E05295"></div>
+            <div class="nei">实收总金额（元）</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole"  style="color:#0047FF;" >0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0047FF"></div>
@@ -90,23 +91,25 @@
           </div>
         </div>
       </div>
+
+
       <div class="table-box">
         <el-table
           :data="orderList"
           border
           style="width: 100%;margin-top: 15px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <!--          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>-->
-          <el-table-column prop="content" align="center" label="油站名称"> </el-table-column>
-          <el-table-column prop="goodsMoney" align="center" label="加油升数（元）"> </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="加油笔数"> </el-table-column>
-          <el-table-column prop="count" align="center" label="订单金额（元）"> </el-table-column>
-          <el-table-column prop="count" align="center" label="优惠金额（元）"> </el-table-column>
-          <el-table-column prop="parentStoreName" align="center" label="退款金额"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="实收金额（元）"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="统计周期">
-            {{this.beginTime }} 至 {{this.endTime}}
-          </el-table-column>
+          <el-table-column prop="content" align="center" label="商品名称"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油升数（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油笔数"> </el-table-column>
+          <el-table-column prop="content" align="center" label="订单金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="优惠金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
+          <!--          <div slot="empty" class="empty">-->
+          <!--            <el-empty description="暂无数据"></el-empty>-->
+          <!--          </div>-->
         </el-table>
       </div>
       <div class="pagination-box">
@@ -271,7 +274,7 @@ export default {
 .container{
   background: #f4f5f9;
   box-sizing: border-box;
-  padding-bottom: 6px;
+  padding-bottom: 10px;
 }
 .app-top{
   width: 100%;
@@ -334,8 +337,8 @@ export default {
 }
 .size-bole{
   height: 31px;
-  font-family: YouSheBiaoTiHei;
-  font-weight: 400;
+  //font-family: YouSheBiaoTiHei;
+  font-weight: 600;
   font-size: 24px;
   color: #555555;
   //line-height: 0px;
@@ -368,7 +371,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80.5vh;
+  height: 80vh;
 }
 .pagination-box{
   width: 100%;
@@ -397,4 +400,10 @@ export default {
     height: 100%;
   }
 }
+.dian{
+  width: 6px;
+  height: 6px;
+  border-radius: 8px;
+  margin-right: 5px;
+}
 </style>
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
index d7e75e01e..2ade0a900 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
@@ -34,7 +34,7 @@
       <div class="box-gang">
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole">0/0</div>
+            <div class="size-bole"  style="color: #0DC291">0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0DC291"></div>
@@ -43,7 +43,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#00CAFF;">0/0</div>
+            <div class="size-bole" style="color:#00CAFF;">0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -53,7 +53,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#F44522;" >0/0</div>
+            <div class="size-bole" style="color:#F44522;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -63,17 +63,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#E05295;" >0/0</div>
-          </el-tooltip>
-
-          <div class="size-hui">
-            <div class="dian" style="background: #E05295"></div>
-            <div class="nei">优惠总金额（元）</div>
-          </div>
-        </div>
-        <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#FF7E00;" >0/0</div>
+            <div class="size-bole"  style="color:#FF7E00;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -81,33 +71,45 @@
             <div class="nei">优惠总金额（元）</div>
           </div>
         </div>
+
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#0047FF;" >0/0</div>
+            <div class="size-bole"  style="color:#E05295;" >0</div>
+          </el-tooltip>
+          <div class="size-hui">
+            <div class="dian" style="background: #E05295"></div>
+            <div class="nei">实收总金额（元）</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole"  style="color:#0047FF;" >0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0047FF"></div>
-            <div class="nei">优惠总金额（元）</div>
+            <div class="nei">退款总金额</div>
           </div>
         </div>
       </div>
+
+
       <div class="table-box">
         <el-table
           :data="orderList"
           border
           style="width: 100%;margin-top: 15px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <!--          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>-->
-          <el-table-column prop="content" align="center" label="油站名称"> </el-table-column>
-          <el-table-column prop="goodsMoney" align="center" label="加油升数（元）"> </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="加油笔数"> </el-table-column>
-          <el-table-column prop="count" align="center" label="订单金额（元）"> </el-table-column>
-          <el-table-column prop="count" align="center" label="优惠金额（元）"> </el-table-column>
-          <el-table-column prop="parentStoreName" align="center" label="退款金额"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="实收金额（元）"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="统计周期">
-            {{this.beginTime }} 至 {{this.endTime}}
-          </el-table-column>
+          <el-table-column prop="content" align="center" label="油枪名称"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油升数（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油笔数"> </el-table-column>
+          <el-table-column prop="content" align="center" label="订单金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="优惠金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
+          <!--          <div slot="empty" class="empty">-->
+          <!--            <el-empty description="暂无数据"></el-empty>-->
+          <!--          </div>-->
         </el-table>
       </div>
       <div class="pagination-box">
@@ -272,7 +274,7 @@ export default {
 .container{
   background: #f4f5f9;
   box-sizing: border-box;
-  padding-bottom: 6px;
+  padding-bottom: 10px;
 }
 .app-top{
   width: 100%;
@@ -335,8 +337,8 @@ export default {
 }
 .size-bole{
   height: 31px;
-  font-family: YouSheBiaoTiHei;
-  font-weight: 400;
+  //font-family: YouSheBiaoTiHei;
+  font-weight: 600;
   font-size: 24px;
   color: #555555;
   //line-height: 0px;
@@ -369,7 +371,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80.5vh;
+  height: 80vh;
 }
 .pagination-box{
   width: 100%;
@@ -398,4 +400,10 @@ export default {
     height: 100%;
   }
 }
+.dian{
+  width: 6px;
+  height: 6px;
+  border-radius: 8px;
+  margin-right: 5px;
+}
 </style>
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue b/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
index 285d3c154..9e215c990 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
@@ -307,8 +307,8 @@ export default {
 }
 .size-bole{
   height: 31px;
-  font-family: YouSheBiaoTiHei;
-  font-weight: 400;
+  //font-family: YouSheBiaoTiHei;
+  font-weight: 600;
   font-size: 24px;
   color: #555555;
   //line-height: 0px;
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
index 42991efae..6679357e7 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
@@ -34,7 +34,7 @@
       <div class="box-gang">
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole">0/0</div>
+            <div class="size-bole"  style="color: #0DC291">0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0DC291"></div>
@@ -43,7 +43,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#00CAFF;">0/0</div>
+            <div class="size-bole" style="color:#00CAFF;">0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -53,7 +53,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#F44522;" >0/0</div>
+            <div class="size-bole" style="color:#F44522;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -63,17 +63,7 @@
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#E05295;" >0/0</div>
-          </el-tooltip>
-
-          <div class="size-hui">
-            <div class="dian" style="background: #E05295"></div>
-            <div class="nei">优惠总金额（元）</div>
-          </div>
-        </div>
-        <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#FF7E00;" >0/0</div>
+            <div class="size-bole"  style="color:#FF7E00;" >0</div>
           </el-tooltip>
 
           <div class="size-hui">
@@ -81,13 +71,23 @@
             <div class="nei">优惠总金额（元）</div>
           </div>
         </div>
+
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#0047FF;" >0/0</div>
+            <div class="size-bole"  style="color:#E05295;" >0</div>
+          </el-tooltip>
+          <div class="size-hui">
+            <div class="dian" style="background: #E05295"></div>
+            <div class="nei">实收总金额（元）</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole"  style="color:#0047FF;" >0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0047FF"></div>
-            <div class="nei">优惠总金额（元）</div>
+            <div class="nei">退款总金额</div>
           </div>
         </div>
       </div>
@@ -99,36 +99,17 @@
           border
           style="width: 100%;margin-top: 15px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <!--          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>-->
-          <el-table-column prop="content" align="center" label="订单分类"> </el-table-column>
-          <el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>
-          <el-table-column prop="count" align="center" label="订单笔数"> </el-table-column>
-          <el-table-column prop="unitPrice" align="center" label="笔单价">
-
-            <template slot-scope="scope">
-              {{ (scope.row.payMoney/scope.row.count).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="dailyAmount" align="center" label="日均交易金额">
-            <template slot-scope="scope">
-              {{ (scope.row.payMoney / timeDifference).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="strokesPerDay" align="center" label="日订单笔数">
-
-            <template slot-scope="scope">
-              {{ (scope.row.count / timeDifference).toFixed(2) }}            </template>
-          </el-table-column>
-          <!--          <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>-->
-          <el-table-column prop="parentStoreName" align="center" label="退款金额"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="退款笔数"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="统计周期">
-            {{this.beginTime }} 至 {{this.endTime}}
-          </el-table-column>
-          <!--          <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
-          <!--          <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
-
+          <el-table-column prop="content" align="center" label="油品油号"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油升数（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="加油笔数"> </el-table-column>
+          <el-table-column prop="content" align="center" label="订单金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="优惠金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
+<!--          <div slot="empty" class="empty">-->
+<!--            <el-empty description="暂无数据"></el-empty>-->
+<!--          </div>-->
         </el-table>
       </div>
       <div class="pagination-box">
@@ -293,7 +274,7 @@ export default {
 .container{
   background: #f4f5f9;
   box-sizing: border-box;
-  padding-bottom: 8px;
+  padding-bottom: 10px;
 }
 .app-top{
   width: 100%;
@@ -356,8 +337,8 @@ export default {
 }
 .size-bole{
   height: 31px;
-  font-family: YouSheBiaoTiHei;
-  font-weight: 400;
+  //font-family: YouSheBiaoTiHei;
+  font-weight: 600;
   font-size: 24px;
   color: #555555;
   //line-height: 0px;
@@ -390,7 +371,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 81vh;
+  height: 80vh;
 }
 .pagination-box{
   width: 100%;
@@ -419,4 +400,10 @@ export default {
     height: 100%;
   }
 }
+.dian{
+  width: 6px;
+  height: 6px;
+  border-radius: 8px;
+  margin-right: 5px;
+}
 </style>
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/list.vue b/fuintAdmin/src/views/financialStatement/reconciliation/list.vue
index 1b83adb23..036a4014c 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/list.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/list.vue
@@ -81,6 +81,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   padding: 0px 50px;
+  border-top: 1px solid #eceff1;
 }
 
 .f-box{
diff --git a/fuintAdmin/src/views/financialStatement/runningWater/list.vue b/fuintAdmin/src/views/financialStatement/runningWater/list.vue
index 630bbbeed..90411d5cb 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/list.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/list.vue
@@ -70,7 +70,6 @@ export default {
   margin-bottom: 20px;
   height: 60px;
   box-sizing: border-box;
-
 }
 
 .tab-box {
@@ -79,6 +78,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   padding: 0px 50px;
+  border-top: 1px solid #eceff1;
 }
 
 .f-box {
@@ -87,6 +87,7 @@ export default {
   margin-right: 50px;
   display: flex;
   align-items: center;
+  cursor: pointer;
 
 }
 
diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
index 778463e77..21098ad95 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
@@ -40,7 +40,7 @@
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0DC291"></div>
-            <div class="nei">优惠金额（元）/笔数</div>
+            <div class="nei">订单总金额（元）</div>
           </div>
         </div>
         <div class="box">
@@ -50,7 +50,7 @@
 
           <div class="size-hui">
             <div class="dian" style="background: #00CAFF"></div>
-            <div class="nei">油品订单优惠金额（元）/笔数</div>
+            <div class="nei">优惠总金额（元）</div>
           </div>
         </div>
         <div class="box">
@@ -60,7 +60,7 @@
 
           <div class="size-hui">
             <div class="dian" style="background: #F44522"></div>
-            <div class="nei">便利店订单优惠金额（元）/笔数</div>
+            <div class="nei">退款总金额（元）</div>
           </div>
         </div>
         <div class="box">
@@ -70,7 +70,37 @@
 
           <div class="size-hui">
             <div class="dian" style="background: #FF7E00"></div>
-            <div class="nei">积分商城订单优惠金额（元）/笔数</div>
+            <div class="nei">挂账总金额/归还总金额</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole"  style="color:#0D2ED8;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
+          </el-tooltip>
+
+          <div class="size-hui">
+            <div class="dian" style="background: #0D2ED8"></div>
+            <div class="nei">实收总金额（元）</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole"  style="color:#790DD8;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
+          </el-tooltip>
+
+          <div class="size-hui">
+            <div class="dian" style="background: #790DD8"></div>
+            <div class="nei">充值总金额/会员消费总金额</div>
+          </div>
+        </div>
+        <div class="box">
+          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+            <div class="size-bole"  style="color:#D80D54;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
+          </el-tooltip>
+
+          <div class="size-hui">
+            <div class="dian" style="background: #D80D54"></div>
+            <div class="nei">新增会员数</div>
           </div>
         </div>
       </div>
@@ -82,36 +112,17 @@
           border
           style="width: 100%;margin-top: 15px">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <!--          <el-table-column prop="deptId" align="center" label="门店编号"> </el-table-column>-->
-          <el-table-column prop="content" align="center" label="订单分类"> </el-table-column>
-          <el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>
-          <el-table-column prop="payMoney" align="center" label="实收金额"> </el-table-column>
-          <el-table-column prop="count" align="center" label="订单笔数"> </el-table-column>
-          <el-table-column prop="unitPrice" align="center" label="笔单价">
-
-            <template slot-scope="scope">
-              {{ (scope.row.payMoney/scope.row.count).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="dailyAmount" align="center" label="日均交易金额">
-            <template slot-scope="scope">
-              {{ (scope.row.payMoney / timeDifference).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="strokesPerDay" align="center" label="日订单笔数">
-
-            <template slot-scope="scope">
-              {{ (scope.row.count / timeDifference).toFixed(2) }}            </template>
-          </el-table-column>
-          <!--          <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>-->
-          <el-table-column prop="parentStoreName" align="center" label="退款金额"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="退款笔数"> </el-table-column>
-          <el-table-column prop="leaderName" align="center" label="统计周期">
-            {{this.beginTime }} 至 {{this.endTime}}
-          </el-table-column>
-          <!--          <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
-          <!--          <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
-
+          <el-table-column prop="content" align="center" label="日期"> </el-table-column>
+          <el-table-column prop="content" align="center" label="订单金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="优惠金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="挂账金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="充值金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="充值赠送金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="会员消费金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="归还金额（元）"> </el-table-column>
+          <el-table-column prop="content" align="center" label="新增会员数"> </el-table-column>
         </el-table>
       </div>
       <div class="pagination-box">
@@ -326,7 +337,7 @@ export default {
   display: flex;
   align-items: center;
   //width: 200px;
-  font-family: Source Han Sans CN, Source Han Sans CN;
+  //font-family: Source Han Sans CN, Source Han Sans CN;
   font-weight: 400;
   font-size: 13px;
   color: #888888;
@@ -338,8 +349,8 @@ export default {
 }
 .size-bole{
   height: 31px;
-  font-family: YouSheBiaoTiHei;
-  font-weight: 400;
+  //font-family: YouSheBiaoTiHei;
+  font-weight: 600;
   font-size: 24px;
   color: #555555;
   //line-height: 0px;
diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
index ced6f784c..818a30951 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
@@ -38,17 +38,16 @@
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #0DC291"></div>
-            <div class="nei">优惠金额（元）/笔数</div>
+            <div class="nei">订单总金额（元）/笔数</div>
           </div>
         </div>
         <div class="box">
           <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
             <div class="size-bole" style="color:#00CAFF;">0/0</div>
           </el-tooltip>
-
           <div class="size-hui">
             <div class="dian" style="background: #00CAFF"></div>
-            <div class="nei">油品订单优惠金额（元）/笔数</div>
+            <div class="nei">实收总金额（元）</div>
           </div>
         </div>
         <div class="box">
@@ -58,7 +57,7 @@
 
           <div class="size-hui">
             <div class="dian" style="background: #F44522"></div>
-            <div class="nei">便利店订单优惠金额（元）/笔数</div>
+            <div class="nei">退款总金额（元）/笔数</div>
           </div>
         </div>
         <div class="box">
@@ -68,7 +67,7 @@
 
           <div class="size-hui">
             <div class="dian" style="background: #FF7E00"></div>
-            <div class="nei">积分商城订单优惠金额（元）/笔数</div>
+            <div class="nei">日均订单金额（元）</div>
           </div>
         </div>
       </div>
@@ -336,8 +335,8 @@ import {
   }
   .size-bole{
     height: 31px;
-    font-family: YouSheBiaoTiHei;
-    font-weight: 400;
+    //font-family: YouSheBiaoTiHei;
+    font-weight: 600;
     font-size: 24px;
     color: #555555;
     //line-height: 0px;