From a72aa4bb793ec765892406c842039a71b33215b1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 11 Mar 2021 18:12:22 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 81177eb..b69b459 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
@@ -78,11 +78,15 @@
<th data-field="orderTime" data-formatter="MGrid.getTime"
data-sortable="true">下单时间</th>
<th data-field="total">订单总价</th>
+
<th data-field="zkTotal">折后价</th>
+ <th data-field="payTime" data-formatter="MGrid.getTime"
+ data-sortable="true">支付时间</th>
<th data-field="staffName">下单顾问</th>
<th data-field="cashPay">现金支付金额</th>
<th data-field="cardPay">卡支付金额</th>
<th data-field="arrears">欠款金额</th>
+
<th data-field="statu">订单状态</th>
<th data-field="remark">备注</th>
@@ -219,7 +223,11 @@
btn: ['确认', '取消并删除', '取消'] //可以无限个按钮
}, function(index, layero){
$.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
- parent.layer.msg(data.info,{icon: 1});
+ if (data.status == '200') {
+ parent.layer.msg(data.info,{icon: 1});
+ } else {
+ parent.layer.msg(data.info,{icon: 2});
+ }
layer.closeAll();
myGrid.serchData();
});
--
Gitblit v1.9.1