From 85dce973eb29eb2372c76d5b95b30354da9c41c8 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:08:51 +0800
Subject: [PATCH] fead:新增收银员字段
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
index 5089a00..1d42fa1 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html
@@ -52,7 +52,7 @@
</select>
</div>
<div class="form-group mr-20">
- <label>订单日期</label>
+ <label>付款日期</label>
<input autocomplete="off" name="beginTimeVo" type="text" class="form-control datetimepicker" id="beginTime">-
<input autocomplete="off" name="endTimeVo" type="text" class="form-control datetimepicker" id="endTime">
</div>
@@ -100,10 +100,13 @@
<th data-field="vipPhone">客户手机号</th>
<th data-field="orderTime" data-formatter="MGrid.getTime"
data-sortable="true">下单时间</th>
+ <th data-field="payTime" data-formatter="MGrid.getTime"
+ data-sortable="true">支付时间</th>
<th data-field="statu">订单状态</th>
<th data-field="total">订单总价</th>
<th data-field="zkTotal">折后价</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>
@@ -148,7 +151,7 @@
layer.confirm('确定取消此订单？', {
btn: ['确认', '取消'] //可以无限个按钮
}, function(index, layero){
- $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
+ $.post(basePath+'/admin/order/erpCancelOrder?id='+id+'&del=0', {}, function(data){
if (data.status == '200') {
parent.layer.msg(data.info,{icon: 1});
} else {
--
Gitblit v1.9.1