fix

Hentua

2023-06-04 4e34319c9d3f57bd20e12e45e8ecbae8e0435591

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

@@ -7,22 +7,25 @@
                        <div class="layui-form-item">
                            <div class="layui-col-md10">
                                <div class="layui-inline">
                                    <label class="layui-form-label">购买人：</label>
                                    <div class="layui-input-inline">
                                        <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
                                        <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">商品信息：</label>
                                    <div class="layui-input-inline">
                                        <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
                                        <input type="text" placeholder="商品信息" name="goodsName" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">订单编号：</label>
                                    <div class="layui-input-inline">
                                        <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">订单状态</label>
                                    <label class="layui-form-label">订单状态：</label>
                                    <div class="layui-input-inline">
                                        <select name="status">
                                            <option value="">请选择</option>
@@ -37,7 +40,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">支付状态</label>
                                    <label class="layui-form-label">支付状态：</label>
                                    <div class="layui-input-inline">
                                        <select name="payResult">
                                            <option value="">请选择</option>
@@ -47,14 +50,14 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">开始时间</label>
                                    <label class="layui-form-label">开始时间：</label>
                                    <div class="layui-input-inline">
                                        <input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
                                               placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">结束时间</label>
                                    <label class="layui-form-label">结束时间：</label>
                                    <div class="layui-input-inline">
                                        <input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
                                               placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
@@ -91,6 +94,20 @@
    </div>
</div>
<!-- 表格操作栏 start -->
<script type="text/html" id="mall-order-option">
    {{# if(d.status === 2) { }}
        <button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" type="button" shiro:hasPermission="deliverGoods:update" lay-event="deliverGoods">发货</button>
        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderDetail:view" lay-event="seeOrder">详情</button>
        <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>
    {{# } else if(d.status === 7) { }}
<!--    <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderDetail:view" lay-event="seeOrder">详情</button>-->
<!--    <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>-->
    <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="delOrder">删除</button>
    {{# } else { }}
    <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderDetail:view" lay-event="seeOrder">详情</button>
    <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>
    {{# } }}
</script>
<script type="text/html" id="user-option">
    <span shiro:lacksPermission="user:view,user:update,user:delete">
        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
@@ -100,14 +117,10 @@
</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 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 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>-->
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliver">导出未发货订单</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" id="importDeliver" lay-event="importDeliver">导入发货</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliverDone">导出已发货订单</button>
        <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view">自定义打印</button>
    </div>
</script>
<!-- 表格操作栏 end -->
@@ -128,6 +141,7 @@
            laydate = layui.laydate,
            tableIns;

        let mallOrderOption = $.trim($("#mall-order-option").html())==="" ? true : false;
        //日期范围
        laydate.render({
            elem: '#febs-form-group-date-start'
@@ -138,6 +152,10 @@
        });

        form.render();

        let currPageGoods = 1;//首先默认值为1，防止出错
        //获取当前页
        currPageGoods = $view.find(".layui-laypage-em").next().html();

        // 表格初始化
        initTable();
@@ -198,6 +216,11 @@
                    delOrder(data.id);
                });
            }
            if (layEvent === 'orderMoneyFlow') {
                febs.modal.open( '订单流水', 'modules/order/orderMoneyFlow/' + data.id, {
                    maxmin: true,
                });
            }
            if (layEvent === 'seePayImage') {
                var t = $view.find('#seePayImage'+data.id+'');
                //页面层
@@ -239,14 +262,14 @@
        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
            tableIns.reload({where: params, page: {curr: currPageGoods}});
        });

        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
            tableIns.reload({where: getQueryParams(), page: {curr: currPageGoods}, initSort: sortObject});
        });

        $add.on('click', function () {
@@ -258,7 +281,7 @@
                elem: $view.find('table'),
                id: 'orderTable',
                url: ctx + 'admin/order/orderList?orderType=1',
                defaultToolbar: [],
                // defaultToolbar: [],
                toolbar: '#tableToolBar',
                totalRow: true ,// 开启合计行
                cols: [[
@@ -269,6 +292,7 @@
                        {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'goodsName', 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) {
@@ -279,50 +303,54 @@
                                    return '<span style="color:green;">快递寄送</span>'
                                }
                            }, minWidth: 120,align:'center'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                    {field: 'status', title: '状态',
                        templet: function (d) {
                            if (d.status === 1) {
                                return '<span style="color:blue;">待支付</span>'
                            } else if (d.status === 2) {
                                return '<span style="color:red;">待发货</span>'
                            }else if (d.status === 3) {
                                return '<span style="color:green;">待收货</span>'
                            }else if (d.status === 4) {
                                return '<span style="color:green;">已完成</span>'
                            }else if (d.status === 5) {
                                return '<span style="color:green;">退款中</span>'
                            }else if (d.status === 6) {
                                return '<span style="color:green;">已退款</span>'
                            }else if (d.status === 7) {
                                return '<span style="color:green;">已取消</span>'
                            }else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                        {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
                        {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                    {field: 'status', title: '状态',
                            templet: function (d) {
                                if (d.status === 1) {
                                    return '<span style="color:red;">待支付</span>'
                                } else if (d.status === 2) {
                                    return '<span style="color:green;">待发货</span>'
                                }else if (d.status === 3) {
                                    return '<span style="color:green;">待收货</span>'
                                }else if (d.status === 4) {
                                    return '<span style="color:green;">已完成</span>'
                                }else if (d.status === 5) {
                                    return '<span style="color:green;">退款中</span>'
                                }else if (d.status === 6) {
                                    return '<span style="color:green;">已退款</span>'
                                }else if (d.status === 7) {
                                    return '<span style="color:green;">已取消</span>'
                                }else{
                                    return ''
                                }
                            }, minWidth: 80,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) {
                                        if(d.deliverType ===2){
                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" 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" 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>'
                                    }
                                // }
                            },minWidth: 200,align:'center', fixed:'right'}

                        {title: '操作', minWidth: 200 ,toolbar: '#mall-order-option',hide:mallOrderOption,align:'left', 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>'
                        //                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="orderMoneyFlow" shiro:hasPermission="orderMoneyFlow: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>'
                        //                         +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="orderMoneyFlow" shiro:hasPermission="orderMoneyFlow: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>'
                        //                     +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="orderMoneyFlow" shiro:hasPermission="orderMoneyFlow:update">资金流水</button>'
                        //             }else{
                        //                 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="orderMoneyFlow" shiro:hasPermission="orderMoneyFlow:update">资金流水</button>'
                        //             }
                        //     },minWidth: 200,align:'center', fixed:'right'}
                ]]
            });
        }