fanwensheng 3 years ago
parent
commit
d7493ef145
  1. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/.suo
  2. BIN
      04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal
  3. 2
      04.系统编码/App/Content/scripts/system-management/org-management/add.js
  4. 5
      04.系统编码/App/Content/scripts/system-management/org-management/index.js
  5. 34
      04.系统编码/App/Content/scripts/system-management/user-management/add.js
  6. 52
      04.系统编码/App/Content/scripts/system-management/user-management/edit.js
  7. 24
      04.系统编码/App/Content/scripts/system-management/user-management/index.js
  8. 26
      04.系统编码/App/Content/styles/common.css
  9. 4
      04.系统编码/App/Views/OrgManagement/AddDialog.cshtml
  10. 4
      04.系统编码/App/Views/OrgManagement/EditDialog.cshtml
  11. 26
      04.系统编码/App/Views/UserManagement/AddDialog.cshtml
  12. 24
      04.系统编码/App/Views/UserManagement/EditDialog.cshtml

BIN
04.系统编码/.vs/BeijingSafeguard/v15/.suo

Binary file not shown.

BIN
04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal

Binary file not shown.

2
04.系统编码/App/Content/scripts/system-management/org-management/add.js

@ -22,7 +22,7 @@
dataType: 'text', dataType: 'text',
url: '/OrgManagement/Add', url: '/OrgManagement/Add',
data: { data: {
Name: $("#name").textbox('getValue')
}, },
success: function () { success: function () {
this.Parent.ReLoadTableData(); this.Parent.ReLoadTableData();

5
04.系统编码/App/Content/scripts/system-management/org-management/index.js

@ -44,6 +44,9 @@
fit: true, fit: true,
scrollbarSize: 0, scrollbarSize: 0,
pagination: true, pagination: true,
pageNumber: 1,
pageSize: 30,
pageList: [30, 40, 50],
onSelect: this.OnTaskSelected.bind(this), onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this), onUnselect: this.OnTaskUnselected.bind(this),
onBeforeLoad: this.OnTableGridBeforeLoad.bind(this), onBeforeLoad: this.OnTableGridBeforeLoad.bind(this),
@ -57,7 +60,7 @@
url: '/OrgManagement/Query', url: '/OrgManagement/Query',
data: { data: {
pageIndex: 1, pageIndex: 1,
pageSize: 10 pageSize: 30
}, },
success: function (result) { success: function (result) {
console.log(JSON.parse(result)) console.log(JSON.parse(result))

34
04.系统编码/App/Content/scripts/system-management/user-management/add.js

@ -2,7 +2,9 @@
this.Parent = parent; this.Parent = parent;
this.Setup = function () { 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)); $("#sure-btn").on("click", this.OnSureButtonClick.bind(this));
$("#cancel-btn").on("click", this.HideDialog.bind(this)); $("#cancel-btn").on("click", this.HideDialog.bind(this));
$("#close").on("click", this.HideDialog.bind(this)); $("#close").on("click", this.HideDialog.bind(this));
@ -12,8 +14,29 @@
$('#add-dialog').show(); $('#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) { this.OnSexButtonClick = function (event) {
$('.sex-select span').removeClass("active"); $('#add-dialog-sex-select span').removeClass("active");
$(event.target).addClass("active"); $(event.target).addClass("active");
}; };
@ -44,13 +67,14 @@
$("#name").textbox('setValue', ''); $("#name").textbox('setValue', '');
$('#loginAccount').textbox('setValue', ''); $('#loginAccount').textbox('setValue', '');
$('#loginPassword').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 () { this.getUserParams = function () {
return { return {
OrgId: 1, OrgId: $('#add-dialog-org-list').combobox('getValue'),
Gender: parseInt($('.sex-select span.active').attr('gender')), Gender: parseInt($('#add-dialog-sex-select span.active').attr('gender')),
RealName: $("#name").textbox('getValue'), RealName: $("#name").textbox('getValue'),
LoginName: $('#loginAccount').textbox('getValue'), LoginName: $('#loginAccount').textbox('getValue'),
LoginPassword: $('#loginPassword').textbox('getValue') LoginPassword: $('#loginPassword').textbox('getValue')

52
04.系统编码/App/Content/scripts/system-management/user-management/edit.js

@ -1,8 +1,10 @@
var EditDialog = function (parent) { var EditDialog = function (parent) {
this.Parent = parent; this.Parent = parent;
this.OrgId = null; this.User = {};
this.Setup = function () { this.Setup = function () {
this.InitOrgList();
$("#sex span").on("click", this.OnSexButtonClick.bind(this)); $("#sex span").on("click", this.OnSexButtonClick.bind(this));
$("#edit-sure-btn").on("click", this.OnSureButtonClick.bind(this)); $("#edit-sure-btn").on("click", this.OnSureButtonClick.bind(this));
$("#edit-cancel-btn").on("click", this.HideDialog.bind(this)); $("#edit-cancel-btn").on("click", this.HideDialog.bind(this));
@ -10,8 +12,7 @@
}; };
this.Show = function (data) { this.Show = function (data) {
console.log(data); this.User = data;
this.OrgId = data.OrgId;
$('#edit-dialog').show(); $('#edit-dialog').show();
$("#username").textbox('setValue', data.RealName); $("#username").textbox('setValue', data.RealName);
$("#account").textbox('setValue', data.LoginName); $("#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'); 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) { this.OnSexButtonClick = function (event) {
$('#sex span').removeClass("active"); $('#sex span').removeClass("active");
$(event.target).addClass("active"); $(event.target).addClass("active");
}; };
this.OnSureButtonClick = function () { 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.EditUser();
this.HideDialog(); this.HideDialog();
}; };
@ -42,28 +70,18 @@
type: "POST", type: "POST",
dataType: 'text', dataType: 'text',
url: '/UserManagement/Update', url: '/UserManagement/Update',
data: this.getUserParams(), data: this.User,
success: function (result) { success: function () {
console.log(this.getUserParams())
this.Parent.ReLoadTableData(); this.Parent.ReLoadTableData();
}.bind(this) }.bind(this)
}); });
}; };
this.clearInput = function () { this.clearInput = function () {
$('#edit-dialog-org-list').combobox('setValue', ''),
$("#username").textbox('setValue', ''), $("#username").textbox('setValue', ''),
$('#account').textbox('setValue', ''), $('#account').textbox('setValue', ''),
$('#password').textbox('setValue', ''), $('#password').textbox('setValue', ''),
$('#sex span').eq(0).addClass("active"); $('#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')
}
};
}; };

24
04.系统编码/App/Content/scripts/system-management/user-management/index.js

@ -11,7 +11,6 @@
this.ReLayout(); this.ReLayout();
this.InitOrgList(); this.InitOrgList();
this.InitDataGrid(); this.InitDataGrid();
this.ReLoadTableData();
this.AddDialog.Setup(); this.AddDialog.Setup();
this.EditDialog.Setup(); this.EditDialog.Setup();
@ -19,9 +18,11 @@
$('#add-btn').on('click', this.OnAddButtonClick.bind(this)); $('#add-btn').on('click', this.OnAddButtonClick.bind(this));
$('#edit-btn').on('click', this.onEditButtonClick.bind(this)); $('#edit-btn').on('click', this.onEditButtonClick.bind(this));
$('#delete-btn').on('click', this.onDeleteButtonClick.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)); $('#delete-dialog-close').on('click', this.CloseDeleteDialog.bind(this));
$('#dialog-sure').on('click', this.OnSureOfDeleteButtonClick.bind(this)); $('#dialog-sure').on('click', this.OnSureOfDeleteButtonClick.bind(this));
$('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this)); $('#dialog-cancel').on('click', this.CloseDeleteDialog.bind(this));
$('#query-btn').trigger('click');
window.onresize = this.ReLayout.bind(this); window.onresize = this.ReLayout.bind(this);
}; };
@ -44,13 +45,18 @@
pageSize: 10000 pageSize: 10000
}, },
success: function (result) { 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({ $('#org-list').combobox({
valueField: 'Id', valueField: 'Id',
textField: 'Name', textField: 'Name',
data: JSON.parse(result).rows editable: false,
panelHeight: 'auto',
panelMaxHeight: 190,
data: data
}); });
$('#org-list').combobox('setValue', 0);
}.bind(this) }.bind(this)
}); });
}; };
@ -69,22 +75,28 @@
fitColumns: true, fitColumns: true,
fit: true, fit: true,
scrollbarSize: 0, scrollbarSize: 0,
pagination: true,
pageNumber: 1, pageNumber: 1,
pageSize: 30, pageSize: 30,
pageList: [30, 40, 50], pageList: [30, 40, 50],
pagination: true,
onSelect: this.OnTaskSelected.bind(this), onSelect: this.OnTaskSelected.bind(this),
onUnselect: this.OnTaskUnselected.bind(this), onUnselect: this.OnTaskUnselected.bind(this),
onBeforeLoad: this.OnTableGridBeforeLoad.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({ $.ajax({
type: "POST", type: "POST",
dataType: 'text', dataType: 'text',
url: '/UserManagement/Query', url: '/UserManagement/Query',
data: { data: {
orgId: orgId,
pageIndex: 1, pageIndex: 1,
pageSize: 30 pageSize: 30
}, },

26
04.系统编码/App/Content/styles/common.css

@ -466,8 +466,11 @@
line-height: 28px; 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: url("../images/drop-down.png") no-repeat;
background-size: 20px 20px;
background-position-y: 4px;
} }
.user-toolbar .org-list { .user-toolbar .org-list {
@ -524,6 +527,11 @@
background-color: #ffffff; background-color: #ffffff;
} }
.manage-dialog .user-dialog {
width: 450px;
margin-left: -225px;
}
.manage-dialog .modal-header { .manage-dialog .modal-header {
position: relative; position: relative;
} }
@ -675,7 +683,21 @@
width: 100%; 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 { .manage-dialog .modal-footer {

4
04.系统编码/App/Views/OrgManagement/AddDialog.cshtml

@ -10,8 +10,8 @@
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col single-col"> <div class="col single-col">
<label>姓名&nbsp;<span class="star">*</span></label> <label>机构名称&nbsp;<span class="star">*</span></label>
<input type="text" id="name" class="easyui-textbox" prompt="请输入姓名" /> <input type="text" id="name" class="easyui-textbox" prompt="请输入机构名称" />
</div> </div>
</div> </div>
</div> </div>

4
04.系统编码/App/Views/OrgManagement/EditDialog.cshtml

@ -10,8 +10,8 @@
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col single-col"> <div class="col single-col">
<label>姓名&nbsp;<span class="star">*</span></label> <label>机构名称&nbsp;<span class="star">*</span></label>
<input type="text" id="username" class="easyui-textbox" prompt="请输入姓名" /> <input type="text" id="username" class="easyui-textbox" prompt="请输入机构名称" />
</div> </div>
</div> </div>
</div> </div>

26
04.系统编码/App/Views/UserManagement/AddDialog.cshtml

@ -1,5 +1,5 @@
<div class="dialog manage-dialog" id="add-dialog"> <div class="dialog manage-dialog" id="add-dialog">
<div class="modal-dialog"> <div class="modal-dialog user-dialog">
<form class="form"> <form class="form">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -8,21 +8,23 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="row user-row"> <div class="row">
<div class="col"> <div class="col user-col">
<label>姓名&nbsp;<span class="star">*</span></label> <div class="item">
<input type="text" id="name" class="easyui-textbox" prompt="请输入姓名" /> <label>姓名&nbsp;<span class="star">*</span></label>
</div> <input type="text" id="name" class="easyui-textbox" prompt="请输入姓名" />
<div class="col"> </div>
<label>性别&nbsp;<span class="star">*</span></label> <div class="item">
<div class="sex-select"> <label>性别&nbsp;<span class="star">*</span></label>
<span class="active" gender="1">男</span> <div class="sex-select" id="add-dialog-sex-select">
<span gender="10">女</span> <span class="active" gender="1">男</span>
<span gender="0">女</span>
</div>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<label>所属机构&nbsp;<span class="star">*</span></label> <label>所属机构&nbsp;<span class="star">*</span></label>
<input id="add-dialog-org" class="easyui-combobox org-list"> <input id="add-dialog-org-list" class="easyui-combobox" prompt="请选择机构">
</div> </div>
</div> </div>
<div class="row"> <div class="row">

24
04.系统编码/App/Views/UserManagement/EditDialog.cshtml

@ -1,5 +1,5 @@
<div class="dialog manage-dialog" id="edit-dialog"> <div class="dialog manage-dialog" id="edit-dialog">
<div class="modal-dialog"> <div class="modal-dialog user-dialog">
<form class="form"> <form class="form">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -9,16 +9,22 @@
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col"> <div class="col user-col">
<label>姓名&nbsp;<span class="star">*</span></label> <div class="item">
<input type="text" id="username" class="easyui-textbox" prompt="请输入姓名" /> <label>姓名&nbsp;<span class="star">*</span></label>
<input type="text" id="username" class="easyui-textbox" prompt="请输入姓名" />
</div>
<div class="item">
<label>性别&nbsp;<span class="star">*</span></label>
<div class="sex-select" id="sex">
<span class="active" gender="1">男</span>
<span gender="0">女</span>
</div>
</div>
</div> </div>
<div class="col"> <div class="col">
<label>性别&nbsp;<span class="star">*</span></label> <label>所属机构&nbsp;<span class="star">*</span></label>
<div class="sex-select" id="sex"> <input id="edit-dialog-org-list" class="easyui-combobox" prompt="请选择机构">
<span class="active" gender="1">男</span>
<span gender="10">女</span>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

Loading…
Cancel
Save