From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sum-list-new.html | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sum-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sum-list-new.html
index 98c6e83..6d0fc17 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sum-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sum-list-new.html
@@ -28,9 +28,9 @@
</div>
<div class="form-group mr-20">
- <label>日期范围</label>
- <input autocomplete="off" name="beginTime" type="text" class="form-control datetimepicker" id="beginTime">-
- <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="endTime">
+ <label>日期</label>
+ <input autocomplete="off" name="beginTime" type="text" class="form-control datetimepicker" id="beginTime">
+<!-- <input autocomplete="off" name="endTime" type="text" class="form-control datetimepicker" id="endTime">-->
</div>
</form>
@@ -41,14 +41,27 @@
<tr>
<th data-formatter="MGrid.indexfn" data-align="center"
data-width="30px" data-footer-formatter="footCountTitle">序号</th>
- <th data-field="time">日期</th>
- <th data-field="cashPay" data-footer-formatter="countColumn">收现金额</th>
- <th data-field="cardPay" data-footer-formatter="countColumn">实收余额支付</th>
- <th data-field="consumePay" data-footer-formatter="countColumn">消耗金额</th>
- <th data-field="freeConsumePay" data-footer-formatter="countColumn">赠送消耗</th>
+ <th data-field="dataTime">日期</th>
+ <th data-field="cashPay" data-footer-formatter="countColumn">现金收款</th>
+ <th data-field="arrearsPay" data-footer-formatter="countColumn">欠款</th>
+ <th data-field="" data-footer-formatter="countColumn">还款</th>
+ <th data-field="productAchieve" data-footer-formatter="countColumn">产品业绩</th>
+ <th data-field="cardAchieve" data-footer-formatter="countColumn">卡项业绩</th>
<th data-field="refundCashPay" data-footer-formatter="countColumn">现金退款</th>
<th data-field="refundCardPay" data-footer-formatter="countColumn">卡项退款</th>
- <th data-field="arrearsPay" data-footer-formatter="countColumn">欠款</th>
+ <th data-field="cardAmount" data-footer-formatter="countColumn">储值卡本金扣款</th>
+ <th data-field="cardFreeAmount" data-footer-formatter="countColumn">储值卡赠送扣款</th>
+ <th data-field="consumePay" data-footer-formatter="countColumn">本金消耗</th>
+ <th data-field="freeConsumePay" data-footer-formatter="countColumn">赠送消耗</th>
+ <th data-field="peopleCnt" data-footer-formatter="countColumn">人头数</th>
+ <th data-field="projConsumeCnt" data-footer-formatter="countColumn">项目消耗数</th>
+ <th data-field="timeLength" data-footer-formatter="countColumn">服务时长</th>
+ <th data-field="perCustomCnt" data-footer-formatter="countColumn">客单数</th>
+ <th data-field="customGoodsCnt" data-footer-formatter="countColumn">客品数</th>
+ <th data-field="perCustomPrice" data-footer-formatter="countColumn">客单价</th>
+ <th data-field="cost" data-footer-formatter="countColumn">成本</th>
+ <th data-field="grossProfit" data-footer-formatter="countColumn">毛利</th>
+ <th data-field="grossProfitRate" data-footer-formatter="countColumn">毛利率</th>
</tr>
</thead>
</table>
@@ -69,7 +82,7 @@
$(function() {
MTools.autoFullSelect();
myGrid = MGrid.initGrid({
- url : basePath+"/admin/sysBusinessData/showList",
+ url : basePath+"/admin/sysBusinessData/findShopBusinessesData",
showExport : true,
showFooter : true,
height:'',
@@ -91,10 +104,8 @@
return "<b>合计</b>";
};
function countColumn(data) {
- console.log(data)
field = this.field;
var resultsumQuantity = parseFloat((data.reduce(function(sum, row) {
- console.log(sum,row[field]);
return sum + (+row[field]);
}, 0)).toFixed(2));//保留有效数字
return "<b>"+resultsumQuantity+"</b>";
--
Gitblit v1.9.1