#
luxiaotao1123
2020-06-20 29373a7e62771b7c82714dc8d041c8b56c261293
#
4个文件已修改
80 ■■■■■ 已修改文件
src/main/java/com/zy/system/entity/User.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/user/user.js 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/user/user.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/user/user_detail.html 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/system/entity/User.java
@@ -33,12 +33,12 @@
    private Long hostId;
    /**
     * 账号
     * 名称
     */
    private String username;
    /**
     * 手机号
     * 账号
     */
    private String mobile;
src/main/webapp/static/js/user/user.js
@@ -20,15 +20,15 @@
        cols: [[
            {type: 'checkbox'}
            ,{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
            ,{field: 'hostName', align: 'center',title: '授权商户'}
            ,{field: 'username', align: 'center',title: '账号'}
            ,{field: 'mobile', align: 'center',title: '手机号'}
            // ,{field: 'hostName', align: 'center',title: '授权商户'}
            ,{field: 'username', align: 'center',title: '名称'}
            ,{field: 'mobile', align: 'center',title: '账号'}
            ,{field: 'password', align: 'center',title: '密码'}
            ,{field: 'roleName', align: 'center',title: '角色'}
            ,{field: 'createTime$', align: 'center',title: '注册时间'}
            // ,{field: 'createTime$', align: 'center',title: '注册时间'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:100}
        ]],
        request: {
            pageName: 'curr',
@@ -87,7 +87,7 @@
                    title: '新增',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    shadeClose: true,
                    content: 'user_detail.html',
                    success: function(layero, index){
                        clearFormVal(layer.getChildFrame('#detail', index));
@@ -203,7 +203,7 @@
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: false,
                    shadeClose: true,
                    content: 'user_detail.html',
                    success: function(layero, index){
                        setFormVal(layer.getChildFrame('#detail', index), data);
src/main/webapp/views/user/user.html
@@ -15,13 +15,7 @@
<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <label class="layui-form-label">编  号:</label>
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="id" placeholder="请输入" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <label class="layui-form-label">手 机 号:</label>
        <label class="layui-form-label">帐  号:</label>
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="mobile" placeholder="请输入" autocomplete="off">
        </div>
@@ -34,18 +28,6 @@
        -
        <div class="layui-input-inline">
            <input class="layui-input" type="text" id="create_time<" name="create_time<" placeholder="请输入结束时间" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <label class="layui-form-label">授权商户:</label>
        <div class="layui-input-inline cool-auto-complete">
            <input id="hostId" class="layui-input" name="host_id" type="text" placeholder="请输入" autocomplete="off" style="display: none">
            <input id="hostName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入" onfocus=this.blur()>
            <div class="cool-auto-complete-window">
                <input class="cool-auto-complete-window-input" data-key="hostQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">
                <select class="cool-auto-complete-window-select" data-key="hostQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                </select>
            </div>
        </div>
    </div>
    <div class="layui-inline">
@@ -79,7 +61,6 @@
</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>
</script>
src/main/webapp/views/user/user_detail.html
@@ -21,28 +21,28 @@
                <input id="id" class="layui-input" type="text" placeholder="编号">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label"><span class="not-null">*</span>授权商户:</label>-->
<!--            <div class="layui-input-inline cool-auto-complete">-->
<!--                <input id="hostId" class="layui-input" type="text" placeholder="授权商户" lay-verify="required"  style="display: none">-->
<!--                <input id="hostName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="授权商户" onfocus=this.blur()>-->
<!--                <div class="cool-auto-complete-window">-->
<!--                    <input class="cool-auto-complete-window-input" data-key="hostQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
<!--                    <select class="cool-auto-complete-window-select" data-key="hostQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
<!--                    </select>-->
<!--                </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 cool-auto-complete">
                <input id="hostId" class="layui-input" type="text" placeholder="授权商户" lay-verify="required"  style="display: none">
                <input id="hostName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="授权商户" onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="hostQuery" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="hostQuerySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            <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" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>账  号:</label>
            <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" >
            </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">
                <input id="mobile" class="layui-input" type="text" placeholder="手机号" lay-verify="required" >
                <input id="mobile" class="layui-input" type="text" placeholder="账号" lay-verify="required" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
@@ -64,18 +64,11 @@
            </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">
                <input id="createTime$" class="layui-input" type="text" placeholder="注册时间" lay-verify="required"  autocomplete="off">
            </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="2">冻结</option>
                    <option value="3">删除</option>
                </select>
            </div>