修改添加用户对话框

OpenAuth.Mvc/BllScripts/jqEvent.js

@@ -1,50 +0,0 @@
-$(function () {
-    //modal滚动条置顶
-    $('.modal').on('shown.bs.modal', function () {  //modal加载完毕后处理数据
-        var scroll = $(".modal-body").scrollTop();
-        $(".modal-body").scrollTop(0 - scroll);
-    });
-
-    //resize to fit page size
-    $(window).on('resize.jqGrid', function () {
-        $("#maingrid").jqGrid('setGridWidth', $(".gridwidth").width()-10);
-        $("#maingrid").removeAttr("style");  //我擦，不去掉style="width:xxx",jqgrid就会有横向滚动条
-    });
-
-    //resize on sidebar collapse/expand
-   // var parentColumn = $("#maingrid").closest('[class*="col-"]');
-    $(document).on('settings.ace.jqGrid', function (ev, event_name, collapsed) {
-        if (event_name === 'sidebar_collapsed' || event_name === 'main_container_fixed') {
-            //setTimeout is for webkit only to give time for DOM changes and then redraw!!!
-            setTimeout(function () {
-              //  $("#maingrid").jqGrid('setGridWidth', parentColumn.width());
-                $("#maingrid").jqGrid('setGridWidth', $(".gridwidth").width()-10);
-                $("#maingrid").removeAttr("style");  //我擦，不去掉style="width:xxx",jqgrid就会有横向滚动条
-            }, 0);
-        }
-    });
-
-    $(window).triggerHandler('resize.jqGrid');//trigger window resize to make the grid get the correct size
-
-    $(document).one('ajaxloadstart.page', function (e) {
-        $("#maingrid").jqGrid('GridUnload');
-        $('.ui-jqdialog').remove();
-    });
-});
-
-//replace icons with FontAwesome icons like above
-function updatePagerIcons(table) {
-    var replacement =
-    {
-        'ui-icon-seek-first': 'ace-icon fa fa-angle-double-left bigger-140',
-        'ui-icon-seek-prev': 'ace-icon fa fa-angle-left bigger-140',
-        'ui-icon-seek-next': 'ace-icon fa fa-angle-right bigger-140',
-        'ui-icon-seek-end': 'ace-icon fa fa-angle-double-right bigger-140'
-    };
-    $('.ui-pg-table:not(.navtable) > tbody > tr > .ui-pg-button > .ui-icon').each(function () {
-        var icon = $(this);
-        var $class = $.trim(icon.attr('class').replace('ui-icon', ''));
-
-        if ($class in replacement) icon.attr('class', 'ui-icon ' + replacement[$class]);
-    });
-}

OpenAuth.Mvc/BllScripts/orgManager.js

@@ -6,7 +6,7 @@
 
 //左边导航
 var ztree = function () {
-    var url = '/OrgManager/LoadOrg';
+    var url = '/UserSession/GetOrgs';
     var setting = {
         view: { selectedMulti: false },
         data: {
@@ -118,7 +118,7 @@ var vm = new Vue({
 });
 
 //上级机构选择框
-var parent = new ParentTree("/OrgManager/LoadOrg","ParentName", "ParentId");
+var parent = new ParentTree("/UserSession/GetOrgs","ParentName", "ParentId");
 
 //添加（编辑）对话框
 var editDlg = function () {

OpenAuth.Mvc/BllScripts/roleManager.js

@@ -6,7 +6,7 @@
 
 //左边导航
 var ztree = function () {
-    var url = '/OrgManager/LoadOrg';
+    var url = '/UserSession/GetOrgs';
     var setting = {
         view: { selectedMulti: false },
         data: {
@@ -106,7 +106,7 @@ var vm = new Vue({
 });
 
 //上级机构选择框
-var parent = new ParentTreeMultiple("/OrgManager/LoadOrg", "Organizations", "OrganizationIds");
+var parent = new ParentTreeMultiple("/UserSession/GetOrgs", "Organizations", "OrganizationIds");
 
 //添加（编辑）对话框
 var editDlg = function () {

OpenAuth.Mvc/BllScripts/stockManager.js

@@ -6,7 +6,7 @@
 
 //左边导航
 var ztree = function () {
-    var url = '/OrgManager/LoadOrg';
+    var url = '/UserSession/GetOrgs';
     var setting = {
         view: { selectedMulti: false },
         data: {
@@ -117,7 +117,7 @@ var vm = new Vue({
 });
 
 //上级机构选择框
-var parent = new ParentTree("/OrgManager/LoadOrg", "ParentName", "OrgId");
+var parent = new ParentTree("/UserSession/GetOrgs", "ParentName", "OrgId");
 
 //添加（编辑）对话框
 var editDlg = function () {

OpenAuth.Mvc/BllScripts/userRoleManager.js

@@ -70,7 +70,7 @@ var list = function () {
 }();
 //左边导航
 var ztree = function () {
-    var url = "/OrgManager/LoadOrg";
+    var url = "/UserSession/GetOrgs";
 
     var setting = {
         view: { selectedMulti: false },

OpenAuth.Mvc/BllScripts/usermanager.js

@@ -6,7 +6,7 @@
 
 //左边导航
 var ztree = function () {
-    var url = '/OrgManager/LoadOrg';
+    var url = '/UserSession/GetOrgs';
     var setting = {
         view: { selectedMulti: false },
         data: {
@@ -117,7 +117,7 @@ var vm = new Vue({
 });
 
 //上级机构选择框
-var parent = new ParentTreeMultiple("/OrgManager/LoadOrg","Organizations","OrganizationIds");
+var parent = new ParentTreeMultiple("/UserSession/GetOrgs","Organizations","OrganizationIds");
 
 //添加（编辑）对话框
 var editDlg = function () {

OpenAuth.Mvc/Controllers/OrgManagerController.cs

@@ -4,7 +4,6 @@ using OpenAuth.Domain;
 using OpenAuth.Mvc.Models;
 using System;
 using System.Web.Mvc;
-using OpenAuth.App.SSO;
 
 namespace OpenAuth.Mvc.Controllers
 {
@@ -26,11 +25,6 @@ namespace OpenAuth.Mvc.Controllers
             return View();
         }
 
-        public string LoadOrg()
-        {
-            return JsonHelper.Instance.Serialize(AuthUtil.GetCurrentUser().Orgs);
-        }
-
         public string LoadForUser(Guid firstId)
         {
             var orgs = OrgApp.LoadForUser(firstId);

OpenAuth.Mvc/Controllers/UserSessionController.cs

@@ -21,10 +21,10 @@ namespace OpenAuth.Mvc.Controllers
         /// <summary>
         /// 获取登陆用户可访问的所有部门
         /// </summary>
-        public string GetOrgsTree()
+        public string GetOrgs()
         {
             var user = AuthUtil.GetCurrentUser();
-            return JsonHelper.Instance.Serialize(user.Orgs.GenerateTree(u => u.Id, u => u.ParentId));
+            return JsonHelper.Instance.Serialize(user.Orgs);
         }
     }
 }

OpenAuth.Mvc/OpenAuth.Mvc.csproj

@@ -174,7 +174,6 @@
     <Content Include="BllScripts\assignModuleElement.js" />
     <Content Include="BllScripts\categoryManager.js" />
     <Content Include="BllScripts\formDesign.js" />
-    <Content Include="BllScripts\jqEvent.js" />
     <Content Include="BllScripts\login.js" />
     <Content Include="BllScripts\parentTreeMultiple.js" />
     <Content Include="BllScripts\parentTree.js" />

OpenAuth.Mvc/Views/UserManager/Index.cshtml

@@ -10,38 +10,70 @@
         </div>
         <button class="layui-btn" data-type="search">搜索</button>
     </div>
-
     <button class="layui-btn " data-type="addData">添加用户</button>
     <button class="layui-btn layui-btn-danger" data-type="del">批量删除</button>
 </blockquote>
 
 <div style="display: flex;">
-
     <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
-
     <table class="layui-table"
            lay-data="{height: 'full-80', page:true, id:'mainList'}"
            lay-filter="list">
         <thead>
-            <tr>
-                <th lay-data="{checkbox:true, fixed: true}"></th>
-                <th lay-data="{field:'Account', width:150, sort: true, fixed: true}">账号</th>
-                <th lay-data="{field:'Name', width:150}">用户名</th>
-                <th lay-data="{field:'Organizations', width:135}">所属部门</th>
-                <th lay-data="{field:'CreateTime', width:180}">创建时间</th>
-                <th lay-data="{field:'Id', width:180}">ID</th>
-                <th lay-data="{fixed: 'right', width:160, align:'center', toolbar: '#barList'}"></th>
-            </tr>
+        <tr>
+            <th lay-data="{checkbox:true, fixed: true}"></th>
+            <th lay-data="{field:'Account', width:150, sort: true, fixed: true}">账号</th>
+            <th lay-data="{field:'Name', width:150}">用户名</th>
+            <th lay-data="{field:'Organizations', width:135}">所属部门</th>
+            <th lay-data="{field:'CreateTime', width:180}">创建时间</th>
+            <th lay-data="{field:'Id', width:180}">ID</th>
+            <th lay-data="{fixed: 'right', width:160, align:'center', toolbar: '#barList'}"></th>
+        </tr>
         </thead>
     </table>
 </div>
-
-
 <script type="text/html" id="barList">
     <a class="layui-btn layui-btn-primary layui-btn-mini" lay-event="detail">查看</a>
     <a class="layui-btn layui-btn-mini" lay-event="edit">编辑</a>
     <a class="layui-btn layui-btn-danger layui-btn-mini" lay-event="del">删除</a>
 </script>
 
+<!--用户添加/编辑窗口-->
+<form class="layui-form" action="" style="display: none" id="formEdit">
+    <div class="layui-form-item">
+        <label class="layui-form-label">账号</label>
+        <div class="layui-input-block">
+            <input type="text" name="Account" required lay-verify="required" 
+                   placeholder="请输入登录账号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">姓名</label>
+        <div class="layui-input-block">
+            <input type="text" name="Name" required lay-verify="required"
+                   placeholder="请输入昵称或姓名" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">性别</label>
+        <div class="layui-input-block">
+            <input type="radio" name="Sex" value="1" title="男" checked>
+            <input type="radio" name="Sex" value="0" title="女" >
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否可用</label>
+        <div class="layui-input-block">
+            <input type="checkbox" name="Status" lay-skin="switch" value="1">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formEdit">立即提交</button>
+            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
+    </div>
+</form>
+
 <script type="text/javascript" src="/layui/layui.js"></script>
 <script type="text/javascript" src="/js/users.js"></script>

OpenAuth.Mvc/js/users.js

@@ -7,9 +7,9 @@ layui.config({
     var dataurl = '/UserManager/Load';
     var table = layui.table;
    
-
+    //左边树状机构列表
     var ztree = function () {
-        var url = '/OrgManager/LoadOrg';
+        var url = '/UserSession/GetOrgs';
         var setting = {
             view: { selectedMulti: false },
             data: {
@@ -63,10 +63,18 @@ layui.config({
     table.on('tool(list)', function (obj) {
         var data = obj.data;
         if (obj.event === 'detail') {
-            layer.msg('ID：' + data.id + ' 的查看操作');
-        } else if (obj.event === 'del') {
-            layer.confirm('真的删除行么', function (index) {
-                obj.del();
+            layer.msg('ID：' + data.Id + ' 的查看操作');
+
+        } else if (obj.event === 'del') {  //删除
+            layer.confirm('真的删除么', function (index) {
+                $.post("/UserManager/Delete", { ids: data.Id },
+                    function (data) {
+                        if (data.Status) {
+                            obj.del();
+                        } else {
+                            layer.msg(data.Message);
+                        }
+                    },"json");
                 layer.close(index);
             });
         } else if (obj.event === 'edit') {
@@ -83,22 +91,10 @@ layui.config({
         }, addData: function () {  //添加
             var index = layui.layer.open({
                 title: "添加",
-                type: 2,
-                content: "addUser.html",
-                success: function (layero, index) {
-                    setTimeout(function () {
-                        layui.layer.tips('点击此处返回列表',
-                            '.layui-layer-setwin .layui-layer-close', {
-                                tips: 3
-                            });
-                    }, 500);
-                }
+                area: ["500px", "400px"],
+                type: "1",
+                content: $('#formEdit')
             });
-            //改变窗口大小时，重置弹窗的高度，防止超出可视区域（如F12调出debug的操作）
-            $(window).resize(function () {
-                layui.layer.full(index);
-            });
-            layui.layer.full(index);
         }, search: function () {  //搜索
             var key = $('#key');
 
@@ -115,4 +111,17 @@ layui.config({
         var type = $(this).data('type');
         active[type] ? active[type].call(this) : '';
     });
+
+    //监听页面主按钮操作 end
+
+    //编辑或添加对话框
+    form.on('submit(formEdit)', function (data) {
+        $.post("/UserManager/Add", data.field, function (data) {
+            layer.msg(data.Message);
+            if (data.Status) {
+               
+            }
+        }, "json");
+        return false;
+    });
 })