From 01fb2bd4b360caa4c97d18c8213efc56d40cfa57 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 14 Sep 2022 09:47:39 +0800 Subject: [PATCH] 20220902 --- src/main/resources/templates/febs/views/modules/order/orderList.html | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html index 8ea89e4..84817eb 100644 --- a/src/main/resources/templates/febs/views/modules/order/orderList.html +++ b/src/main/resources/templates/febs/views/modules/order/orderList.html @@ -83,6 +83,7 @@ <div class="layui-btn-container"> <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliver">导出未发货订单</button> <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button> + <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverDone">导出已发货订单</button> </div> </script> <!-- 表格操作栏 end --> @@ -112,6 +113,10 @@ if (event == 'exportDeliver') { window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2"; + } + + if (event == 'exportDeliverDone') { + window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=3"; } }); @@ -149,6 +154,11 @@ cancelOrder(data.id); }); } + if (layEvent === 'delOrder') { + febs.modal.confirm('删除订单', '确认删除订单?', function () { + delOrder(data.id); + }); + } if (layEvent === 'seePayImage') { var t = $view.find('#seePayImage'+data.id+''); //页面层 @@ -168,6 +178,13 @@ function cancelOrder(id) { febs.get(ctx + 'admin/order/cancelOrder/' + id, null, function () { + febs.alert.success('操作成功'); + $query.click(); + }); + } + + function delOrder(id) { + febs.get(ctx + 'admin/order/delOrder/' + id, null, function () { febs.alert.success('操作成功'); $query.click(); }); @@ -233,6 +250,9 @@ if (d.status === 2) { return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>' + }else if(d.status === 7){ + return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>' + +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>' }else{ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>' } -- Gitblit v1.9.1