From e9b6e21e9a435297e44ef5653a97eeef28545a30 Mon Sep 17 00:00:00 2001 From: hhx <1284857778@qq.com> Date: Thu, 13 Jan 2022 17:04:54 +0800 Subject: [PATCH] commit --- 04.系统编码/.vs/BeijingSafeguard/v15/.suo | Bin 209920 -> 214016 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 4140632 -> 4140632 bytes .../system-management/org-management/add.js | 2 +- .../system-management/org-management/index.js | 5 +- .../system-management/user-management/add.js | 34 ++++++++++-- .../system-management/user-management/edit.js | 52 ++++++++++++------ .../user-management/index.js | 24 ++++++-- 04.系统编码/App/Content/styles/common.css | 26 ++++++++- .../App/Views/OrgManagement/AddDialog.cshtml | 4 +- .../App/Views/OrgManagement/EditDialog.cshtml | 4 +- .../App/Views/UserManagement/AddDialog.cshtml | 26 +++++---- .../Views/UserManagement/EditDialog.cshtml | 24 +++++--- 12 files changed, 144 insertions(+), 57 deletions(-) diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 5a77a043629fb374431d79ddc67f52d3d3a35139..a297bb340884cde96d0b79597f18a112255d3d42 100644 GIT binary patch delta 6043 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 delta 5933 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 delta 10597 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 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 @@ diff --git a/04.系统编码/App/Views/OrgManagement/EditDialog.cshtml b/04.系统编码/App/Views/OrgManagement/EditDialog.cshtml index ddba8ff..58a2030 100644 --- a/04.系统编码/App/Views/OrgManagement/EditDialog.cshtml +++ b/04.系统编码/App/Views/OrgManagement/EditDialog.cshtml @@ -10,8 +10,8 @@ diff --git a/04.系统编码/App/Views/UserManagement/AddDialog.cshtml b/04.系统编码/App/Views/UserManagement/AddDialog.cshtml index 5a0b606..011f102 100644 --- a/04.系统编码/App/Views/UserManagement/AddDialog.cshtml +++ b/04.系统编码/App/Views/UserManagement/AddDialog.cshtml @@ -1,5 +1,5 @@ 
-