xiaoyong931011
2023-02-15 f525ebb9c37eb93b4c29a50f3dc462430d228dc7
src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,9 +7,9 @@
                        <div class="layui-form-item">
                            <div class="layui-col-md10">
                                <div class="layui-inline">
                                    <label class="layui-form-label">用户名:</label>
                                    <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">
@@ -19,7 +19,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">订单状态</label>
                                    <label class="layui-form-label layui-form-label-sm">状态</label>
                                    <div class="layui-input-inline">
                                        <select name="status">
                                            <option value="">请选择</option>
@@ -113,7 +113,7 @@
    <a lay-event="edit" shiro:hasPermission="user:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
</script>
<script type="text/html" id="tableToolBar">
<script type="text/html" id="tableToolBarOrder">
    <div class="layui-btn-container">
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单,系统自动发货</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>-->
@@ -300,6 +300,8 @@
            ,accept: 'file' //普通文件
            ,done: function(res){
                console.log("123");
                febs.alert.success('操作成功');
                $query.click();
            }
        });
@@ -374,28 +376,19 @@
                elem: $view.find('table'),
                id: 'orderTable',
                url: ctx + 'admin/order/orderList?orderType=1',
                defaultToolbar: [],
                toolbar: '#tableToolBar',
                // defaultToolbar: [],
                //系统自带打印导出
                toolbar: '#tableToolBarOrder',
                cols: [[
                        {type: 'checkbox', fixed: 'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
                        {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                        {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                        // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 160,align:'left'},
                        // {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
                        {field: 'amount', title: '总金额', minWidth: 100,align:'left'},
                        {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                        // {field: 'isHome', title: '配送方式',
                        //     templet: function (d) {
                        //         if (d.isHome === 2) {
                        //             return '<span style="color:dodgerblue;">自提</span>'
                        //         } else if (d.isHome === 1) {
                        //             return '<span style="color:forestgreen;">送货上门</span>'
                        //         }else{
                        //             return ''
                        //         }
                        //     }, minWidth: 100,align:'center'},
                        {field: 'status', title: '状态',
                            templet: function (d) {
                                if (d.status === 1) {
@@ -416,18 +409,18 @@
                                    return ''
                                }
                            }, minWidth: 80,align:'center'},
                    {field: 'deliveryState', title: '配送状态',
                        templet: function (d) {
                            if (d.deliveryState === 1) {
                                return '<span style="color:dodgerblue;">待配送</span>'
                            } else if (d.deliveryState === 2) {
                                return '<span style="color:forestgreen;">配送中</span>'
                            } else if (d.deliveryState === 3) {
                                return '<span style="color:forestgreen;">已送达</span>'
                            }else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                    // {field: 'deliveryState', title: '配送状态',
                    //     templet: function (d) {
                    //         if (d.deliveryState === 1) {
                    //             return '<span style="color:dodgerblue;">待配送</span>'
                    //         } else if (d.deliveryState === 2) {
                    //             return '<span style="color:forestgreen;">配送中</span>'
                    //         } else if (d.deliveryState === 3) {
                    //             return '<span style="color:forestgreen;">已送达</span>'
                    //         }else{
                    //             return ''
                    //         }
                    //     }, minWidth: 80,align:'center'},
                        {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
                        {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
                        // {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},