From ac61bdd7a7f4834d35bf42a06bc766981f50211e Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 29 Jan 2021 20:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html
index af8c3ce..80f18c5 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html
@@ -77,15 +77,18 @@
<thead>
<tr>
<th data-formatter="MGrid.indexfn" data-align="center" data-width="30px" >序号</th>
- <th data-field="consume_time" data-formatter="MGrid.getTime" data-sortable="true" >服务日期</th>
+ <th data-field="SHOP_NAME" >门店</th>
+ <th data-field="yy_time" data-formatter="MGrid.getTime" data-sortable="true" >预约时间</th>
+ <th data-field="consume_time" data-formatter="MGrid.getTime" data-sortable="true" >划扣时间</th>
<th data-field="SERVICE_NO" >服务单号</th>
<th data-field="PROJ_NAME" >服务名称</th>
<th data-field="TYPE_NAME" >分类</th>
<th data-field="VIP_NAME" >客户名</th>
- <th data-field="COUNT" data-sortable="true" >次数</th>
- <th data-field="PRICE" data-sortable="true" >单价</th>
- <th data-field="su_name" >美疗师</th>
- <th data-field="SOURCE" >来源</th>
+ <th data-field="COUNT" data-sortable="true" >次数</th>
+ <th data-field="PRICE" data-sortable="true" >划扣单价</th>
+ <th data-field="extract" data-sortable="true" >提成</th>
+ <th data-field="su_name" >美疗师</th>
+ <th data-field="SOURCE" >来源</th>
</tr>
</thead>
</table>
@@ -107,7 +110,9 @@
//有删除权限
var delUrl="";
myGrid=MGrid.initGrid({
- url:basePath+"/admin/serviceStatistics/showList"
+ url:basePath+"/admin/serviceStatistics/showList",
+ sortName:"yy_time",
+ sortOrder:"desc"
});
});
--
Gitblit v1.9.1