#
luxiaotao1123
2021-04-03 c9686962d78c018a89c5be7023b4ef74960e5d5b
#
3个文件已修改
57 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/system/controller/ResourceController.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/custOrder/custOrder.js 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/resource/resource.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/system/controller/ResourceController.java
@@ -105,13 +105,22 @@
        return R.ok();
    }
//    @RequestMapping(value = "/resource/delete/auth")
//    @ManagerAuth(memo = "菜单删除")
//    public R delete(Integer[] ids){
//        if (Cools.isEmpty(ids)){
//            return R.error();
//        }
//        resourceService.deleteBatchIds(Arrays.asList(ids));
//        return R.ok();
//    }
    @RequestMapping(value = "/resource/delete/auth")
    @ManagerAuth(memo = "菜单删除")
    public R delete(Integer[] ids){
        if (Cools.isEmpty(ids)){
            return R.error();
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
        for (Long id : ids){
            resourceService.deleteById(id);
        }
        resourceService.deleteBatchIds(Arrays.asList(ids));
        return R.ok();
    }
src/main/webapp/static/js/custOrder/custOrder.js
@@ -39,21 +39,22 @@
        cols: [[
            {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'number', align: 'center',title: '单号'}
            ,{field: 'number', align: 'center', merge: true, title: '单号'}
            ,{field: 'btypeId', align: 'center',title: '客户编号'}
            ,{field: 'btypeId', align: 'center', merge: ['number'], title: '客户编号'}
            ,{field: 'etypeId', align: 'center',title: '经手人编号', hide: true}
            ,{field: 'billDate', align: 'center',merge: ['number'],title: '单据日期'}
            ,{field: 'userCode', align: 'center',title: '商品编号'}
            ,{field: 'qty', align: 'center',title: '商品数量'}
            ,{field: 'price', align: 'center',title: '商品单价', hide: true}
            ,{field: 'comment', align: 'center',title: '商品备注', hide: true}
            ,{field: 'status$', align: 'center',title: '状态', templet: '#statusTpl', width: 100}
            ,{field: 'billDate', align: 'center',title: '单据日期'}
            // ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间', hide: true}
            // ,{field: 'memo', align: 'center',title: '备注'}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 120}
            ,{fixed: 'right', title:'操作', align: 'center', merge: ['number'], toolbar: '#operate', width: 120}
        ]],
        request: {
            pageName: 'curr',
@@ -75,16 +76,9 @@
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            tableX.merges('custOrder', [1, 11]);
            // tableX.merges('custOrder', [1, 11]);
            tableMerge.render(this);
            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';
                }
            });
        }
    });
@@ -515,22 +509,6 @@
        page: {
            curr: pageCurr
        },
        // done: function (res, curr, count) {
        //     if (res.code === 403) {
        //         top.location.href = baseUrl+"/";
        //     }
        //     pageCurr=curr;
        //     if (res.data.length === 0 && count !== 0) {
        //         tableIns.reload({
        //             where: searchData,
        //             page: {
        //                 curr: pageCurr-1
        //             }
        //         });
        //         pageCurr -= 1;
        //     }
        //     limit(child);
        // }
    });
}
src/main/webapp/views/resource/resource.html
@@ -57,7 +57,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">菜单编码</label>
                    <div class="layui-input-block">
                        <input name="name" placeholder="请输入菜单编码" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                        <input name="code" placeholder="请输入菜单编码" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>