20221227 充值归集

xiaoyong931011

2023-01-17 8049faa20ca33b159f6384bbbc2d3429ad8be41b

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -100,11 +100,11 @@
</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>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverDone">导出已发货订单</button>
<!--        <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>-->
<!--        <button type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" onclick="print('tool(orderTable)')">layui自定义打印表格</button>-->
        <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>
<!--        <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="getCheckData">获取选中行数据</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="getCheckLength">获取选中数目</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="isAll">验证是否全选</button>-->
@@ -180,6 +180,11 @@
            }
            if (layEvent === 'seeOrder') {
                febs.modal.open( '订单详情', 'modules/order/orderDetail/' + data.id, {
                    maxmin: true,
                });
            }
            if (layEvent === 'seeOrderFlow') {
                febs.modal.open( '流水详情', 'modules/order/seeOrderFlow/' + data.id, {
                    maxmin: true,
                });
            }
@@ -262,24 +267,24 @@
                toolbar: '#tableToolBar',
                totalRow: true ,// 开启合计行
                cols: [[
                        {type: 'checkbox',fixed: 'left'},
                        // {type: 'checkbox',fixed: 'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 120,align:'left', totalRowText: '合计：'},
                        {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
                        {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
                        {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
                        {field: 'remark', title: '备注', minWidth: 200,align:'left'},
                        // {field: 'remark', title: '备注', minWidth: 200,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                        {field: 'deliverType', title: '配送方式',
                            templet: function (d) {
                                if (d.deliverType === 1) {
                                    return '<span style="color:green;">快递寄送</span>'
                                } else if (d.deliverType === 2) {
                                    return '<span style="color:blue;">到店自提</span>'
                                }else{
                                    return '<span style="color:green;">快递寄送</span>'
                                }
                            }, minWidth: 120,align:'center'},
                        // {field: 'deliverType', title: '配送方式',
                        //     templet: function (d) {
                        //         if (d.deliverType === 1) {
                        //             return '<span style="color:green;">快递寄送</span>'
                        //         } else if (d.deliverType === 2) {
                        //             return '<span style="color:blue;">到店自提</span>'
                        //         }else{
                        //             return '<span style="color:green;">快递寄送</span>'
                        //         }
                        //     }, minWidth: 120,align:'center'},
                    {field: 'status', title: '状态',
                        templet: function (d) {
                            if (d.status === 1) {
@@ -300,28 +305,32 @@
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                        {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
                        // {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
                        {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                        {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
                        // {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
                        {field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
                        {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
                        // {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
                        // {title: '操作',
                        //     templet: function (d) {
                        //             if (d.status === 2) {
                        //                 if(d.deliverType ===2){
                        //                     return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="takeGoods" 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 layui-btn-success" 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-xs layui-btn-normal layui-btn-danger" 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>'
                        //             }
                        //         // }
                        //     },minWidth: 200,align:'center', fixed:'right'}
                        {title: '操作',
                            templet: function (d) {
                                    if (d.status === 2) {
                                        if(d.deliverType ===2){
                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="takeGoods" 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 layui-btn-success" 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-xs layui-btn-normal layui-btn-danger" 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>'
                                    }
                                // }
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrderFlow" shiro:hasPermission="user:update">查看流水</button>'
                            },minWidth: 200,align:'center', fixed:'right'}
                ]]
            });