From b4db4529845be5a229431cbc358ed0ed6485e970 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Wed, 26 Aug 2020 09:50:58 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 1501a0b..252f1fe 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>
@@ -70,6 +70,8 @@
                 if (user) {
                     form.val('user-form', user);
                     $('#user-form').attr('method', 'POST');
+                    $("#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,20 +79,23 @@
                     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;

--
Gitblit v1.8.0