From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
index 5bc8e86..bae588e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
@@ -91,6 +91,7 @@
<th data-field="payTime" data-formatter="MGrid.getTime"
data-sortable="true">支付时间</th>
<th data-field="staffName">下单顾问</th>
+ <th data-field="cashierName">收银员</th>
<th data-field="cashPay">现金支付金额</th>
<th data-field="cardPay">卡支付金额</th>
<th data-field="arrears">欠款金额</th>
@@ -228,6 +229,13 @@
function cancelOrder() {
var id=myGrid.getSelectItemId();
+ var items=myGrid.getSelectItem();
+ if(items.statu != "待付款"){
+ layer.msg("只允许取消【待付款】状态的订单", {
+ icon: 7
+ });
+ return false;
+ }
layer.confirm('确定取消此订单？', {
btn: ['确认', '取消'] //可以无限个按钮
}, function(index, layero){
--
Gitblit v1.9.1