Skip to content
GitLab
Commit 57d7043b authored by 季圣华's avatar 季圣华
Browse files

优化用户模块

parent 26174e8d
Hide whitespace changes
Inline Side-by-side
erp_web/pages/manage/role.html
View file @ 57d7043b
...@@ -115,16 +115,16 @@ ...@@ -115,16 +115,16 @@
pageList: initPageNum, pageList: initPageNum,
columns: [[ columns: [[
{field: 'id', width: 35, align: "center", checkbox: true}, {field: 'id', width: 35, align: "center", checkbox: true},
{title: '角色名称', field: 'name', width: 200},
{ {
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) { title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec) {
var str = ''; var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name; var rowInfo = rec.id + 'AaBb' + rec.name;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editRole(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;'; str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteRole(' + rec.id + ');"/>&nbsp;<a onclick="deleteRole(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;'; str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteRole(' + rec.id + ');"/>';
return str; return str;
} }
} },
{title: '角色名称', field: 'name', width: 200}
]], ]],
toolbar: [ toolbar: [
{ {
......
erp_web/pages/manage/systemConfig.html
View file @ 57d7043b
...@@ -114,6 +114,17 @@ ...@@ -114,6 +114,17 @@
pageList: initPageNum, pageList: initPageNum,
columns: [[ columns: [[
{field: 'id', width: 35, align: "center", checkbox:true}, {field: 'id', width: 35, align: "center", checkbox:true},
{
title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec) {
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
+ 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode
+ 'AaBb' + rec.depotFlag + 'AaBb' + rec.customerFlag;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSystemConfig(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSystemConfig(' + rec.id + ');"/>';
return str;
}
},
{title: '公司名称', field: 'companyName', width: 150}, {title: '公司名称', field: 'companyName', width: 150},
{title: '联系人', field: 'companyContacts', width: 80, align: "center"}, {title: '联系人', field: 'companyContacts', width: 80, align: "center"},
{title: '公司地址', field: 'companyAddress', width: 150, align: "center"}, {title: '公司地址', field: 'companyAddress', width: 150, align: "center"},
...@@ -131,17 +142,6 @@ ...@@ -131,17 +142,6 @@
formatter: function (value) { formatter: function (value) {
return parseFlag(value); return parseFlag(value);
} }
},
{
title: '操作', field: 'op', width: 160, formatter: function (value, rec) {
var str = '';
var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
+ 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode
+ 'AaBb' + rec.depotFlag + 'AaBb' + rec.customerFlag;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSystemConfig(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editSystemConfig(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSystemConfig(' + rec.id + ');"/>&nbsp;<a onclick="deleteSystemConfig(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
} }
]], ]],
toolbar: [ toolbar: [
......
erp_web/pages/manage/user.html
View file @ 57d7043b
...@@ -176,32 +176,28 @@ ...@@ -176,32 +176,28 @@
pageList: initPageNum, pageList: initPageNum,
columns: [[ columns: [[
{field: 'id', width: 35, align: "center", checkbox:true}, {field: 'id', width: 35, align: "center", checkbox:true},
{title: '登录名称', field: 'loginame', width: 80},
{title: '用户名称', field: 'username', width: 80, align: "center"},
{title: '职位', field: 'position', width: 115, align: "center"},
{title: '部门', field: 'orgAbr', width: 115, align: "center"},
{title: '电子邮箱', field: 'email', width: 150, align: "center"},
{title: '电话号码', field: 'phonenum', width: 150, align: "center"},
{title: '用户排序', field: 'userBlngOrgaDsplSeq', width: 60, align: "center"},
{title: '描述', field: 'description', width: 130},
{field: 'orgaId',hidden:true, width: 10},
{ {
title: '操作', field: 'isystem', width: 150, formatter: function (value, rec) { title: '操作', field: 'isystem', align: "center", width: 80, formatter: function (value, rec, index) {
var str = ''; var str = '';
var rowInfo = rec.id + 'AaBb' + rec.username + 'AaBb' + rec.loginame + 'AaBb' + rec.position str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
+ 'AaBb' + rec.orgAbr + 'AaBb' + rec.email + 'AaBb' + rec.phonenum + 'AaBb' + rec.ismanager
+ 'AaBb' + rec.isystem + 'AaBb' + rec.description+'AaBb'+rec.orgaId+'AaBb'+rec.orgaUserRelId
+'AaBb' + rec.userBlngOrgaDsplSeq ;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editUser(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
if (rec.id != rec.tenantId) { if (rec.id != rec.tenantId) {
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>&nbsp;<a onclick="deleteUser(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;'; str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>';
} }
else { else {
str += ''; str += '';
} }
return str; return str;
} }
} },
{title: '登录名称', field: 'loginame', width: 80},
{title: '用户名称', field: 'username', width: 80, align: "center"},
{title: '职位', field: 'position', width: 115, align: "center"},
{title: '部门', field: 'orgAbr', width: 115, align: "center"},
{title: '电子邮箱', field: 'email', width: 150, align: "center"},
{title: '电话号码', field: 'phonenum', width: 150, align: "center"},
{title: '用户排序', field: 'userBlngOrgaDsplSeq', width: 60, align: "center"},
{title: '描述', field: 'description', width: 130},
{field: 'orgaId',hidden:true, width: 10}
]], ]],
toolbar: [ toolbar: [
{ {
...@@ -282,7 +278,7 @@ ...@@ -282,7 +278,7 @@
url: "/user/deleteUser", url: "/user/deleteUser",
dataType: "json", dataType: "json",
data: ({ data: ({
ids: userID, ids: userID
}), }),
success: function (res) { success: function (res) {
if(res && res.code != 200) { if(res && res.code != 200) {
...@@ -442,32 +438,31 @@ ...@@ -442,32 +438,31 @@
}); });
//编辑用户信息 //编辑用户信息
function editUser(usernameTotalInfo) { function editUser(index) {
var usernameInfo = usernameTotalInfo.split("AaBb"); var rowsdata = $("#tableData").datagrid("getRows")[index];
var row = { var row = {
username: usernameInfo[1], username: rowsdata.username,
loginame: usernameInfo[2], loginame: rowsdata.loginame,
position: usernameInfo[3], position: rowsdata.position,
email: usernameInfo[5], email: rowsdata.email,
phonenum: usernameInfo[6], phonenum: rowsdata.phonenum,
description: usernameInfo[9], description: rowsdata.description,
orgAbr: usernameInfo[4]=='undefined'?'':usernameInfo[4], orgAbr: rowsdata.orgAbr,
orgaId: usernameInfo[10]=='undefined'?'':usernameInfo[10], orgaId: rowsdata.orgaId,
orgaUserRelId:usernameInfo[11]=='undefined'?'':usernameInfo[11], orgaUserRelId: rowsdata.orgaUserRelId,
userBlngOrgaDsplSeq:usernameInfo[12]=='undefined'?'':usernameInfo[12] userBlngOrgaDsplSeq: rowsdata.userBlngOrgaDsplSeq
}; };
oldLoginName = usernameInfo[1]; oldLoginName = rowsdata.username;
$('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑用户信息'); $('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑用户信息');
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
$('#usernameFM').form('load', row); $('#usernameFM').form('load', row);
userID = usernameInfo[0]; userID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面 //焦点在名称输入框==定焦在输入文字后面
$("#username").val("").focus().val(usernameInfo[1]); $("#username").val("").focus().val(rowsdata.username);
$("#loginame").attr("readonly","readonly"); $("#loginame").attr("readonly","readonly");
/**机构选择*/ /**机构选择*/
$("#selectType").val("org"); $("#selectType").val("org");
url = '/user/updateUser?id=' + usernameInfo[0]; url = '/user/updateUser?id=' + rowsdata.id;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment