20220902

xiaoyong931011

2022-09-19 275b0a27bdffdea06ce6c67d439cf1e8c89b8f5b

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

@@ -41,6 +41,20 @@
                                        </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>

                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -83,12 +97,13 @@
    <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>
    </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', 'upload','laydate'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
@@ -100,7 +115,17 @@
            $searchForm = $view.find('form'),
            $add = $view.find('#add'),
            sortObject = {field: 'phone', type: null},
            laydate = layui.laydate,
            tableIns;

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

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

        form.render();

@@ -112,6 +137,10 @@

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

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

@@ -149,6 +178,11 @@
                    cancelOrder(data.id);
                });
            }
            if (layEvent === 'delOrder') {
                febs.modal.confirm('删除订单', '确认删除订单？', function () {
                    delOrder(data.id);
                });
            }
            if (layEvent === 'seePayImage') {
                var t = $view.find('#seePayImage'+data.id+'');
                //页面层
@@ -168,6 +202,13 @@

        function cancelOrder(id) {
            febs.get(ctx + 'admin/order/cancelOrder/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }

        function delOrder(id) {
            febs.get(ctx + 'admin/order/delOrder/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
@@ -233,6 +274,9 @@
                                    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 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>'
                                    }
@@ -244,7 +288,15 @@

        // 获取查询参数
        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(),