From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
index 3369780..c293bf3 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
@@ -30,8 +30,8 @@
<div class="layui-form-item">
<label class="layui-form-label">状态</label>
<div class="layui-input-block">
- <input type="radio" name="enabled" value="0" title="启用" />
- <input type="radio" name="enabled" value="1" title="禁用" />
+ <input type="radio" name="enabled" value="1" title="启用" />
+ <input type="radio" name="enabled" value="0" title="禁用" />
</div>
</div>
<div class="layui-form-item model-form-footer">
@@ -54,7 +54,6 @@
var formSelects = layui.formSelects;
var tree = layui.tree;
- //$("input[name=enabled][value==0]").prop("checked", "true");
// 回显user数据
var user = admin.getTempData('t_user');
$('#user-org-form').attr('method', 'POST');
@@ -64,19 +63,18 @@
$("#userId").val(user.id);
admin.req('api-user/sysuserorg', { user_id: user.id }, function (data) {
if (data.code == 0) {
- debugger
if (data.data.length > 1) {
let useData = data.data[1];
$("#orgId").val(useData.orgId);
$("#userId").val(useData.userId);
$("#id").val(useData.id);
if (useData.enabled) {
- //$("input[name=enabled][value=0]").prop("checked", "true");
- //$("input[name=enabled][value=1]").prop("checked", "false");
+ $('input[name="enabled"][value="0"]').removeAttr("checked");
+ $('input[name="enabled"][value="1"]').attr("checked", "true");
}
else {
- //$("input[name=enabled][value=0]").prop("checked", "false");
- //$("input[name=enabled][value=1]").prop("checked", "true");
+ $('input[name="enabled"][value="1"]').removeAttr("checked");
+ $('input[name="enabled"][value="0"]').attr("checked", "true");
}
admin.req('api-user/sysorganization/' + useData.orgId, {}, function (dataName) {
if (dataName.code == 0) {
@@ -96,6 +94,8 @@
else {
$("#userId").val(user.id);
$("#id").val("");
+ $('input[name="enabled"][value="1"]').attr("checked", "true");
+ $('input[name="enabled"][value="0"]').removeAttr("checked");
}
}
else {
@@ -103,6 +103,8 @@
admin.finishPopupCenter();
});
}
+
+ form.render();
}, 'get');
}
else {
@@ -136,10 +138,10 @@
layer.load(2);
if (!strUtil.isEmpty($("#orgId").val())) {
if (data.field != null) {
- data.field.enabled = (data.field.enabled == 0) ? fase : true;
+ data.field.enabled = (data.field.enabled == 0) ? false : true;
+ data.field.fromId=0;
admin.req('api-user/sysuserorg', JSON.stringify(data.field), function (data) {
layer.closeAll('loading');
- debugger
if (data.code == 0) {
layer.msg(data.msg, { icon: 1, time: 1000 });
admin.finishPopupCenter();
--
Gitblit v1.8.0