xiaoyong931011
2023-02-13 0c568e9f295471f6b80e0b6d156ae890163b19bf
src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,11 +7,13 @@
                        <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">
                                    </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>
@@ -25,30 +27,30 @@
                                            <option value="2">待发货</option>
                                            <option value="3">待收货</option>
                                            <option value="4">已完成</option>
                                            <option value="5">退款中</option>
                                            <option value="6">已退款</option>
<!--                                            <option value="5">退款中</option>-->
<!--                                            <option value="6">已退款</option>-->
                                            <option value="7">已取消</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">团长:</label>
                                    <div class="layui-input-inline">
                                        <select name="uniqueCode" class="order-takeUniqueCode">
                                            <option value="">请选择</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">配送方式</label>
                                    <div class="layui-input-inline">
                                        <select name="isHome">
                                            <option value="">请选择</option>
                                            <option value="1">送货上门</option>
                                            <option value="2">自提</option>
                                        </select>
                                    </div>
                                </div>
<!--                                <div class="layui-inline">-->
<!--                                    <label class="layui-form-label">团长:</label>-->
<!--                                    <div class="layui-input-inline">-->
<!--                                        <select name="uniqueCode" class="order-takeUniqueCode">-->
<!--                                            <option value="">请选择</option>-->
<!--                                        </select>-->
<!--                                    </div>-->
<!--                                </div>-->
<!--                                <div class="layui-inline">-->
<!--                                    <label class="layui-form-label layui-form-label-sm">配送方式</label>-->
<!--                                    <div class="layui-input-inline">-->
<!--                                        <select name="isHome">-->
<!--                                            <option value="">请选择</option>-->
<!--                                            <option value="1">送货上门</option>-->
<!--                                            <option value="2">自提</option>-->
<!--                                        </select>-->
<!--                                    </div>-->
<!--                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">支付状态</label>
                                    <div class="layui-input-inline">
@@ -113,13 +115,13 @@
</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="exportDeliverOne">导出待发货订单,系统自动发货</button>
<!--        <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>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="printSelect">自定义打印</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="goodsStatistics">统计商品份数</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="exportDeliverTwo">导出未发货订单(快递)</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="exportDeliverTwo">导出未发货订单(快递)</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>
    </div>
</script>
<!-- 表格操作栏 end -->
@@ -236,11 +238,11 @@
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if (event == 'exportDeliverOne') {
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                if(uniqueCodeValue == '' || uniqueCodeValue == null){
                    febs.alert.warn('请选择团长');
                    return;
                }
                // let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                // if(uniqueCodeValue == '' || uniqueCodeValue == null){
                //     febs.alert.warn('请选择团长');
                //     return;
                // }
                var data = checkStatus.data;
                let ids = "";
                for(let i = 0;i < data.length;i++){
@@ -260,8 +262,8 @@
                    febs.alert.warn('请选择待发货的订单');
                    return;
                }
                window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&takeUniqueCode="+uniqueCodeValue+'&orderIds='+ids;
                febs.get(ctx + 'admin/order/deliverOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
                window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&orderIds="+ids;
                febs.get(ctx + 'admin/order/deliverOrder?&orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
@@ -269,7 +271,26 @@
            }
            if (event == 'exportDeliverTwo') {
                window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2&deliveryType=2";
                var data = checkStatus.data;
                let ids = "";
                for(let i = 0;i < data.length;i++){
                    if(data[i].status != 2){
                        febs.alert.warn('请选择待发货的订单');
                        return;
                    }else if(data[i].deliveryState != 1){
                        febs.alert.warn('请选择待配送的订单');
                        return;
                    }else{
                        ids = ids + data[i].id+",";
                    }
                }
                // layer.alert(layui.util.escape(JSON.stringify(data)));
                console.log(ids);
                if(ids == null || ids == ""){
                    febs.alert.warn('请选择待发货的订单');
                    return;
                }
                window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2&deliveryType=2&orderIds="+ids;
            }
        });
@@ -362,19 +383,19 @@
                        {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: 80,align:'left'},
                        {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 160,align:'left'},
                        // {field: 'leaderName', title: '团长', minWidth: 120,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: '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) {
@@ -409,10 +430,16 @@
                        }, 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'},
                        // {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
                        {title: '操作',
                            templet: function (d) {
                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                if(d.status === 2){
                                    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="deliverGoods" 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'}
                ]]
            });