commit

3 years ago · 19f92c65ef
16 changed files with 273 additions and 125 deletions
--- a/04.系统编码/.vs/BeijingSafeguard/v15/.suo
+++ b/04.系统编码/.vs/BeijingSafeguard/v15/.suo
--- a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm
+++ b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm
--- a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
+++ b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
--- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js
@ -12,13 +12,16 @@
    this.EditLocateIcon = new EditLocateIcon(this);

    this.Startup = function () {
+        $('#manage').addClass('active');
+
        this.ReLayout();
        this.InitDataGrid();
+        this.ReLoadTableData();
+
        this.EditLineWidth.Setup();
        this.EditLineColor.Setup();
        this.EditLocateIcon.Setup();

-        $('#manage').addClass('active');
        $('#edit-btn').on('click', this.onEditButtonClick.bind(this));

        window.onresize = this.ReLayout.bind(this);
@ -47,8 +50,22 @@
            onSelect: this.OnTaskSelected.bind(this),
            onUnselect: this.OnTaskUnselected.bind(this)
        });
+    };

-        $('#task-grid').datagrid('loadData', this.data);
+    this.ReLoadTableData = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/ConfigManagement/Query',
+            data: {
+                pageIndex: 1,
+                pageSize: 100
+            },
+            success: function (result) {
+                console.log(result)
+                $('#task-grid').datagrid('loadData', JSON.parse(result));
+            }.bind(this)
+        });
    };

    this.formatIcon = function (value) {
--- a/04.系统编码/App/Content/scripts/system-management/org-management/add.js
+++ b/04.系统编码/App/Content/scripts/system-management/org-management/add.js
@ -12,10 +12,29 @@
    };

    this.OnSureButtonClick = function () {
-        $('#add-dialog').hide();
+        this.HideDialog();
+        this.AddOrg();
+    };
+
+    this.AddOrg = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/OrgManagement/Add',
+            data: {
+                
+            },
+            success: function () {
+                this.Parent.ReLoadTableData();
+            }.bind(this)
+        });
    };

    this.HideDialog = function () {
        $('#add-dialog').hide();
    };
+
+    this.clearInput = function () {
+        $("#name").textbox('setValue', '');
+    };
 };
--- a/04.系统编码/App/Content/scripts/system-management/org-management/edit.js
+++ b/04.系统编码/App/Content/scripts/system-management/org-management/edit.js
@ -13,10 +13,29 @@
    };

    this.OnSureButtonClick = function () {
-        $('#edit-dialog').hide();
+        this.HideDialog();
+        this.EditOrg();
+    };
+
+    this.EditOrg = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/OrgManagement/Update',
+            data: {
+
+            },
+            success: function () {
+                this.Parent.ReLoadTableData();
+            }.bind(this)
+        });
    };

    this.HideDialog = function () {
        $('#edit-dialog').hide();
    };
+
+    this.clearInput = function () {
+        $("#username").textbox('setValue', '');
+    };
 };
--- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js
@ -1,63 +1,24 @@
 var App = function () {
-
-    this.data = {
-        "total": 20,
-        "rows": [{ Id: 1, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 2, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 3, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 4, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 5, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 6, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-            { Id: 7, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 8, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-            { Id: 9, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 10, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 11, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 12, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-            { Id: 13, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 14, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 15, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 16, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 17, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 18, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 19, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-            { Id: 20, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 21, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 22, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 23, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 24, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-            { Id: 25, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 26, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 27, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 28, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 29, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 30, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 31, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 32, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 33, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 34, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 0 },
-            { Id: 35, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 36, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 37, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 38, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 },
-            { Id: 39, Name: '张三', OrgName: "机构", CreateTime: '2021/12/15 10:00:00', isEnable: 1 }]
-    };
+    
    this.selectedRow = [];
    this.AddDialog = new AddDialog(this);
    this.EditDialog = new EditDialog(this);

    this.Startup = function () {
+        $('#manage').addClass('active');
+
        this.ReLayout();
        this.InitDataGrid();
+        this.ReLoadTableData();
+
        this.AddDialog.Setup();
        this.EditDialog.Setup();

-        $('#manage').addClass('active');
        $('#add-btn').on('click', this.OnAddButtonClick.bind(this));
        $('#edit-btn').on('click', this.onEditButtonClick.bind(this));
        $('#delete-btn').on('click', this.onDeleteButtonClick.bind(this));
        $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this));
-        $('#dialog-sure').on('click', this.CloseDeleteDialog.bind(this));
+        $('#dialog-sure').on('click', this.OnSureOfDeleteButtonClick.bind(this));
        $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this));

        window.onresize = this.ReLayout.bind(this);
@ -74,9 +35,8 @@
    this.InitDataGrid = function () {
        $('#task-grid').datagrid({
            columns: [[
-                { field: 'OrgName', title: '名称', align: 'center', width: 10 },
-                { field: 'CreateTime', title: '创建时间', align: 'center', width: 15 },
-                { field: 'isEnable', title: '启用', align: 'left', width: 70, formatter: this.formatText.bind(this) }
+                { field: 'Name', title: '名称', align: 'center', width: 10 },
+                { field: 'CreateTime', title: '创建时间', align: 'left', width: 80, formatter: this.formatTime.bind(this) }
            ]],
            striped: true,
            singleSelect: false,
@ -85,14 +45,29 @@
            scrollbarSize: 0,
            pagination: true,
            onSelect: this.OnTaskSelected.bind(this),
-            onUnselect: this.OnTaskUnselected.bind(this)
+            onUnselect: this.OnTaskUnselected.bind(this),
+            onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
        });
+    };

-        $('#task-grid').datagrid('loadData', this.data);
+    this.ReLoadTableData = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/OrgManagement/Query',
+            data: {
+                pageIndex: 1,
+                pageSize: 10
+            },
+            success: function (result) {
+                console.log(JSON.parse(result))
+                $('#task-grid').datagrid('loadData', JSON.parse(result));
+            }.bind(this)
+        });
    };

-    this.formatText = function (value) {
-        return value === 1 ? '<span style="color: #00c541">已启用</span>' : '<span style="color: #f40000">已禁用</span>';
+    this.formatTime = function (time) {
+        return '<span>{0}</span>'.format(moment(time).format('YYYY/MM/DD HH:mm:ss'));
    };

    this.OnTaskSelected = function (index, row) {
@ -114,6 +89,16 @@
        $('#disable-btn').prop('disabled', true);
    };

+    this.OnTableGridBeforeLoad = function () {
+        var page = $('#task-grid').datagrid('getPager');
+        $(page).pagination({
+            beforePageText: '第',
+            afterPageText: '页&nbsp;&nbsp;&nbsp;共{pages}页',
+            displayMsg: '当前显示{from}-{to}条记录&nbsp;&nbsp;&nbsp;共{total}条记录',
+            layout: ['list', 'sep', 'first', 'prev', 'sep', 'manual', 'sep', 'next', 'last', 'sep', 'refresh', 'info']
+        });
+    };
+
    this.OnAddButtonClick = function () {
        this.AddDialog.Show();
    };
@ -124,12 +109,31 @@

    this.onDeleteButtonClick = function () {
        $('.dialog-delete').show();
-        $('.dialog-clear h2').text('确定删除名为「{0}」的机构吗？'.format(this.selectedRow.OrgName));
+        $('.dialog-clear h2').text('确定删除名为「{0}」的机构吗？'.format(this.selectedRow.Name));
+    };
+
+    this.OnSureOfDeleteButtonClick = function () {
+        this.CloseDeleteDialog();
+        this.DeleteOrg();
    };

    this.CloseDeleteDialog = function () {
        $('.dialog-delete').hide();
    };
+
+    this.DeleteOrg = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/OrgManagement/Delete',
+            data: {
+                id: this.selectedRow.Id
+            },
+            success: function () {
+                this.ReLoadTableData();
+            }.bind(this)
+        });
+    };
 };

 $(document).ready(function () {
--- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
@ -4,12 +4,14 @@
    this.selectedRow = [];

    this.Startup = function () {
+        $('#manage').addClass('active');
+
        this.ReLayout();
        this.InitDate();
        this.InitDataGrid();
-        this.ReLoadTableData();
-
-        $('#manage').addClass('active');
+        
+        $('#query-btn').on('click', this.OnQueryButtonClick.bind(this));
+        $('#query-btn').trigger('click');

        window.onresize = this.ReLayout.bind(this);
    };
@ -22,14 +24,24 @@
        $('.manage-table, .manage-table .datagrid').height(height - 109);
    };

+    this.OnQueryButtonClick = function () {
+        this.ReLoadTableData();
+    };
+
    this.ReLoadTableData = function () {
-        $('#task-table').datagrid({
-            method: "POST",
-            url: '/StatisticAnalysisController/Query',
-            queryParams: {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/StatisticAnalysis/Query',
+            data: {
+                fromTime: $("#from-date").datetimebox('getValue'),
+                toTime: $("#to-date").datetimebox('getValue'),
                pageIndex: 1,
                pageSize: 10
-            }
+            },
+            success: function (result) {
+                $('#task-grid').datagrid('loadData', JSON.parse(result));
+            }.bind(this)
        });
    };

@ -91,11 +103,8 @@
            pageList: [10, 20, 30],
            onSelect: this.OnTaskSelected.bind(this),
            onUnselect: this.OnTaskUnselected.bind(this),
-            onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
-            //onLoadSuccess: this.OnTableGridLoaded.bind(this)
+            onBeforeLoad: this.OnTableGridBeforeLoad.bind(this)
        });
-
-        //$('#task-grid').datagrid('loadData', this.data);
    };

    this.formatText = function (value) {
@ -139,7 +148,7 @@
    };

    this.OnTableGridBeforeLoad = function () {
-        $('#task-table').datagrid('getPager').pagination({
+        $('#task-grid').datagrid('getPager').pagination({
            beforePageText: '第',
            afterPageText: '页&nbsp;&nbsp;&nbsp;共{pages}页',
            displayMsg: '当前显示{from}-{to}条记录&nbsp;&nbsp;&nbsp;共{total}条记录',
--- a/04.系统编码/App/Content/scripts/system-management/user-management/add.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/add.js
@ -18,10 +18,38 @@
    };
    
    this.OnSureButtonClick = function () {
-        $('#add-dialog').hide();
+        this.HideDialog();
+        this.AddUser();
    };

    this.HideDialog = function () {
        $('#add-dialog').hide();
+
+        this.clearInput();
+    };
+
+    this.AddUser = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/UserManagement/Add',
+            data: {
+                OrgId: 1,
+                Gender: parseInt($('.sex-select span.active').attr('gender')),
+                RealName: $("#name").textbox('getValue'),
+                LoginName: $('#loginAccount').textbox('getValue'),
+                LoginPassword: $('#loginPassword').textbox('getValue')
+            },
+            success: function () {
+                this.Parent.ReLoadTableData();
+            }.bind(this)
+        });
+    };
+
+    this.clearInput = function () {
+        $("#name").textbox('setValue', '');
+        $('#loginAccount').textbox('setValue', '');
+        $('#loginPassword').textbox('setValue', '');
+        $('.sex-select span').eq(0).addClass("active");
    };
 };
--- a/04.系统编码/App/Content/scripts/system-management/user-management/edit.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/edit.js
@ -9,12 +9,13 @@
    };

    this.Show = function (data) {
+        console.log(data)
        $('#edit-dialog').show();
-        $("#username").textbox('setValue', data.Name);
-        $("#account").textbox('setValue', data.LoginAccount);
-        $("#pass").textbox('setValue', data.LoginPassword);
-        $('#sex span').eq(0).attr('type') === data.Sex ? $('#sex span').eq(0).addClass('active') : $('#sex span').eq(0).removeClass('active');
-        $('#sex span').eq(1).attr('type') === data.Sex ? $('#sex span').eq(1).addClass('active') : $('#sex span').eq(1).removeClass('active');
+        $("#username").textbox('setValue', data.RealName);
+        $("#account").textbox('setValue', data.LoginName);
+        $("#password").textbox('setValue', data.LoginPassWord);
+        parseInt($('#sex span').eq(0).attr('gender')) === data.Gender ? $('#sex span').eq(0).addClass('active') : $('#sex span').eq(0).removeClass('active');
+        parseInt($('#sex span').eq(1).attr('gender')) === data.Gender ? $('#sex span').eq(1).addClass('active') : $('#sex span').eq(1).removeClass('active');
    };

    this.OnSexButtonClick = function (event) {
@ -23,10 +24,39 @@
    };

    this.OnSureButtonClick = function () {
-        $('#edit-dialog').hide();
+        this.HideDialog();
+        this.EditUser();
    };

    this.HideDialog = function () {
        $('#edit-dialog').hide();
+
+        this.clearInput();
+    };
+
+    this.EditUser = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/UserManagement/Update',
+            data: {
+                OrgId: 1,
+                Gender: parseInt($('#sex span.active').attr('gender')),
+                RealName: $("#username").textbox('getValue'),
+                LoginName: $('#account').textbox('getValue'),
+                LoginPassword: $('#password').textbox('getValue')
+            },
+            success: function (result) {
+                console.log(result)
+                this.Parent.ReLoadTableData();
+            }.bind(this)
+        });
+    };
+
+    this.clearInput = function () {
+        $("#username").textbox('setValue', ''),
+        $('#account').textbox('setValue', ''),
+        $('#password').textbox('setValue', ''),
+        $('#sex span').eq(0).addClass("active");
    };
 };
--- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js
@ -1,25 +1,25 @@
 var App = function () {

-    
+    this.data = {};
    this.selectedRow = [];
    this.AddDialog = new AddDialog(this);
    this.EditDialog = new EditDialog(this);

    this.Startup = function () {
+        $('#manage').addClass('active');
+
        this.ReLayout();
        this.InitDataGrid();
        this.ReLoadTableData();
+        
        this.AddDialog.Setup();
        this.EditDialog.Setup();

-        this.aa();
-
-        $('#manage').addClass('active');
        $('#add-btn').on('click', this.OnAddButtonClick.bind(this));
        $('#edit-btn').on('click', this.onEditButtonClick.bind(this));
        $('#delete-btn').on('click', this.onDeleteButtonClick.bind(this));
        $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this));
-        $('#dialog-sure').on('click', this.CloseDeleteDialog.bind(this));
+        $('#dialog-sure').on('click', this.OnSureOfDeleteButtonClick.bind(this));
        $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this));

        window.onresize = this.ReLayout.bind(this);
@ -40,8 +40,7 @@
                { field: 'LoginName', title: '登录账户', align: 'center', width: 10 },
                { field: 'LoginPassWord', title: '登录密码', align: 'center', width: 10 },
                { field: 'ComputeCount', title: '登录次数', align: 'center', width: 10 },
-                { field: 'LastComputeTime', title: '最后登录时间', align: 'center', width: 20 },
-                { field: 'Enabled', title: '启用', align: 'left', width: 50, formatter: this.formatText.bind(this) }
+                { field: 'CreateTime', title: '最后登录时间', align: 'left', width: 60, formatter: this.formatTime.bind(this) }
            ]],
            striped: true,
            singleSelect: false,
@ -54,24 +53,11 @@
            pagination: true,
            onSelect: this.OnTaskSelected.bind(this),
            onUnselect: this.OnTaskUnselected.bind(this),
-            onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
+            onBeforeLoad: this.OnTableGridBeforeLoad.bind(this)
        });
    };

    this.ReLoadTableData = function () {
-        $('#task-table').datagrid({
-            method: "POST",
-            url: '/UserManagement/Query',
-            queryParams: {
-                pageIndex: 1,
-                pageSize: 10
-            }
-        });
-
-        console.log('ok')
-    };
-
-    this.aa = function () {
        $.ajax({
            type: "POST",
            dataType: 'text',
@ -81,15 +67,16 @@
                pageSize: 10
            },
            success: function (result) {
-                console.log($.parseJSON(result))
+                console.log(JSON.parse(result))
+                $('#task-grid').datagrid('loadData', JSON.parse(result));
            }.bind(this)
        });
-    }
-
-    this.formatText = function (value) {
-        return value === 1 ? '<span style="color: #00c541">已启用</span>' : '<span style="color: #f40000">已禁用</span>';
    };

+    this.formatTime = function (time) {
+        return '<span>{0}</span>'.format(moment(time).format('YYYY/MM/DD HH:mm:ss'));
+    }
+
    this.OnTaskSelected = function (index, row) {
        this.selectedRow = row;
        $('.datagrid-btable tr').removeClass('datagrid-row-selected');
@ -110,14 +97,13 @@
    };

    this.OnTableGridBeforeLoad = function () {
-        //var page = $('#task-table').datagrid('getPager');
-        //console.log(page)
-        //$(page).pagination({
-        //    beforePageText: '第',
-        //    afterPageText: '页&nbsp;&nbsp;&nbsp;共{pages}页',
-        //    displayMsg: '当前显示{from}-{to}条记录&nbsp;&nbsp;&nbsp;共{total}条记录',
-        //    layout: ['list', 'sep', 'first', 'prev', 'sep', 'manual', 'sep', 'next', 'last', 'sep', 'refresh', 'info']
-        //});
+        var page = $('#task-grid').datagrid('getPager');
+        $(page).pagination({
+            beforePageText: '第',
+            afterPageText: '页&nbsp;&nbsp;&nbsp;共{pages}页',
+            displayMsg: '当前显示{from}-{to}条记录&nbsp;&nbsp;&nbsp;共{total}条记录',
+            layout: ['list', 'sep', 'first', 'prev', 'sep', 'manual', 'sep', 'next', 'last', 'sep', 'refresh', 'info']
+        });
    };

    this.OnAddButtonClick = function () {
@ -130,12 +116,31 @@

    this.onDeleteButtonClick = function () {
        $('.dialog-delete').show();
-        $('.dialog-clear h2').text('确定删除名为「{0}」的账户吗？'.format(this.selectedRow.Name));
+        $('.dialog-clear h2').text('确定删除名为「{0}」的账户吗？'.format(this.selectedRow.RealName));
+    };
+
+    this.OnSureOfDeleteButtonClick = function () {
+        this.CloseDeleteDialog();
+        this.DeleteUser();
    };

    this.CloseDeleteDialog = function () {
        $('.dialog-delete').hide();
    };
+
+    this.DeleteUser = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/UserManagement/Delete',
+            data: {
+                id: this.selectedRow.Id
+            },
+            success: function () {
+                this.ReLoadTableData();
+            }.bind(this)
+        });
+    };
 };

 $(document).ready(function () {
--- a/04.系统编码/App/Content/styles/common.css
+++ b/04.系统编码/App/Content/styles/common.css
@ -225,7 +225,7 @@
    height: 28px;
    position: absolute;
    top: -6px;
-    left: 70px;
+    left: 165px;
    background-color: #dddddd
 }

@ -426,13 +426,19 @@
    background-position-x: 7px;
 }

+.user-toolbar {
+    align-items: center;
+    justify-content: space-between;
+}
+
 .statistic-toolbar {
    padding-right: 10px;
    align-items: center;
    justify-content: flex-end;
 }

-.statistic-toolbar .query-btn {
+.statistic-toolbar .query-btn,
+.user-toolbar .query-btn{
    height: 28px;
    margin-left: 10px;
    padding: 0 16px;
@ -442,14 +448,20 @@
    background: linear-gradient(to bottom, #febd52, #faa71c);
 }

-.statistic-toolbar .tip {
+.statistic-toolbar .tip,
+.user-toolbar .tip{
    margin: 0 6px;
 }

-.statistic-toolbar .query-btn:hover {
+.statistic-toolbar .query-btn:hover,
+.user-toolbar .query-btn:hover{
    color: #ffffff
 }

+.user-toolbar .btn-groups {
+    margin-top: 0;
+}
+
 .delete-user-dialog .dialog-title h2 {
    background: none !important;
    padding-left: 14px;
--- a/04.系统编码/App/Views/OrgManagement/Index.cshtml
+++ b/04.系统编码/App/Views/OrgManagement/Index.cshtml
@ -27,10 +27,10 @@
                <button type="button" class="btn edit-btn" id="edit-btn" disabled>编辑...</button>
                <button type="button" class="btn delete-btn" id="delete-btn" disabled>删除...</button>
            </div>
-            <div class="btn-groups">
+            @*<div class="btn-groups">
                <button type="button" class="btn enable-btn" id="enable-btn" disabled>启用</button>
                <button type="button" class="btn disable-btn" id="disable-btn" disabled>禁用</button>
-            </div>
+            </div>*@
        </div>
        <div class="table manage-table">
            <table id="task-grid"></table>
--- a/04.系统编码/App/Views/UserManagement/AddDialog.cshtml
+++ b/04.系统编码/App/Views/UserManagement/AddDialog.cshtml
@ -16,8 +16,8 @@
                        <div class="col">
                            <label>性别&nbsp;<span class="star">*</span></label>
                            <div class="sex-select">
-                                <span class="active">男</span>
-                                <span>女</span>
+                                <span class="active" gender="1">男</span>
+                                <span gender="10">女</span>
                            </div>
                        </div>
                    </div>
--- a/04.系统编码/App/Views/UserManagement/EditDialog.cshtml
+++ b/04.系统编码/App/Views/UserManagement/EditDialog.cshtml
@ -16,8 +16,8 @@
                        <div class="col">
                            <label>性别&nbsp;<span class="star">*</span></label>
                            <div class="sex-select" id="sex">
-                                <span class="active" type="男">男</span>
-                                <span type="女">女</span>
+                                <span class="active" gender="1">男</span>
+                                <span gender="10">女</span>
                            </div>
                        </div>
                    </div>
@ -28,7 +28,7 @@
                        </div>
                        <div class="col">
                            <label>登录密码&nbsp;<span class="star">*</span></label>
-                            <input id="pass" class="easyui-passwordbox" prompt="请输入登录密码" />
+                            <input id="password" class="easyui-passwordbox" prompt="请输入登录密码" />
                        </div>
                    </div>
                </div>
--- a/04.系统编码/App/Views/UserManagement/Index.cshtml
+++ b/04.系统编码/App/Views/UserManagement/Index.cshtml
@ -21,15 +21,20 @@
        </ul>
    </div>
    <div class="container">
-        <div class="toolbar">
+        <div class="toolbar user-toolbar">
            <div class="btn-groups">
                <button type="button" class="btn add-btn" id="add-btn">添加...</button>
                <button type="button" class="btn edit-btn" id="edit-btn" disabled>编辑...</button>
                <button type="button" class="btn delete-btn" id="delete-btn" disabled>删除...</button>
            </div>
-            <div class="btn-groups">
+            @*<div class="btn-groups">
                <button type="button" class="btn enable-btn" id="enable-btn" disabled>启用</button>
                <button type="button" class="btn disable-btn" id="disable-btn" disabled>禁用</button>
+            </div>*@
+            <div class="params-select">
+                <span class="tip">机构名称</span>
+                <input id="org-list" name="dept" value="aa">
+                <button type="button" class="btn query-btn" id="query-btn">查询</button>
            </div>
        </div>
        <div class="table manage-table">