From f789b998cceaf5d60be5bdaf75d9fb37b1f087a6 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 09:09:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 e5d9575..6767992 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
@@ -1,6 +1,7 @@
<!-- user表单弹窗 -->
<form id="user-form" lay-filter="user-form" class="layui-form model-form">
<input name="id" type="hidden"/>
+ <input name="type" type="hidden" value="BACKEND"/>
<div class="layui-form-item">
<label class="layui-form-label">账号</label>
<div class="layui-input-block">
@@ -53,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) {
// 渲染多选下拉框
@@ -76,20 +77,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