From f814c0fa37eb38c2ff2349792f0e6bbb70d9d451 Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Sat, 9 Nov 2024 10:34:02 +0800
Subject: [PATCH] 11.9

---
 .../views/handover/HandoverDetailsInfo.vue    | 117 ++++++++++--------
 1 file changed, 62 insertions(+), 55 deletions(-)

diff --git a/fuintAdmin/src/views/handover/HandoverDetailsInfo.vue b/fuintAdmin/src/views/handover/HandoverDetailsInfo.vue
index eab517210..0526d78e6 100644
--- a/fuintAdmin/src/views/handover/HandoverDetailsInfo.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetailsInfo.vue
@@ -29,39 +29,39 @@
       </div>
       <div class="d-s-b">
         <div>优惠金额</div>
-        <div>{{orderSummary.allDis}}</div>
-      </div>
-      <div class="d-s-b">
-        <div>退款金额</div>
         <div>{{orderSummary.oilRefund}}</div>
       </div>
+      <div class="d-s-b">
+        <div>退款金额</div>
+        <div>{{orderSummary.oilPaid}}</div>
+      </div>
       <div class="d-s-b">
         <div>挂账金额</div>
-        <div>--</div>
+        <div>{{orderSummary.onAccount}}</div>
       </div>
       <div class="d-s-b">
         <div>会员消费</div>
-        <div>{{orderSummary.allBalanceP}}</div>
+        <div>{{orderSummary.consumptionMoney}}</div>
       </div>
       <div class="d-s-b">
         <div>实收金额</div>
-        <div>{{orderSummary.allMoney}}</div>
+        <div>{{orderSummary.receiptsMoney}}</div>
       </div>
       <div class="d-s-b">
         <div>充值金额</div>
-        <div>{{orderSummary.cardPaid}}</div>
+        <div>{{orderSummary.onAccount}}</div>
       </div>
       <div class="d-s-b">
         <div>充值赠送</div>
-        <div>{{orderSummary.cardGiftPaid}}</div>
+        <div>{{orderSummary.giftAccount}}</div>
       </div>
       <div class="d-s-b">
         <div>会员总余额</div>
-        <div>{{orderSummary.points}}</div>
+        <div>{{orderSummary.memberBalance}}</div>
       </div>
       <div class="d-s-b">
         <div>会员总积分</div>
-        <div>{{orderSummary.sumnum}}</div>
+        <div>{{orderSummary.memberPoints}}</div>
       </div>
       <div class="xxing"></div>
       <div class="for-box">
@@ -77,18 +77,18 @@
         </div>
         <div class="d-s-b">
           <div class="l-size">营业总额</div>
-          <div class="s-size">{{orderSummary.allyingye1}}</div>
-          <div class="r-size">￥{{orderSummary.allyingye}}</div>
+          <div class="s-size">{{orderSummary.oilOrder}}</div>
+          <div class="r-size">￥{{orderSummary.receiptsMoney}}</div>
         </div>
         <div class="d-s-b">
           <div class="l-size">充值总额</div>
-          <div class="s-size">{{orderSummary.allchuzhika1}}</div>
-          <div class="r-size">￥{{orderSummary.allchuzhika}}</div>
+          <div class="s-size">{{orderSummary.rechargeAll}}</div>
+          <div class="r-size">￥{{orderSummary.onAccount}}</div>
         </div>
         <div class="d-s-b">
           <div class="l-size">合计</div>
-          <div class="s-size">{{orderSummary.allyingye1 + orderSummary.allchuzhika1}}</div>
-          <div class="r-size">￥{{orderSummary.allyingye + orderSummary.allchuzhika}}</div>
+          <div class="s-size">{{ orderSummary.orderall}}</div>
+          <div class="r-size">￥{{ orderSummary.orderalls}}</div>
         </div>
       </div>
 
@@ -105,9 +105,9 @@
           <div class="r-size">实收金额</div>
         </div>
         <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all'">
-            <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-            <div class="s-size">{{item.numberOfDeals}}</div>
-            <div class="r-size">￥{{item.paidAmount}}</div>
+            <div class="l-size">{{item.payType}}</div>
+            <div class="s-size">{{item.orderNum}}</div>
+            <div class="r-size">￥{{item.truePay}}</div>
         </div>
       </div>
 
@@ -123,9 +123,9 @@
           <div class="r-size">实收金额</div>
         </div>
         <div class="d-s-b" v-for="item in oilNumberStatistics">
-          <div class="l-size">{{item.oilName}}</div>
-          <div class="s-size">{{item.numberOfDeals}}</div>
-          <div class="r-size">￥{{item.paidAmount}}</div>
+          <div class="l-size">{{item.name}}</div>
+          <div class="s-size">{{item.orderNum}}</div>
+          <div class="r-size">￥{{item.payAmount}}</div>
         </div>
       </div>
 
@@ -140,10 +140,10 @@
           <div class="f-size">笔数</div>
           <div class="r-size">实收金额</div>
         </div>
-        <div class="d-s-b" v-for="item in oilNumberStatistics">
-          <div class="l-size">{{item.oilName}}</div>
-          <div class="s-size">{{item.numberOfDeals}}</div>
-          <div class="r-size">￥{{item.paidAmount}}</div>
+        <div class="d-s-b" v-for="item in discountStatistics">
+          <div class="l-size">{{item.name}}</div>
+          <div class="s-size">{{item.orderNum}}</div>
+          <div class="r-size">￥{{item.discountAmount}}</div>
         </div>
       </div>
 
@@ -158,10 +158,10 @@
           <div class="f-size">笔数</div>
           <div class="r-size">实收金额</div>
         </div>
-        <div class="d-s-b" v-for="item in oilNumberStatistics">
-          <div class="l-size">{{item.oilName}}</div>
-          <div class="s-size">{{item.numberOfDeals}}</div>
-          <div class="r-size">￥{{item.paidAmount}}</div>
+        <div class="d-s-b" v-for="item in backMoneyStatistics">
+          <div class="l-size">{{item.name}}</div>
+          <div class="s-size">{{item.orderNum}}</div>
+          <div class="r-size">￥{{item.refMoney}}</div>
         </div>
       </div>
 
@@ -177,10 +177,10 @@
           <div class="f-size">笔数</div>
           <div class="r-size">实收金额</div>
         </div>
-        <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all' && item.payType == 'balance'">
+        <div class="d-s-b" v-for="item in billingDetails" v-if="item.flag == 'all' && item.payType == 'balance'">
           <div class="l-size">{{item.name}}</div>
-          <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-          <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+          <div class="s-size">{{item.orderNum?item.orderNum:'--'}}</div>
+          <div class="r-size">￥{{item.amount?item.amount:'--'}}</div>
         </div>
       </div>
 
@@ -195,10 +195,10 @@
           <div class="f-size">笔数</div>
           <div class="r-size">实收金额</div>
         </div>
-        <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'allbalance'">
-          <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-          <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-          <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+        <div class="d-s-b" v-for="item in employeeStatistics" v-if="item.flag == 'allbalance'">
+          <div class="l-size">{{item.payType}}</div>
+          <div class="s-size">{{item.orderNum?item.orderNum:'--'}}</div>
+          <div class="r-size">￥{{item.rechargeBalance?item.rechargeBalance:'--'}}</div>
         </div>
       </div>
 
@@ -215,8 +215,8 @@
         </div>
         <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all' && item.payType == 'balance'">
           <div class="l-size">合计</div>
-          <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-          <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+          <div class="s-size">{{item.orderNums?item.orderNums:'--'}}</div>
+          <div class="r-size">￥{{item.orderNum?item.orderNum:'--'}}</div>
         </div>
       </div>
 
@@ -231,10 +231,10 @@
           <div class="f-size">笔数</div>
           <div class="r-size">实收金额</div>
         </div>
-        <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'goods'">
-          <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-          <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-          <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+        <div class="d-s-b" v-for="item in goodsNumberStatistics" v-if="item.flag == 'goods'">
+          <div class="l-size">{{item.payType}}</div>
+          <div class="s-size">{{item.orderNum?item.orderNum:'--'}}</div>
+          <div class="r-size">￥{{item.payAmount?item.payAmount:'--'}}</div>
         </div>
       </div>
 
@@ -250,10 +250,10 @@
           <div class="f-size">笔数</div>
           <div class="r-size">实收金额</div>
         </div>
-        <div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'point'">
-          <div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
-          <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-          <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+        <div class="d-s-b" v-for="item in integerNumberStatistics" v-if="item.flag == 'point'">
+          <div class="l-size">{{item.payType }}</div>
+          <div class="s-size">{{item.orderNum?item.orderNum:'--'}}</div>
+          <div class="r-size">￥{{item.amount?item.amount:'--'}}</div>
         </div>
       </div>
 
@@ -267,7 +267,7 @@
         <div class="d-s-b" style="font-weight: 600">
           <div class="l-size">新增会员数</div>
 <!--          <div class="f-size">笔数</div>-->
-          <div class="r-size">{{orderSummary.sumnum}}</div>
+          <div class="r-size">{{memberStatistics.userNum}}</div>
         </div>
 
       </div>
@@ -285,9 +285,9 @@
           <div class="r-size">实收金额</div>
         </div>
         <div class="d-s-b" v-for="item in returnedToTheAccount">
-          <div class="l-size">{{item.name?item.name:'--'}}</div>
-          <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-          <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+          <div class="l-size">{{item.status?item.status:'--'}}</div>
+          <div class="s-size">{{item.returnNum?item.returnNum:'--'}}</div>
+          <div class="r-size">￥{{item.amount?item.amount:'--'}}</div>
         </div>
       </div>
 
@@ -302,10 +302,10 @@
           <div class="f-size">笔数</div>
           <div class="r-size">实收金额</div>
         </div>
-        <div class="d-s-b" v-for="item in employeeStatistics">
+        <div class="d-s-b" v-for="item in staffStatistics">
           <div class="l-size">{{item.name?item.name:'--'}}</div>
-          <div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
-          <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
+          <div class="s-size">{{item.staffNum?item.staffNum:'--'}}</div>
+          <div class="r-size">￥{{item.monye?item.monye:'--'}}</div>
         </div>
       </div>
 
@@ -365,9 +365,16 @@ export default {
       this.employeeStatistics = this.handoverData.employeeStatistics,
       this.greaseGunStatistics = this.handoverData.greaseGunStatistics,
       this.oilNumberStatistics = this.handoverData.oilNumberStatistics,
+      this.discountStatistics = this.handoverData.discountStatistics,
+      this.backMoneyStatistics = this.handoverData.backMoneyStatistics,
       this.orderSummary = this.handoverData.orderSummary,
       this.paymentAggregation = this.handoverData.paymentAggregation,
+      this.goodsNumberStatistics = this.handoverData.goodsNumberStatistics,
+      this.integerNumberStatistics = this.handoverData.integerNumberStatistics,
+      this.consumptionStatistics = this.handoverData.consumptionStatistics,
+      this.memberStatistics = this.handoverData.memberStatistics,
       this.returnedToTheAccount = this.handoverData.returnedToTheAccount,
+      this.staffStatistics = this.handoverData.staffStatistics,
       console.log("this.handoverList",this.handoverList)
     // this.getHandover();
 ;