后台修改

xiaoyong931011

2023-04-14 e6575875452fe6668afdfbfe34bf3e48d0cdbc7b

 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>
@@ -65,14 +65,14 @@
                                        <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">
                                                   placeholder="yyyy-MM-dd HH:mm:ss" 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">
                                                   placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
                                        </div>
                                </div>
                            </div>
@@ -89,7 +89,7 @@
                    </form>
                    <table lay-filter="orderTable" lay-data="{id: 'orderTable'}"></table>
                    <style type="text/css">
                        .layui-table-cell{
                        .layui-table cell{
                            text-align:center;
                            height: auto;
                            white-space: nowrap; /*文本不会换行，在同一行显示*/
@@ -98,6 +98,11 @@
                        }
                        .layui-table img{
                            max-width:100px
                        }

                        ::-webkit-scrollbar {
                            height: 20px !important;
                            background-color: #f4f4f4;
                        }
                    </style>
                </div>
@@ -113,10 +118,10 @@
    <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>
<!--        <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>-->
@@ -138,18 +143,21 @@
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            $add = $view.find('#add'),
            sortObject = {field: 'phone', type: null},
            sortObject = {field: 'orderTime', type: 'desc'},
            formSelects = layui.formSelects,
            laydate = layui.laydate,
            tableIns;

        let currPageOrder = 1;//首先默认值为1，防止出错
        //获取当前页
        currPageOrder = $view.find(".layui-laypage-em").next().html();
        //日期范围
        laydate.render({
            elem: '#febs-form-group-date-start'
            elem: '#febs-form-group-date-start',type: 'datetime'
        });

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


@@ -187,19 +195,24 @@
                    printSelect(checkStatus.data)
                }
            }
            let statisticIds = 0;
            if(event === 'goodsStatistics'){
                var data = checkStatus.data;
                let statistics = 0;
                for(let i = 0;i < data.length;i++){
                        statistics = statistics+ "," + data[i].id;
                }
                console.log(statistics);
                if(statistics == null || statistics == ""){
                    febs.alert.warn('请选择需要统计的订单');
                    return;
                }
                febs.modal.open( '商品数量统计', 'modules/order/goodsStatistics/'+statistics, {
                statisticIds = statistics;
                console.log(statisticIds);
                febs.modal.open( '商品数量统计', 'modules/order/goodsStatistics/'+statisticIds, {
                    maxmin: true,
                });
                statistics = 0;
                // febs.get(ctx + 'admin/order/goodsStatistics?orderIds='+ids, null, function () {
                //     febs.alert.success('操作成功');
                //     $query.click();
@@ -207,7 +220,7 @@
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if(event === 'confirmOrder'){
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                // let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                // if(uniqueCodeValue == '' || uniqueCodeValue == null){
                //     febs.alert.warn('请选择团长');
                //     return;
@@ -231,7 +244,7 @@
                    febs.alert.warn('请选择确认到货的订单');
                    return;
                }
                febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
                febs.get(ctx + 'admin/order/confirmOrder?orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
@@ -300,6 +313,8 @@
            ,accept: 'file' //普通文件
            ,done: function(res){
                console.log("123");
                febs.alert.success('操作成功');
                $query.click();
            }
        });

@@ -309,9 +324,22 @@
                layEvent = obj.event;
            if (layEvent === 'deliverGoods') {
                febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
                    btn: ['确认', '取消'],
                    btn: ['确认','取消'],
                    yes: function (index, layero) {
                        $('#deliver-update').find('#submit').trigger('click');
                        // $query.click();
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'updateDeliver') {
                febs.modal.open('修改物流信息', 'modules/order/deliverGoods/' + data.id, {
                    btn: ['确认','取消'],
                    yes: function (index, layero) {
                        $('#deliver-update').find('#deliverInfoSubmit').trigger('click');
                        // $query.click();
                    },
                    btn2: function () {
                        layer.closeAll();
@@ -355,14 +383,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: currPageOrder}});
        });

        // 刷新按钮
        $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: currPageOrder}, initSort: sortObject});
        });

        $add.on('click', function () {
@@ -374,28 +402,21 @@
                elem: $view.find('table'),
                id: 'orderTable',
                url: ctx + 'admin/order/orderList?orderType=1',
                defaultToolbar: [],
                toolbar: '#tableToolBar',
                // defaultToolbar: [],
                //系统自带打印导出
                totalRow : true,
                toolbar: '#tableToolBarOrder',
                cols: [[
                        {type: 'checkbox', fixed: 'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
                        {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: 'remark', title: '备注', minWidth: 160,align:'left'},
                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
                        {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
                        {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 +437,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'},
@@ -436,6 +457,9 @@
                                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 if(d.status === 3){
                                    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="updateDeliver" 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>'
                                }
@@ -512,7 +536,7 @@
            //用于包含内容
            var v = document.createElement("div");
            //页面头部，导入css  ，media="print"表示打印时使用该样式
            var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:20%}",
            var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;}",
                ".main div{width:100%;display:inline-block;}", "</style>", "</head>"
            ].join("");
            var contentHtml = "";
@@ -520,12 +544,12 @@
                let data = allData[i]
                var template =
                    "<div class='main'>" +
                    // "<div style='text-align: center;font-size: 22px;font-weight: bold;margin-bottom: 30px'>订单详情</div>" +
                    "<div>姓名：" + data.name + "</div><br><br>" +
                    "<div>电话：" + data.phone + "</div><br><br>" +
                    "<div>地址：" + data.address + "</div><br><br>" +
                    "<div>编号：" + data.orderNo + "</div><br><br>" +
                    "<div>商品：" + data.goodsName + "</div><br><br>" +
                    "<div style='text-align: center;font-size: 10px;font-weight: bold;margin-bottom: 10px'>订单编号：" + data.orderNo + "</div>" +
                        "<span style='font-size: 10px;font-weight: bold;'>收货人：</span><span>" + data.name + "，</span>" +
                        "<span style='font-size: 10px;font-weight: bold;'>电话：</span><span>" + data.phone + "，</span>" +
                        "<span style='font-size: 10px;font-weight: bold;'>地址：</span><span>" + data.address + "</span><br>" +
                        "<span style='font-size: 10px;font-weight: bold;'>商品：</span><span>" + data.goodsName + "</span><br>" +
                        "<span style='font-size: 10px;font-weight: bold;'>备注：</span><span>" + data.remark + "</span><br>" +
                    "</div>"

                contentHtml += template;