From 1df2ad6224fa4bd1ca38d235d5e4b917262added Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 19 Feb 2021 10:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
index 90bec11..e91250f 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
@@ -5,7 +5,7 @@
<div class="layui-form-item">
<label class="layui-form-label">账号</label>
<div class="layui-input-block">
- <input name="username" placeholder="请输入账号" type="text" class="layui-input" maxlength="20"
+ <input id="username" name="username" placeholder="请输入账号" type="text" class="layui-input" maxlength="20"
lay-verify="required" required/>
</div>
</div>
@@ -19,7 +19,7 @@
<div class="layui-form-item">
<label class="layui-form-label">手机号</label>
<div class="layui-input-block">
- <input name="mobile" placeholder="请输入手机号" type="text" class="layui-input" lay-verify="required|mobile"
+ <input id="mobile" name="mobile" placeholder="请输入手机号" type="text" class="layui-input" lay-verify="required|mobile"
required/>
</div>
</div>
@@ -54,7 +54,7 @@
// 获取所有角色
layer.load(2);
- admin.req('api-user/allRoles', {}, function (data) {
+ admin.req('api-user/findByMap', {}, function (data) {
layer.closeAll('loading');
if (0 == data.code) {
// 渲染多选下拉框
@@ -70,6 +70,10 @@
if (user) {
form.val('user-form', user);
$('#user-form').attr('method', 'POST');
+ if(!(user.mobile==null || user.mobile.trim()=="")){
+ $("#mobile").prop("disabled",true)
+ }
+ $("#username").prop("disabled",true)
var rds = new Array();
for (var i = 0; i < user.roles.length; i++) {
rds.push(user.roles[i].id);
@@ -77,23 +81,66 @@
formSelects.value('roleId', rds);
}
} else {
- layer.msg('获取角色失败', {icon: 2, time: 500});
+ layer.msg('获取角色失败', {icon: 2, time: 2000});
}
}, 'GET');
// 表单提交事件
form.on('submit(user-form-submit)', function (data) {
layer.load(2);
+ var datadto= data.field
admin.req('api-user/users/saveOrUpdate', JSON.stringify(data.field), function (data) {
layer.closeAll('loading');
- if (data.code == 0) {
- layer.msg(data.msg, {icon: 1, time: 500});
+ if (data.code == 0) {
+ if(datadto.id==null||datadto.id==''){
+ layer.alert("用户添加成功,默认密码为："+data.data.password);
+ }
admin.finishPopupCenter();
} else {
- layer.msg(data.msg, {icon: 2, time: 500});
+ layer.msg(data.msg, {icon: 2, time: 2000});
}
}, "POST");
return false;
});
+ //判断用户名是否被使用
+ var username_is_usered = function (username_id) {
+ var username = $("#" + username_id).val()
+ admin.req('api-user/users/findCountByMap', JSON.stringify({
+ username: username
+ }), function (data) {
+ if (data.code == 0) {
+ if (data.data > 0) {
+ $("#" + username_id).val("")
+ layer.msg("该手机号已经使用", {
+ icon: 2,
+ time: 2000
+ })
+ }
+ } else {
+ layer.msg(data.msg, {
+ icon: 2,
+ time: 2000
+ });
+ }
+ }, 'post');
+ }
+ /*
+ * 验证手机号码
+ */
+ function validatorTel(content) {
+ // 正则验证格式
+ eval("var reg = /^1[34578]\\d{9}$/;");
+ var flag = RegExp(reg).test(content)
+ return flag;
+ }
+ //验证手机号是否被使用
+ $("#mobile").blur(function () {
+ let mobile=$("#mobile").val()
+ if (!validatorTel(mobile)) {
+ layer.msg("请输入正确的手机号");
+ } else {
+ username_is_usered("mobile");
+ }
+ })
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0