更新用户表的登录用户名的字段

2020-03-31 21:08:09 +08:00
parent e45e3b119e
commit f954061dba
16 changed files with 176 additions and 169 deletions
--- a/erp_web/js/modules/sys/sysLogin.js
+++ b/erp_web/js/modules/sys/sysLogin.js
@@ -4,7 +4,7 @@
 * @author jishenghua
 * @version 2019-09-14
 */
-$("#username, #password").on("focus blur", function () {
+$("#loginName, #password").on("focus blur", function () {
    var a = this;
    setTimeout(function () {
        var b = $(a).css("borderColor");
@@ -14,10 +14,10 @@ $("#username, #password").on("focus blur", function () {
    }, 100)
 }).blur();

-var userName = localStorage.getItem("username");
+var loginName = localStorage.getItem("loginName");
 var password = localStorage.getItem("password");
-if(userName){
-    $("#username").val(userName);
+if(loginName){
+    $("#loginName").val(loginName);
    setTimeout(function() {
        $("#rememberUserCode").parent().addClass("checked");
    },200);
@@ -36,8 +36,8 @@ $(document).keydown(function (event) {
    var k = e.keyCode || e.which || e.charCode;
    //兼容 IE,firefox 兼容
    var obj = e.srcElement ? e.srcElement : e.target;
-    //绑定键盘事件为 username 和password的输入框才可以触发键盘事件 13键盘事件
-    if (k == "13" && (obj.id == "username" || obj.id == "password"))
+    //绑定键盘事件为 loginName 和password的输入框才可以触发键盘事件 13键盘事件
+    if (k == "13" && (obj.id == "loginName" || obj.id == "password"))
        loginFun();
 });

@@ -45,39 +45,38 @@ $(document).keydown(function (event) {
 $('#btnSubmit').off("click").on("click", function () {
    var rememberUserCode = $("#rememberUserCode").parent().hasClass("checked");
    var rememberMe = $("#rememberMe").parent().hasClass("checked");
-    localStorage.removeItem("username");
+    localStorage.removeItem("loginName");
    localStorage.removeItem("password");
    if(rememberUserCode) {
-        localStorage.setItem("username",$("#username").val());
+        localStorage.setItem("loginName",$("#loginName").val());
    }
    if(rememberMe) {
-        localStorage.setItem("username",$("#username").val());
+        localStorage.setItem("loginName",$("#loginName").val());
        localStorage.setItem("password",$("#password").val());
    }
    loginFun();
 });
 //检测用户输入数据
 function loginFun() {
-    var username = $.trim($('#username').val());
+    var loginName = $.trim($('#loginName').val());
    var password = $.trim($('#password').val());
-    if (null == username || 0 == username.length) {
-        $("#username").val("").focus();
+    if (null == loginName || 0 == loginName.length) {
+        $("#loginName").val("").focus();
        return;
    }
-
    if (null == password || 0 == password.length) {
        $("#password").val("").focus();
        return;
    }
-    if (username != null && username.length != 0
+    if (loginName != null && loginName.length != 0
        && password != null && password.length != 0) {
-        $("#username").focus();
+        $("#loginName").focus();
        $.ajax({
            type: "post",
            url: "/user/login",
            dataType: "json",
            data: ({
-                loginName: username,
+                loginName: loginName,
                password:  hex_md5(password)
            }),
            success: function (res) {
@@ -85,7 +84,7 @@ function loginFun() {
                    var loginInfoTip = res.data.msgTip;
                    //用户名不存在，清空输入框并定位到用户名输入框
                    if (loginInfoTip.indexOf("user is not exist") != -1) {
-                        $("#username").val("").focus();
+                        $("#loginName").val("").focus();
                        $("#password").val("");
                        alert("用户名不存在");
                        return;
@@ -109,7 +108,7 @@ function loginFun() {
                                    if(res.data.user) {
                                        var user = res.data.user;
                                        sessionStorage.setItem("userId", user.id);
-                                        sessionStorage.setItem("loginName", user.loginame);
+                                        sessionStorage.setItem("loginName", user.loginName);
                                        top.location.href = "/index.html";
                                    }
                                }
--- a/erp_web/login.html
+++ b/erp_web/login.html
@@ -40,7 +40,7 @@
        <div class="login-box-body">
            <div class="form-group has-feedback">
                <span class="glyphicon glyphicon-user form-control-feedback" title="登录账号"></span>
-                <input type="text" id="username" name="username" class="form-control required"
+                <input type="text" id="loginName" name="loginName" class="form-control required"
                       data-msg-required="请填写登录账号." placeholder="登录账号"/>
            </div>
            <div class="form-group has-feedback">
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -24,7 +24,7 @@
        <div class="form-group">
            <label class="control-label">登录名称：</label>
            <div class="control-inline">
-                <input type="text" id="searchLoginame" name="searchLoginame" value="" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchLoginName" name="searchLoginName" value="" maxlength="100" class="easyui-textbox width-90"/>
            </div>
        </div>
        <div class="form-group">
@@ -51,24 +51,11 @@
            <tr>
                <td>登录名称</td>
                <td style="padding:5px">
-                    <input name="loginame" id="loginame" class="easyui-textbox"
+                    <input name="loginName" id="loginName" class="easyui-textbox"
                           data-options="required:true,validType:'length[2,15]'" style="width: 120px;"/>
                    初始密码：123456
                </td>
            </tr>
-            <tr>
-                <td>部门</td>
-                <td style="padding:5px">
-                    <input name="orgAbr" id="orgAbr" class="easyui-textbox" style="width: 120px;"/>
-                    <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectOrganization">
-                        <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height:20px;"></span></span></a>
-                    <input name="orgaId" id="orgaId" type="hidden"/>
-                    <input name="selectType" id="selectType" type="hidden"/>
-                    <input name="orgaUserRelId" id="orgaUserRelId" type="hidden"/>
-                    <!--一个兼容input框，没有实际用处，但是必须存在-->
-                    <input name="id" id="id" type="hidden"/>
-                </td>
-            </tr>
            <tr>
                <td>
                    用户姓名
@@ -78,6 +65,19 @@
                           data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/>
                </td>
            </tr>
+            <tr>
+                <td>部门</td>
+                <td style="padding:5px">
+                    <input name="orgAbr" id="orgAbr" class="easyui-textbox" readonly style="width: 120px;"/>
+                    <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectOrganization">
+                        <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height:20px;"></span></span></a>
+                    <input name="orgaId" id="orgaId" type="hidden"/>
+                    <input name="selectType" id="selectType" type="hidden"/>
+                    <input name="orgaUserRelId" id="orgaUserRelId" type="hidden"/>
+                    <!--一个兼容input框，没有实际用处，但是必须存在-->
+                    <input name="id" id="id" type="hidden"/>
+                </td>
+            </tr>
            <tr>
                <td>
                    职位
@@ -186,7 +186,7 @@
                        return str;
                    }
                },
-                {title: '登录名称', field: 'loginame', width: 80},
+                {title: '登录名称', field: 'loginName', width: 80},
                {title: '用户姓名', field: 'username', width: 80, align: "center"},
                {title: '职位', field: 'position', width: 115, align: "center"},
                {title: '部门', field: 'orgAbr', width: 115, align: "center"},
@@ -237,7 +237,7 @@
        }

        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchUsername" || obj.id == "searchLoginame" || obj.id == "searchPhonenum"
+        if (k == "13" && (obj.id == "searchUsername" || obj.id == "searchLoginName" || obj.id == "searchPhonenum"
                || obj.id == "searchPosition" || obj.id == "searchEmail" || obj.id == "searchDesc" || obj.id == "searchDept")) {
            $("#searchBtn").click();
        }
@@ -352,8 +352,6 @@
    //增加用户
    var url;
    var userID = 0;
-    //保存编辑前的名称
-    var oldLoginName = "";

    function addUser() {
        if(checkPower()){
@@ -366,7 +364,6 @@
        $('#usernameFM').form('load', row);
        $("#username").focus();
        $("#loginame").removeAttr("readonly");
-        oldLoginName = "";
        userID = 0;
        /**机构选择*/
        $("#selectType").val("org");
@@ -401,40 +398,45 @@

    //保存用户信息
    $("#saveusername").off("click").on("click", function () {
-        /**
-         * 2019-03-12
-         * 此处用户名和登录名是否重复的校验在保存操作时处理
-         * */
-        var reg = /^([0-9])+$/;
-        var phonenum = $.trim($("#phonenum").val());
-        if (phonenum.length > 0 && !reg.test(phonenum)) {
-            $.messager.alert('提示', '电话号码只能是数字', 'info');
-            $("#phonenum").val("").focus();
+        if(!$('#usernameFM').form('validate')){
            return;
        }
-        $.ajax({
-            url: url,
-            type: "post",
-            dataType: "json",
-            data: {
-                info: JSON.stringify($("#usernameFM").serializeObject())
-            },
-            success: function(res) {
-                if(res && res.code != 200) {
-                    $.messager.alert('提示', res.msg, 'error');
-                    return;
-                }
-                $('#userDlg').dialog('close');
-                //加载完以后重新初始化
-                var opts = $("#tableData").datagrid('options');
-                showUserDetails(opts.pageNumber, opts.pageSize);
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('提示', '网络异常，请稍后再试！', 'error');
+        else {
+            /**
+             * 2019-03-12
+             * 此处用户名和登录名是否重复的校验在保存操作时处理
+             * */
+            var reg = /^([0-9])+$/;
+            var phonenum = $.trim($("#phonenum").val());
+            if (phonenum.length > 0 && !reg.test(phonenum)) {
+                $.messager.alert('提示', '电话号码只能是数字', 'info');
+                $("#phonenum").val("").focus();
                return;
            }
-        });
+            $.ajax({
+                url: url,
+                type: "post",
+                dataType: "json",
+                data: {
+                    info: JSON.stringify($("#usernameFM").serializeObject())
+                },
+                success: function (res) {
+                    if (res && res.code != 200) {
+                        $.messager.alert('提示', res.msg, 'error');
+                        return;
+                    }
+                    $('#userDlg').dialog('close');
+                    //加载完以后重新初始化
+                    var opts = $("#tableData").datagrid('options');
+                    showUserDetails(opts.pageNumber, opts.pageSize);
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '网络异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
    });

    //编辑用户信息
@@ -442,7 +444,7 @@
        var rowsdata = $("#tableData").datagrid("getRows")[index];
        var row = {
            username: rowsdata.username,
-            loginame: rowsdata.loginame,
+            loginName: rowsdata.loginName,
            position: rowsdata.position,
            email: rowsdata.email,
            phonenum: rowsdata.phonenum,
@@ -452,14 +454,13 @@
            orgaUserRelId: rowsdata.orgaUserRelId,
            userBlngOrgaDsplSeq: rowsdata.userBlngOrgaDsplSeq
        };
-        oldLoginName = rowsdata.username;
        $('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑用户信息');
        $(".window-mask").css({width: webW, height: webH});
        $('#usernameFM').form('load', row);
        userID = rowsdata.id;
        //焦点在名称输入框==定焦在输入文字后面
        $("#username").val("").focus().val(rowsdata.username);
-        $("#loginame").attr("readonly","readonly");
+        $("#loginName").attr("readonly","readonly");
        /**机构选择*/
        $("#selectType").val("org");
        url = '/user/updateUser?id=' + rowsdata.id;
@@ -484,7 +485,7 @@

    function showUserDetails(pageNo, pageSize) {
        var userName = $.trim($("#searchUsername").val());
-        var loginName = $.trim($("#searchLoginame").val());
+        var loginName = $.trim($("#searchLoginName").val());
        $.ajax({
            type: "get",
            url: "/user/getUserList",
@@ -516,7 +517,7 @@
    $("#searchResetBtn").unbind().bind({
        click: function () {
            $("#searchUsername").textbox("setValue","");
-            $("#searchLoginame").textbox("setValue","");
+            $("#searchLoginName").textbox("setValue","");
            $("#searchPhonenum").textbox("setValue","");
            $("#searchPosition").textbox("setValue","");
            $("#searchDept").textbox("setValue","");
--- a/erp_web/register.html
+++ b/erp_web/register.html
@@ -43,7 +43,7 @@
        <div class="register-box-body">
            <div class="form-group has-feedback">
                <span class="glyphicon glyphicon-user form-control-feedback" title="登录账户"></span>
-                <input type="text" id="username" name="username" class="form-control required"
+                <input type="text" id="loginName" name="loginName" class="form-control required"
                       data-msg-required="请填写登录账号." placeholder="登录账户(请输入手机号码）"/>
            </div>
            <div class="form-group has-feedback">
@@ -106,7 +106,7 @@
 </body>

 <script>
-    $("#username, #password, #confirmPassword").on("focus blur", function () {
+    $("#loginName, #password, #confirmPassword").on("focus blur", function () {
        var a = this;
        setTimeout(function () {
            var b = $(a).css("borderColor");
@@ -121,10 +121,10 @@
        if($("#validCode").val()) {
            var res = verifyCode.validate($("#validCode").val());
            if(res){
-                var userName = $("#username");
-                if(!userName.val()) {
+                var loginName = $("#loginName");
+                if(!loginName.val()) {
                    alert("登录账户不能为空!");
-                } else if(!isPhoneAvailable(userName)) {
+                } else if(!isPhoneAvailable(loginName)) {
                    alert("请输入正确的手机号码!");
                } else if(!$("#password").val()) {
                    alert("登录密码不能为空!");
@@ -140,7 +140,7 @@
                        url: "/user/registerUser",
                        dataType: "json",
                        data: ({
-                            loginame: $("#username").val(),
+                            loginName: $("#loginName").val(),
                            password: $("#password").val()
                        }),
                        success: function (res) {