diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 5a77a04..a297bb3 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/.suo and b/04.系统编码/.vs/BeijingSafeguard/v15/.suo differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 3dce694..bceef1b 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal differ diff --git a/04.系统编码/App/Content/scripts/system-management/org-management/add.js b/04.系统编码/App/Content/scripts/system-management/org-management/add.js index f0cf403..78a059a 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/add.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/add.js @@ -22,7 +22,7 @@ dataType: 'text', url: '/OrgManagement/Add', data: { - + Name: $("#name").textbox('getValue') }, success: function () { this.Parent.ReLoadTableData(); diff --git a/04.系统编码/App/Content/scripts/system-management/org-management/index.js b/04.系统编码/App/Content/scripts/system-management/org-management/index.js index b1166c4..c6e56e5 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js @@ -44,6 +44,9 @@ fit: true, scrollbarSize: 0, pagination: true, + pageNumber: 1, + pageSize: 30, + pageList: [30, 40, 50], onSelect: this.OnTaskSelected.bind(this), onUnselect: this.OnTaskUnselected.bind(this), onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), @@ -57,7 +60,7 @@ url: '/OrgManagement/Query', data: { pageIndex: 1, - pageSize: 10 + pageSize: 30 }, success: function (result) { console.log(JSON.parse(result)) diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/add.js b/04.系统编码/App/Content/scripts/system-management/user-management/add.js index dff9363..b0feed9 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/add.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/add.js @@ -2,7 +2,9 @@ this.Parent = parent; this.Setup = function () { - $(".sex-select span").on("click", this.OnSexButtonClick.bind(this)); + this.InitOrgList(); + + $("#add-dialog-sex-select span").on("click", this.OnSexButtonClick.bind(this)); $("#sure-btn").on("click", this.OnSureButtonClick.bind(this)); $("#cancel-btn").on("click", this.HideDialog.bind(this)); $("#close").on("click", this.HideDialog.bind(this)); @@ -12,8 +14,29 @@ $('#add-dialog').show(); }; + this.InitOrgList = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/OrgManagement/Query', + data: { + pageIndex: 1, + pageSize: 10000 + }, + success: function (result) { + console.log(result) + $('#add-dialog-org-list').combobox({ + valueField: 'Id', + textField: 'Name', + editable: false, + data: JSON.parse(result).rows + }); + }.bind(this) + }); + }; + this.OnSexButtonClick = function (event) { - $('.sex-select span').removeClass("active"); + $('#add-dialog-sex-select span').removeClass("active"); $(event.target).addClass("active"); }; @@ -44,13 +67,14 @@ $("#name").textbox('setValue', ''); $('#loginAccount').textbox('setValue', ''); $('#loginPassword').textbox('setValue', ''); - $('.sex-select span').eq(0).addClass("active"); + $('#add-dialog-sex-select span').eq(0).addClass("active"); + $('#add-dialog-org-list').combobox('setValue', ''); }; this.getUserParams = function () { return { - OrgId: 1, - Gender: parseInt($('.sex-select span.active').attr('gender')), + OrgId: $('#add-dialog-org-list').combobox('getValue'), + Gender: parseInt($('#add-dialog-sex-select span.active').attr('gender')), RealName: $("#name").textbox('getValue'), LoginName: $('#loginAccount').textbox('getValue'), LoginPassword: $('#loginPassword').textbox('getValue') diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/edit.js b/04.系统编码/App/Content/scripts/system-management/user-management/edit.js index 42561cf..4625a66 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/edit.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/edit.js @@ -1,8 +1,10 @@ var EditDialog = function (parent) { this.Parent = parent; - this.OrgId = null; + this.User = {}; this.Setup = function () { + this.InitOrgList(); + $("#sex span").on("click", this.OnSexButtonClick.bind(this)); $("#edit-sure-btn").on("click", this.OnSureButtonClick.bind(this)); $("#edit-cancel-btn").on("click", this.HideDialog.bind(this)); @@ -10,8 +12,7 @@ }; this.Show = function (data) { - console.log(data); - this.OrgId = data.OrgId; + this.User = data; $('#edit-dialog').show(); $("#username").textbox('setValue', data.RealName); $("#account").textbox('setValue', data.LoginName); @@ -20,13 +21,40 @@ parseInt($('#sex span').eq(1).attr('gender')) === data.Gender ? $('#sex span').eq(1).addClass('active') : $('#sex span').eq(1).removeClass('active'); }; + this.InitOrgList = function () { + $.ajax({ + type: "POST", + dataType: 'text', + url: '/OrgManagement/Query', + data: { + pageIndex: 1, + pageSize: 10000 + }, + success: function (result) { + $('#edit-dialog-org-list').combobox({ + valueField: 'Id', + textField: 'Name', + editable: false, + data: JSON.parse(result).rows + }); + + $('#edit-dialog-org-list').combobox('setValue', this.User.OrgId); + }.bind(this) + }); + }; + this.OnSexButtonClick = function (event) { $('#sex span').removeClass("active"); $(event.target).addClass("active"); }; this.OnSureButtonClick = function () { - console.log(this.getUserParams()) + this.User.OrgId = $('#edit-dialog-org-list').combobox('getValue'); + this.User.Gender = parseInt($('#sex span.active').attr('gender')); + this.User.RealName = $("#username").textbox('getValue'); + this.User.LoginName = $('#account').textbox('getValue'); + this.User.LoginPassWord = $('#password').textbox('getValue'); + this.EditUser(); this.HideDialog(); }; @@ -42,28 +70,18 @@ type: "POST", dataType: 'text', url: '/UserManagement/Update', - data: this.getUserParams(), - success: function (result) { - console.log(this.getUserParams()) + data: this.User, + success: function () { this.Parent.ReLoadTableData(); }.bind(this) }); }; this.clearInput = function () { + $('#edit-dialog-org-list').combobox('setValue', ''), $("#username").textbox('setValue', ''), $('#account').textbox('setValue', ''), $('#password').textbox('setValue', ''), $('#sex span').eq(0).addClass("active"); }; - - this.getUserParams = function () { - return { - OrgId: this.OrgId, - Gender: parseInt($('#sex span.active').attr('gender')), - RealName: $("#username").textbox('getValue'), - LoginName: $('#account').textbox('getValue'), - LoginPassword: $('#password').textbox('getValue') - } - }; }; \ No newline at end of file diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/index.js b/04.系统编码/App/Content/scripts/system-management/user-management/index.js index 176533d..2de850f 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -11,7 +11,6 @@ this.ReLayout(); this.InitOrgList(); this.InitDataGrid(); - this.ReLoadTableData(); this.AddDialog.Setup(); this.EditDialog.Setup(); @@ -19,9 +18,11 @@ $('#add-btn').on('click', this.OnAddButtonClick.bind(this)); $('#edit-btn').on('click', this.onEditButtonClick.bind(this)); $('#delete-btn').on('click', this.onDeleteButtonClick.bind(this)); + $('#query-btn').on('click', this.onQueryButtonClick.bind(this)); $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this)); $('#dialog-sure').on('click', this.OnSureOfDeleteButtonClick.bind(this)); $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this)); + $('#query-btn').trigger('click'); window.onresize = this.ReLayout.bind(this); }; @@ -44,13 +45,18 @@ pageSize: 10000 }, success: function (result) { - console.log(JSON.parse(result)); + var data = JSON.parse(result).rows; + var newData = data.splice(0, 0, { Id: 0, Name: '全部' }); + $('#org-list').combobox({ valueField: 'Id', textField: 'Name', - data: JSON.parse(result).rows - + editable: false, + panelHeight: 'auto', + panelMaxHeight: 190, + data: data }); + $('#org-list').combobox('setValue', 0); }.bind(this) }); }; @@ -69,22 +75,28 @@ fitColumns: true, fit: true, scrollbarSize: 0, + pagination: true, pageNumber: 1, pageSize: 30, pageList: [30, 40, 50], - pagination: true, onSelect: this.OnTaskSelected.bind(this), onUnselect: this.OnTaskUnselected.bind(this), onBeforeLoad: this.OnTableGridBeforeLoad.bind(this) }); }; - this.ReLoadTableData = function () { + this.onQueryButtonClick = function () { + var orgId = $('#org-list').combobox('getValue') === '' ? 0 : $('#org-list').combobox('getValue'); + this.ReLoadTableData(orgId); + }; + + this.ReLoadTableData = function (orgId) { $.ajax({ type: "POST", dataType: 'text', url: '/UserManagement/Query', data: { + orgId: orgId, pageIndex: 1, pageSize: 30 }, diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index d96cff3..6c4219a 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -466,8 +466,11 @@ line-height: 28px; } -.user-toolbar .combo-arrow { +.user-toolbar .combo-arrow, +.manage-dialog .user-dialog .combo-arrow { background: url("../images/drop-down.png") no-repeat; + background-size: 20px 20px; + background-position-y: 4px; } .user-toolbar .org-list { @@ -524,6 +527,11 @@ background-color: #ffffff; } +.manage-dialog .user-dialog { + width: 450px; + margin-left: -225px; +} + .manage-dialog .modal-header { position: relative; } @@ -675,7 +683,21 @@ width: 100%; } -.manage-dialog .modal-body .user-row .col { +.manage-dialog .modal-body .user-col { + display: flex; + justify-content: space-between; +} + +.manage-dialog .modal-body .user-col .item .sex-select { + width: 80px; +} + +.manage-dialog .modal-body .user-col .item .sex-select span { + width: 40px; +} + +.manage-dialog .modal-body .user-col .item:last-of-type { + margin-left: 10px; } .manage-dialog .modal-footer { diff --git a/04.系统编码/App/Views/OrgManagement/AddDialog.cshtml b/04.系统编码/App/Views/OrgManagement/AddDialog.cshtml index 16030c7..110e837 100644 --- a/04.系统编码/App/Views/OrgManagement/AddDialog.cshtml +++ b/04.系统编码/App/Views/OrgManagement/AddDialog.cshtml @@ -10,8 +10,8 @@