From b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Mar 2022 15:27:25 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
index 3126f80..db60893 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html
@@ -95,6 +95,7 @@
<th data-field="bedName">床位</th>
<th data-field="plsName" >配料师</th>
<th data-field="createStaffName">创建人</th>
+ <th data-field="cashierName">划扣人</th>
<th data-field="shopName">所属门店</th>
</tr>
</thead>
@@ -138,7 +139,7 @@
layer.confirm('确定取消此订单？', {
btn: ['确认', '取消'] //可以无限个按钮
}, function(index, layero){
- $.post(basePath+'/admin/projService/cancelOrder?id='+id, {}, function(data){
+ $.post(basePath+'/admin/projService/erpCancelOrder?id='+id, {}, function(data){
parent.layer.msg(data.info,{icon: 1});
layer.closeAll();
myGrid.serchData();
--
Gitblit v1.9.1