From 6c235963d6fc46b38ea59d9b19c6519b892e080b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:42:06 +0800
Subject: [PATCH] 20220516  逻辑删除,更新字段IS_Delete字段为已删除,默认为空,删除后其余信息从查询中过滤了

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html |    3 ++-
 1 files changed, 2 insertions(+), 1 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 bef684f..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
@@ -106,6 +106,7 @@
                 <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>
@@ -150,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