From e22a23f05f250c48f4bfa7c23b4d4ead08040219 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 10 Jul 2024 14:58:33 +0800
Subject: [PATCH] no message

---
 .../reconciliation/tab/ref.vue                | 16 +++++--
 .../reconciliation/tab/trading.vue            | 45 ++++++++++++++++---
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
index e6b8b8a5b..da94be5c2 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
@@ -311,7 +311,9 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
       },
       // 获取订单统计信息
 
-      getOrderStatistics() {
+      async getOrderStatistics() {
+        await this.getDeptList()
+
         let dateRange = []
         if (this.beginTime && this.endTime) {
           dateRange.push(this.beginTime.toLocaleDateString())
@@ -319,12 +321,17 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
         }
         getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
           this.orderStatistics = res.data
+          this.getOrderStatistics()
+
+
         })
       },
 
 
       // 获取列表信息
-      getList(val){
+      async getList(val){
+        await this.getDeptList()
+
         let dateRange = []
         if (this.beginTime && this.endTime) {
           dateRange.push(this.beginTime.toLocaleDateString())
@@ -334,8 +341,8 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
           this.orderList = response.data.records;
           this.total = response.data.total;
           this.isSysDate = false
+
         })
-        this.getOrderStatistics()
       },
       async getDeptList() {
         // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
@@ -343,6 +350,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
         // })
         await getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
           this.queryParams.deptId = response.data.deptId;
+
         })
       },
       // 搜索按钮操作
@@ -361,7 +369,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
         this.endTime = ""
         this.status = "refund"
 
-          this.getDeptList()
+        this.getDeptList()
 
         this.handleQuery();
       },
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
index 3d74486cd..68856c9f2 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -112,7 +112,7 @@
           </div>
         </div>
         <div class="box">
-          <div class="size-bole">{{ orderStatistics.balance?orderStatistics.balance:0 }}元/{{orderStatistics.balanceCount}}笔</div>
+          <div class="size-bole">{{ orderStatistics.balance?orderStatistics.balance:0 }}元</div>
           <div class="size-hui">
             <div class="nei">会员钱包收款</div>
 
@@ -122,6 +122,17 @@
 
           </div>
         </div>
+        <div class="box">
+          <div class="size-bole">{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}笔</div>
+          <div class="size-hui">
+            <div class="nei">会员钱包笔数</div>
+
+            <div class="icon-img">
+              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
+            </div>
+
+          </div>
+        </div>
         <!--        <div class="box">-->
         <!--          <div class="size-hui">银行卡收款</div>-->
         <!--          <div class="size-bole">{{ 0 }}元/{{0}}笔</div>-->
@@ -131,7 +142,7 @@
         <!--          <div class="size-bole">{{ 0 }}元/{{0}}笔</div>-->
         <!--        </div>-->
         <div class="box">
-          <div class="size-bole">{{ orderStatistics.cash?orderStatistics.cash:0 }}元/{{orderStatistics.cashcount}}笔</div>
+          <div class="size-bole">{{ orderStatistics.cash?orderStatistics.cash:0 }}元</div>
 
           <div class="size-hui">
             <div class="nei">现金支付收款</div>
@@ -142,6 +153,18 @@
 
           </div>
         </div>
+        <div class="box">
+          <div class="size-bole">{{orderStatistics.cashcount?orderStatistics.cashcount:0}}笔</div>
+
+          <div class="size-hui">
+            <div class="nei">现金收款笔数</div>
+
+            <div class="icon-img">
+              <img src="../../../../assets/images/cut/组 4666@2x.png" alt="">
+            </div>
+
+          </div>
+        </div>
       </div>
     </el-card>
     <el-card class="box-card">
@@ -373,7 +396,7 @@ import {
       this.isSysDate = true
       await this.getDeptList();
 
-      this.getList();
+      // this.getList();
 
     },
     methods:{
@@ -383,6 +406,8 @@ import {
         // })
         await getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
           this.queryParams.deptId = response.data.deptId;
+          // this.getList()
+
         })
       },
       exportExcelCashier() {
@@ -398,7 +423,9 @@ import {
       },
       // 获取订单统计信息
 
-      getOrderStatistics() {
+      async getOrderStatistics() {
+        await this.getDeptList()
+
         let dateRange = []
         if (this.beginTime && this.endTime) {
           dateRange.push(this.beginTime.toLocaleDateString())
@@ -410,7 +437,8 @@ import {
       },
 
       // 获取列表信息
-      getList(val){
+      async getList(val){
+        await this.getDeptList()
         let dateRange = []
         if (this.beginTime && this.endTime) {
           dateRange.push(this.beginTime.toLocaleDateString())
@@ -420,8 +448,10 @@ import {
           this.orderList = response.data.records;
           this.total = response.data.total;
           this.isSysDate = false
-        })
-        this.getOrderStatistics()
+            // this.getDeptList()
+            this.getOrderStatistics()
+
+          })
       },
       getOrdersInfo(data) {
         this.dialogVisible = true;
@@ -438,6 +468,7 @@ import {
         this.queryParams = {
           page: 1,
           pageSize: 10,
+          deptType:"3",
         }
         this.beginTime = ""
         this.endTime = ""