自动化立体仓库 - WMS系统
#
luxiaotao1123
2020-06-30 b8212145b46bd55d44c2190df05c3805b59e6816
#
4个文件已修改
45 ■■■■ 已修改文件
src/main/java/com/zy/asrs/task/TestScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/user/user.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/user/user.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/user/user_detail.html 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/TestScheduler.java
@@ -15,7 +15,7 @@
    @Scheduled(cron = "0/3 * * * * ? ")
    public void test(){
        logger.info("=====");
//        logger.info("=====");
    }
src/main/webapp/static/js/user/user.js
@@ -26,7 +26,7 @@
            ,{field: 'password', align: 'center',title: '密码'}
            ,{field: 'roleName', align: 'center',title: '角色'}
            // ,{field: 'createTime$', align: 'center',title: '注册时间'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'status$', align: 'center',title: '状态', templet: '#statusTpl', width: 120, unresize: true}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:100}
        ]],
@@ -53,6 +53,12 @@
            limit();
        }
    });
    // 修改状态
    form.on('switch(statusSwitch)', function (obj) {
        layer.tips(this.value + ' ' + this.name + ':'+ obj.elem.checked, obj.othis);
        layer.msg("操作成功")
    })
    // 监听排序事件
    table.on('sort(user)', function (obj) {
@@ -86,7 +92,7 @@
                    type: 2,
                    title: '新增',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['30%', top.detailHeight],
                    shadeClose: true,
                    content: 'user_detail.html',
                    success: function(layero, index){
@@ -202,7 +208,7 @@
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['30%', top.detailHeight],
                    shadeClose: true,
                    content: 'user_detail.html',
                    success: function(layero, index){
src/main/webapp/views/user/user.html
@@ -58,6 +58,10 @@
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>
</script>
<script type="text/html" id="statusTpl">
    <input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="正常|禁用" lay-filter="statusSwitch" {{ d.id == 1 ? 'checked' : '' }}>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
src/main/webapp/views/user/user_detail.html
@@ -14,7 +14,7 @@
<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <form id="detail" class="layui-form" style="text-align: center">
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编  号:</label>
            <div class="layui-input-inline">
@@ -33,25 +33,25 @@
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>帐  号:</label>
            <div class="layui-input-inline">
                <input id="mobile" class="layui-input" type="text" placeholder="账号" lay-verify="required" >
                <input id="mobile" class="layui-input" type="text" placeholder="账号" lay-verify="required" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>名  称:</label>
            <div class="layui-input-inline">
                <input id="username" class="layui-input" type="text" placeholder="名称" lay-verify="required" >
                <input id="username" class="layui-input" type="text" placeholder="名称" lay-verify="required"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">密  码:</label>
            <div class="layui-input-inline">
                <input id="password" class="layui-input" type="text" placeholder="密码">
                <input id="password" class="layui-input" type="text" placeholder="密码" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>角  色:</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="roleId" class="layui-input" type="text" placeholder="角色" lay-verify="required"  style="display: none">
@@ -63,17 +63,6 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>状  态:</label>
            <div class="layui-input-inline">
                <select id="status" lay-verify="required">
                    <option value="" style="display: none"></option>
                    <option value="1">启用</option>
                    <option value="3">删除</option>
                </select>
            </div>
        </div>
        <hr class="layui-bg-gray">