From 7992cd7adb57f8f2cb4b4fa295afb8894c24d0bf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 18 May 2022 17:19:34 +0800
Subject: [PATCH] add export for deliver
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 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 f9fe296..b95c28e 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -79,14 +79,21 @@
<a lay-event="edit" shiro:hasPermission="user:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
+<script type="text/html" id="tableToolBar">
+ <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>
+ </div>
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs', 'upload'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
table = layui.table,
+ upload = layui.upload,
$view = $('#febs-order'),
$query = $view.find('#query'),
$reset = $view.find('#reset'),
@@ -99,6 +106,23 @@
// 表格初始化
initTable();
+
+ table.on('toolbar(orderTable)', function(obj){
+ var event = obj.event;
+
+ if (event == 'exportDeliver') {
+ window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2";
+ }
+ });
+
+ upload.render({
+ elem: '#importDeliver'
+ ,url: 'admin/order/importDeliver' //此处配置你自己的上传接口即可
+ ,accept: 'file' //普通文件
+ ,done: function(res){
+ console.log("123");
+ }
+ });
// 初始化表格操作栏各个按钮功能
table.on('tool(orderTable)', function (obj) {
@@ -171,6 +195,8 @@
elem: $view.find('table'),
id: 'orderTable',
url: ctx + 'admin/order/orderList?orderType=1',
+ defaultToolbar: [],
+ toolbar: '#tableToolBar',
cols: [[
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
{field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
@@ -178,13 +204,6 @@
{field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
- {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
- {field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
- {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
- {field: 'payImage', title: '支付凭证',
- templet: function (d) {
- return '<a lay-event="seePayImage"><img id="seePayImage'+d.id+'" src="'+d.payImage+'" alt=""></a>';
- }, minWidth: 100,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -205,25 +224,19 @@
return ''
}
}, minWidth: 80,align:'center'},
- {title: '操作',
- templet: function (d) {
- // if(d.payMethod === '支付宝支付' || d.payMethod === '微信支付'){
- // 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="cancelOrder" shiro:hasPermission="user:update">取消订单</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" 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>'
- // }
- // }else{
- 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{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
- }
- // }
- },minWidth: 300,align:'center'}
+ {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
+ {field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
+ {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
+ {title: '操作',
+ templet: function (d) {
+ 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{
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ }
+ // }
+ },minWidth: 200,align:'center', fixed:'right'}
]]
});
}
--
Gitblit v1.9.1