diff --git a/OpenAuth.Mvc/BllScripts/assignModule.js b/OpenAuth.Mvc/BllScripts/assignModule.js
index 2ce53e38..fb469145 100644
--- a/OpenAuth.Mvc/BllScripts/assignModule.js
+++ b/OpenAuth.Mvc/BllScripts/assignModule.js
@@ -11,43 +11,32 @@
//
// 分配组织
// ***********************************************************************
+layui.use(['layer', 'form'], function () {
+ var form = layui.form();
-
-$(document).ready(function () {
- $.CurrentDialog.find("#btnAccess").on("click", function () {
- var ids = ztree.getSelected();
- if (ids == null) return;
-
- $.post('/RelevanceManager/Assign', {
- type: $("#moduleType").val(),
- firstId: $('#firstId').val(),
- secIds: ids
- }, function (json) {
- json = $.parseJSON(json);
- if (json.statusCode != "200") {
- $(this).alertmsg('warn', json.message);
- return;
- }
- selected.reLoad();
- });
- });
- $.CurrentDialog.find("#btnDelAccess").on("click", function () {
- var ids = selected.getSelected();
- if (ids == null) return;
-
- $.post('/RelevanceManager/UnAssign', {
- type: $("#moduleType").val(),
- firstId: $('#firstId').val(),
- secIds: ids
- }, function (json) {
- json = $.parseJSON(json);
- if (json.statusCode != "200") {
- $(this).alertmsg('warn', json.message);
- return;
- }
- selected.reLoad();
- });
+ form.on('checkbox', function (data) {
+ if (data.elem.checked)
+ {
+ $.post('/RelevanceManager/Assign', {
+ type: $("#moduleType").val(),
+ firstId: $('#firstId').val(),
+ secIds: data.value
+ }, function (json) {
+ json = $.parseJSON(json);
+
+ });
+ }
+ else
+ {
+ $.post('/RelevanceManager/UnAssign', {
+ type: $("#moduleType").val(),
+ firstId: $('#firstId').val(),
+ secIds: data.value
+ }, function (json) {
+ json = $.parseJSON(json);
+
+ });
+ }
});
});
-
diff --git a/OpenAuth.Mvc/BllScripts/usermanager.js b/OpenAuth.Mvc/BllScripts/usermanager.js
index 7eb7cd30..29290025 100644
--- a/OpenAuth.Mvc/BllScripts/usermanager.js
+++ b/OpenAuth.Mvc/BllScripts/usermanager.js
@@ -208,7 +208,7 @@ function openUserModuleAccess(obj) {
layer.open({
type: 2,
skin: 'layui-layer-rim', //加上边框
- area: ['600px', '500px'], //宽高
+ area: ['410px', '390px'], //宽高
content: '/ModuleManager/Assign?key=UserModule&firstId=' + selected.Id
});
}
diff --git a/OpenAuth.Mvc/Content/mylayer.css b/OpenAuth.Mvc/Content/mylayer.css
new file mode 100644
index 00000000..628a9ccd
--- /dev/null
+++ b/OpenAuth.Mvc/Content/mylayer.css
@@ -0,0 +1,3 @@
+.layui-elem-field {
+ border: 1px solid #5fb878;
+}
diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
index 06bad717..1db044a1 100644
--- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
@@ -51,13 +51,12 @@ namespace OpenAuth.Mvc.Controllers
{
CheckModule(module.Children, modules);
}
- else
+
+ if (modules.Select(u => u.Id).Contains(module.Item.Id))
{
- if (modules.Select(u => u.Id).Contains(module.Item.Id))
- {
- module.Item.Checked = true;
- }
+ module.Item.Checked = true;
}
+
}
}
@@ -68,26 +67,40 @@ namespace OpenAuth.Mvc.Controllers
{
if (moduleView.Children.Any())
{
- sb.Append("