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/beautySalon/service_all_list.html | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
index 785ca3a..17397a9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html
@@ -111,6 +111,7 @@
<th data-field="money">消耗金额</th>
<th data-field="createTime" data-sortable="true" data-formatter="MGrid.getTime">下单时间</th>
<th data-field="yyTime" data-sortable="true" data-formatter="MGrid.getTime">预约时间</th>
+ <th data-field="consumeTime" data-sortable="true" data-formatter="MGrid.getTime">划扣时间</th>
<th data-field="totalTime" data-sortable="true">服务时长</th>
<th data-field="isOverTime" data-formatter="overTime">超时时间</th>
<th data-field="createStaffName">下单顾问</th>
@@ -186,11 +187,13 @@
break;
case '需配料':
html +=btns[3].replace('VALUE',value);
+ html += btns[2].replace('VALUE',value);
break;
case '配料完成':
break;
case '服务完成':
html +=btns[4].replace('VALUE',value);
+ html += btns[2].replace('VALUE',value);
break;
}
html += btns[5].replace('VALUE',value);
--
Gitblit v1.9.1