diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo
index 98f8672..5a77a04 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-shm b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm
index c0620a1..33ed497 100644
Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
index 6ef1c13..3dce694 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/user-management/add.js b/04.系统编码/App/Content/scripts/system-management/user-management/add.js
index 6a0f625..dff9363 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/add.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/add.js
@@ -18,8 +18,8 @@
};
this.OnSureButtonClick = function () {
- this.HideDialog();
this.AddUser();
+ this.HideDialog();
};
this.HideDialog = function () {
@@ -33,13 +33,7 @@
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')
- },
+ data: this.getUserParams(),
success: function () {
this.Parent.ReLoadTableData();
}.bind(this)
@@ -52,4 +46,14 @@
$('#loginPassword').textbox('setValue', '');
$('.sex-select span').eq(0).addClass("active");
};
+
+ this.getUserParams = function () {
+ return {
+ OrgId: 1,
+ Gender: parseInt($('.sex-select span.active').attr('gender')),
+ RealName: $("#name").textbox('getValue'),
+ LoginName: $('#loginAccount').textbox('getValue'),
+ LoginPassword: $('#loginPassword').textbox('getValue')
+ }
+ };
};
\ No newline at end of file
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 5afd243..42561cf 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/edit.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/edit.js
@@ -1,5 +1,6 @@
var EditDialog = function (parent) {
this.Parent = parent;
+ this.OrgId = null;
this.Setup = function () {
$("#sex span").on("click", this.OnSexButtonClick.bind(this));
@@ -9,7 +10,8 @@
};
this.Show = function (data) {
- console.log(data)
+ console.log(data);
+ this.OrgId = data.OrgId;
$('#edit-dialog').show();
$("#username").textbox('setValue', data.RealName);
$("#account").textbox('setValue', data.LoginName);
@@ -24,8 +26,9 @@
};
this.OnSureButtonClick = function () {
- this.HideDialog();
+ console.log(this.getUserParams())
this.EditUser();
+ this.HideDialog();
};
this.HideDialog = function () {
@@ -39,15 +42,9 @@
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')
- },
+ data: this.getUserParams(),
success: function (result) {
- console.log(result)
+ console.log(this.getUserParams())
this.Parent.ReLoadTableData();
}.bind(this)
});
@@ -59,4 +56,14 @@
$('#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 c494886..176533d 100644
--- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js
+++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js
@@ -70,8 +70,8 @@
fit: true,
scrollbarSize: 0,
pageNumber: 1,
- pageSize: 20,
- pageList: [10, 20, 30],
+ pageSize: 30,
+ pageList: [30, 40, 50],
pagination: true,
onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this),
@@ -86,7 +86,7 @@
url: '/UserManagement/Query',
data: {
pageIndex: 1,
- pageSize: 10
+ pageSize: 30
},
success: function (result) {
$('#task-grid').datagrid('loadData', JSON.parse(result));
diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css
index e994f7a..d96cff3 100644
--- a/04.系统编码/App/Content/styles/common.css
+++ b/04.系统编码/App/Content/styles/common.css
@@ -675,6 +675,9 @@
width: 100%;
}
+.manage-dialog .modal-body .user-row .col {
+}
+
.manage-dialog .modal-footer {
padding: 16px 10px;
text-align: right;
diff --git a/04.系统编码/App/Views/UserManagement/AddDialog.cshtml b/04.系统编码/App/Views/UserManagement/AddDialog.cshtml
index cd60194..5a0b606 100644
--- a/04.系统编码/App/Views/UserManagement/AddDialog.cshtml
+++ b/04.系统编码/App/Views/UserManagement/AddDialog.cshtml
@@ -8,7 +8,7 @@
</div>
<div class="modal-body">
- <div class="row">
+ <div class="row user-row">
<div class="col">
<label>姓名 <span class="star">*</span></label>
<input type="text" id="name" class="easyui-textbox" prompt="请输入姓名" />
@@ -20,6 +20,10 @@
<span gender="10">女</span>
</div>
</div>
+ <div class="col">
+ <label>所属机构 <span class="star">*</span></label>
+ <input id="add-dialog-org" class="easyui-combobox org-list">
+ </div>
</div>
<div class="row">
<div class="col">