From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/custom-consume-list.html | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/custom-consume-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/custom-consume-list.html
index ab383d4..bef3210 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/custom-consume-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/custom-consume-list.html
@@ -56,7 +56,7 @@
<div class="row mb-10">
<div class="col-sm-8">
<button onclick="myGrid.serchData()" type="button" class="btn btn-info btn-sm"><i class="fa fa-search" ></i> 搜索</button>
- <button onclick="myGrid.resetForm()" type="button" class="btn btn-default btn-sm"><i class="fa fa-refresh " ></i> 重置</button>
+ <button type="reset" class="btn btn-default btn-sm"><i class="fa fa-refresh " ></i> 重置</button>
<!-- <button matrix:btn="ygyjbb-exportExcel" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button>-->
</div>
</div>
@@ -71,9 +71,9 @@
<th data-field="vipName" data-formatter="buildVipNameJump">姓名</th>
<th data-field="meiliao">美疗师</th>
<th data-field="arriveCnt">到店次数</th>
- <th data-field="goodsCash">消费金额</th>
- <th data-field="hisConsume">消耗本金</th>
- <th data-field="freeConsume">消耗赠送</th>
+ <th data-field="goodsCash" data-formatter="countColumn">消费金额</th>
+ <th data-field="hisConsume" data-formatter="countColumn">消耗本金</th>
+ <th data-field="freeConsume" data-formatter="countColumn">消耗赠送</th>
</tr>
</thead>
@@ -94,6 +94,7 @@
$(function() {
MTools.autoFullSelect();
+ $(".select2").select2();
myGrid = MGrid.initGrid({
url : basePath+"/admin/vipStatistics/vipConsumeStatistics",
showExport : true,
@@ -120,13 +121,12 @@
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>";
+ if (data) {
+ var resultsumQuantity = parseFloat(data).toFixed(2);//保留有效数字
+ return resultsumQuantity;
+ } else {
+ return "-";
+ }
};
function buildVipNameJump(value, row, index) {
--
Gitblit v1.9.1