#

luxiaotao1123

2021-04-13 aedfc60ea1414f88bc0d2e8a0ed503e8950c8af0

#

 src/main/java/orderDetl.sql

File was deleted

 src/main/java/zy/cloud/wms/manager/controller/OrderSettleController.java

@@ -1,6 +1,5 @@
package zy.cloud.wms.manager.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -82,13 +81,9 @@

    @RequestMapping(value = "/orderSettle/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam String param){
        List<OrderSettle> list = JSONArray.parseArray(param, OrderSettle.class);
        if (Cools.isEmpty(list)){
            return R.error();
        }
        for (OrderSettle entity : list){
            orderSettleService.delete(new EntityWrapper<>(entity));
    public R delete(@RequestParam(value="ids[]") Long[] ids){
        for (Long id : ids){
            orderSettleService.deleteById(id);
        }
        return R.ok();
    }

 src/main/webapp/static/js/orderSettle/orderSettle.js

@@ -17,7 +17,6 @@
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        even: true,
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
@@ -31,7 +30,7 @@
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 120}
        ]],
        request: {
            pageName: 'curr',
@@ -54,14 +53,6 @@
            }
            pageCurr=curr;
            limit();
            form.on('checkbox(tableCheckbox)', function (data) {
                var _index = $(data.elem).attr('table-index')||0;
                if(data.elem.checked){
                    res.data[_index][data.value] = 'Y';
                }else{
                    res.data[_index][data.value] = 'N';
                }
            });
        }
    });

@@ -83,36 +74,20 @@

    // 监听头工具栏事件
    table.on('toolbar(orderSettleTab)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id);
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
                var data = checkStatus.data;
                if (data.length === 0){
                    layer.msg('请选择数据');
                } else {
                    layer.confirm('确定删除'+(data.length===1?'此':data.length)+'条数据吗', function(){
                        $.ajax({
                            url: baseUrl+"/orderSettle/delete/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: {param: JSON.stringify(data)},
                            method: 'POST',
                            traditional:true,
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg, {icon: 2})
                if (checkStatus.length === 0) {
                    layer.msg('请选择要删除的数据', {icon: 2});
                    return;
                                }
                            }
                        })
                var ids = checkStatus.map(function (d) {
                    return d.orderSettle;
                    });
                }
                del(ids);
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
@@ -163,10 +138,15 @@
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                var ids = [];
                ids.push(data.orderSettle);
                del(ids);
                break;
        }
    });

    /* 显示表单弹窗 */
    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
@@ -189,7 +169,7 @@
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                $(".layui-laypage-btn")[0].click();
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
@@ -206,28 +186,45 @@
        });
    }


    // 复选框事件
    form.on('checkbox(detailCheckbox)', function (data) {
        var el = data.elem;
        if (el.checked) {
            $(el).val('Y');
    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/orderSettle/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
        } else {
            $(el).val('N');
                        layer.msg(res.msg, {icon: 2});
        }
                }
            })
    });
    }

    // 搜索栏搜索事件
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
        tableReload();
    });

    // 搜索栏重置事件
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
        tableReload();
    });

    // 时间选择器
@@ -249,14 +246,6 @@
    });
    tableIns.reload({
        where: searchData,
        page: {
            curr: pageCurr
        }
        page: {curr: pageCurr}
    });
}

$('body').keydown(function () {
    if (event.keyCode === 13) {
        $("#search").click();
    }
});

 src/main/webapp/static/js/resource/resource.js

File was deleted

 src/main/webapp/views/orderSettle/orderSettle.html

@@ -17,7 +17,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="orderSettle" placeholder="订单状态" autocomplete="off">
            <input class="layui-input" type="text" name="order_settle" placeholder="订单状态" autocomplete="off">
        </div>
    </div>

@@ -41,8 +41,8 @@
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -87,7 +87,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">备注:</label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="备注">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>
            </div>

 src/main/webapp/views/resource/resource2.html

File was deleted

 src/main/webapp/views/resource/resource_detail.html

File was deleted