fix

Helius

2022-09-22 5a8bb0c1dde052c6c95d545f53ae27d42338529d

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

@@ -32,6 +32,24 @@
                                    </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">
                                        <select name="payResult">
@@ -40,6 +58,20 @@
                                            <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">
                                            <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>
                                        <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">
                                        </div>
                                </div>
                            </div>

@@ -81,14 +113,16 @@
</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="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="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 -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs', 'upload'], function () {
    layui.use([ 'jquery', 'form', 'table', 'febs', 'formSelects', 'upload','laydate'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
@@ -100,18 +134,77 @@
            $searchForm = $view.find('form'),
            $add = $view.find('#add'),
            sortObject = {field: 'phone', type: null},
            formSelects = layui.formSelects,
            laydate = layui.laydate,
            tableIns;

        //日期范围
        laydate.render({
            elem: '#febs-form-group-date-start'
        });

        laydate.render({
            elem: '#febs-form-group-date-end'
        });


        form.render();

        formSelects.render();
        //(下拉框)
        $.get(ctx + 'admin/leader/selectList', function (data) {
            for (var k in data)
            {
                $(".order-takeUniqueCode").append("<option value='" + data[k].uniqueCode + "'>" + data[k].name + "</option>");
            }
            layui.use('form', function () {
                var form = layui.form;
                form.render();
            });
        });

        // 表格初始化
        initTable();

        table.on('toolbar(orderTable)', function(obj){
            var event = obj.event;
            var id = obj.config.id;
            var checkStatus = table.checkStatus(id);
            if(event === 'confirmOrder'){
                var data = checkStatus.data;
                let ids = "";
                for(let i = 0;i < data.length;i++){
                    ids = ids + data[i].id+","
                }
                // layer.alert(layui.util.escape(JSON.stringify(data)));
                console.log(ids);
                if(ids == null || ids == ""){
                    febs.alert.warn('请选择确认到货的订单');
                    return;
                }
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                if(uniqueCodeValue == '' || uniqueCodeValue == null){
                    febs.alert.warn('请选择团长');
                    return;
                }
                febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
                // 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;
                }
                window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&takeUniqueCode="+uniqueCodeValue;
                $query.click();
            }

            if (event == 'exportDeliver') {
                window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2";
            if (event == 'exportDeliverTwo') {
                window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2&deliveryType=2";
            }
        });

@@ -198,13 +291,25 @@
                defaultToolbar: [],
                toolbar: '#tableToolBar',
                cols: [[
                        {type: 'checkbox', fixed: 'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
                        {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
                        {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
                        {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                        // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'goodsName', title: '商品', minWidth: 120,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
                        {field: 'carriage', title: '运费', minWidth: 120,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: 120,align:'center'},
                        {field: 'status', title: '状态',
                            templet: function (d) {
                                if (d.status === 1) {
@@ -225,18 +330,24 @@
                                    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: 120,align:'center'},
                        {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
                        {field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
                        {field: 'payOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
                        {field: 'wxOrderNo', 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'}
                ]]
            });
@@ -244,11 +355,21 @@

        // 获取查询参数
        function getQueryParams() {
            let startTimestr = $searchForm.find('input[name="startTime"]').val().trim();
            let endTimeStr = $searchForm.find('input[name="endTime"]').val().trim();
            if(startTimestr != '' && endTimeStr != '' && startTimestr >= endTimeStr){
                febs.alert.warn('开始时间需要小于结束时间');
                return{};
            }
            return {
                startTime: $searchForm.find('input[name="startTime"]').val().trim(),
                endTime: $searchForm.find('input[name="endTime"]').val().trim(),
                name: $searchForm.find('input[name="name"]').val().trim(),
                orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                payResult: $searchForm.find("select[name='payResult']").val(),
                status: $searchForm.find("select[name='status']").val(),
                isHome: $searchForm.find("select[name='isHome']").val(),
                uniqueCode: $searchForm.find("select[name='uniqueCode']").val(),
            };
        }