From 1c538f36affa979e585a9a0b5a7739cdc36a14d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 01 Apr 2022 14:32:48 +0800
Subject: [PATCH] 取消订单的状态判断

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html |    3 ++-
 1 files changed, 2 insertions(+), 1 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 6f356c3..e12ec06 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
@@ -121,6 +121,7 @@
             <th data-field="totalTime" data-sortable="true">服务时长</th>
             <th data-field="isOverTime" data-formatter="overTime">超时时间</th>
             <th data-field="createStaffName">下单顾问</th>
+            <th data-field="cashierName">划扣人</th>
             <th data-field="shopName">门店</th>
             <th data-sortable="true" data-field="id" data-formatter="buidOperate">操作</th>
         </tr>
@@ -200,7 +201,7 @@
                 break;
             case '服务完成':
                 html +=btns[4].replace('VALUE',value);
-                html += btns[2].replace('VALUE',value);
+                // html += btns[2].replace('VALUE',value);
                 break;
             case '待确认':
                 html +=btns[7].replace('VALUE',value);

--
Gitblit v1.9.1