From b83ba3cc4687f21d744e9866e10e30e91229e8a4 Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Thu, 28 Jan 2021 16:23:30 +0800
Subject: [PATCH] gx

---
 hive-app/pages/manager/companyReports.vue |  132 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 109 insertions(+), 23 deletions(-)

diff --git a/hive-app/pages/manager/companyReports.vue b/hive-app/pages/manager/companyReports.vue
index 595d814..e8103e8 100644
--- a/hive-app/pages/manager/companyReports.vue
+++ b/hive-app/pages/manager/companyReports.vue
@@ -25,12 +25,50 @@
 						<text>¥{{item.totalPay | formatNum}}</text>
 					</view>
 					<view class="list-row">
-						<text>现金收入</text>
+						<text>现金收款</text>
 						<text>¥{{item.cashPay | formatNum}}</text>
 					</view>
 					<view class="list-row">
-						<text>余额划扣</text>
+						<text>储值卡收款</text>
 						<text>¥{{item.cardPay | formatNum}}</text>
+					</view><view class="list-row">
+						<text>欠款</text>
+						<text>¥{{item.arrearsPay | formatNum}}</text>
+					</view><view class="list-row">
+						<text>现金退款</text>
+						<text>¥{{item.refundCashPay | formatNum}}</text>
+					</view><view class="list-row">
+						<text>卡项退款</text>
+						<text>¥{{item.refundCardPay | formatNum}}</text>
+					</view><view class="list-row">
+						<text>产品业绩</text>
+						<text>¥{{item.productAchieve | formatNum}}</text>
+					</view><view class="list-row">
+						<text>卡项业绩</text>
+						<text>¥{{item.cardAchieve | formatNum}}</text>
+					</view><view class="list-row">
+						<text>还款</text>
+						<text>¥{{item.refund | formatNum}}</text>
+					</view><view class="list-row">
+						<text>客单数</text>
+						<text>{{item.perCustomCnt}}</text>
+					</view><view class="list-row">
+						<text>客品数</text>
+						<text>{{item.customGoodsCnt}}</text>
+					</view><view class="list-row">
+						<text>客单价</text>
+						<text>¥{{item.perCustomPrice | formatNum}}</text>
+					</view><view class="list-row">
+						<text>成本</text>
+						<text>¥{{item.cost | formatNum}}</text>
+					</view>
+					<view class="list-row">
+						<text>毛利</text>
+						<text>¥{{item.grossProfit | formatNum}}</text>
+					</view>
+					<view class="list-row">
+						<text>毛利率</text>
+						<text>{{item.grossProfitRate}}</text>
 					</view>
 					<view class="list-row">
 						<text>本金消耗</text>
@@ -41,16 +79,16 @@
 						<text>¥{{item.freeConsumePay | formatNum}}</text>
 					</view>
 					<view class="list-row">
-						<text>现金退款</text>
-						<text>¥{{item.refundCashPay | formatNum}}</text>
+						<text>人头数</text>
+						<text>{{item.peopleCnt}}个</text>
 					</view>
 					<view class="list-row">
-						<text>卡项退款</text>
-						<text>¥{{item.refundCardPay | formatNum}}</text>
+						<text>项目消耗数</text>
+						<text>{{item.projConsumeCnt}}个</text>
 					</view>
 					<view class="list-row">
-						<text>欠款</text>
-						<text>¥{{item.arrearsPay | formatNum}}</text>
+						<text>服务时长</text>
+						<text>{{item.timeLength}}分钟</text>
 					</view>
 				</view>
 			</view>
@@ -68,32 +106,80 @@
 						<text>营业收入</text>
 						<text class="iconfont iconarrow-backimg"></text>
 					</view>
-					<view class="list-row-bordered" @click="toAnalyse('现金收入', 2)">
-						<text>现金收入</text>
+					<view class="list-row-bordered" @click="toAnalyse('现金收款', 2)">
+						<text>现金收款</text>
 						<text class="iconfont iconarrow-backimg"></text>
 					</view>
-					<view class="list-row-bordered" @click="toAnalyse('余额划扣', 3)">
-						<text>余额划扣</text>
+					<view class="list-row-bordered" @click="toAnalyse('储值卡收款', 3)">
+						<text>储值卡收款</text>
 						<text class="iconfont iconarrow-backimg"></text>
 					</view>
-					<view class="list-row-bordered" @click="toAnalyse('本金消耗', 4)">
-						<text>本金消耗</text>
+					<view class="list-row-bordered" @click="toAnalyse('欠款', 4)">
+						<text>欠款</text>
 						<text class="iconfont iconarrow-backimg"></text>
 					</view>
-					<view class="list-row-bordered" @click="toAnalyse('赠送消耗', 5)">
-						<text>赠送消耗</text>
-						<text class="iconfont iconarrow-backimg"></text>
-					</view>
-					<view class="list-row-bordered" @click="toAnalyse('现金退款', 6)">
+					<view class="list-row-bordered" @click="toAnalyse('现金退款', 5)">
 						<text>现金退款</text>
 						<text class="iconfont iconarrow-backimg"></text>
 					</view>
-					<view class="list-row-bordered" @click="toAnalyse('卡项退款', 7)">
+					<view class="list-row-bordered" @click="toAnalyse('卡项退款', 6)">
 						<text>卡项退款</text>
 						<text class="iconfont iconarrow-backimg"></text>
 					</view>
-					<view class="list-row-bordered" @click="toAnalyse('欠款', 8)">
-						<text>欠款</text>
+					<view class="list-row-bordered" @click="toAnalyse('产品业绩', 7)">
+						<text>产品业绩</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('卡项业绩', 8)">
+						<text>卡项业绩</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('还款', 9)">
+						<text>还款</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('客单数', 10)">
+						<text>客单数</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('客品数', 11)">
+						<text>客品数</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('客单价', 12)">
+						<text>客单价</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('成本', 13)">
+						<text>成本</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('毛利', 14)">
+						<text>毛利</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('毛利率', 15)">
+						<text>毛利率</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('本金消耗', 16)">
+						<text>本金消耗</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('赠送消耗', 17)">
+						<text>赠送消耗</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('人头数', 18)">
+						<text>人头数</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('项目消耗数', 19)">
+						<text>项目消耗数</text>
+						<text class="iconfont iconarrow-backimg"></text>
+					</view>
+					<view class="list-row-bordered" @click="toAnalyse('服务时长', 20)">
+						<text>服务时长</text>
 						<text class="iconfont iconarrow-backimg"></text>
 					</view>
 				</view>
@@ -163,7 +249,7 @@
 		onPullDownRefresh(){
 			this.reloadData();
 			let timer = setTimeout(function () {
-				uni.startPullDownRefresh();
+				uni.stopPullDownRefresh();
 				clearTimeout(timer);
 				timer = null;
 			}, 800);

--
Gitblit v1.9.1