From 53c616910a3fd6f2f9669242690c1c85f2ba0a68 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 20 Dec 2020 23:51:03 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/custom-consume-list.html | 22 +++++++++++-----------
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html | 10 +++++++++-
zq-erp/src/main/resources/templates/views/admin/hive/statistics/custom-consume-list.html | 22 +++++++++++-----------
3 files changed, 31 insertions(+), 23 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) {
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
index bb31054..52b161d 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
@@ -95,6 +95,14 @@
.el-autocomplete {
display: block !important;
}
+
+ .vip-info {
+ padding: 30px 20px;
+ }
+
+ .vip-info p {
+ line-height: 30px;
+ }
</style>
</head>
@@ -182,7 +190,7 @@
<el-main style="background-color: white; margin-right: 15px; padding: 20px 30px;">
<el-tabs v-model="activeName" type="card" @tab-click="tabHandleClick">
<el-tab-pane label="会员信息" name="vipInfo">
- <el-row>
+ <el-row class="vip-info">
<el-col :span="10">
<p>生日 : {{vipInfo.birthday1}}</p>
<p>会员状态 : {{vipInfo.vipState}}</p>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/custom-consume-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/custom-consume-list.html
index ab383d4..bef3210 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/custom-consume-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/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