From 57d7043b850f246b6aa2c296233c137e85eac968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 10 Nov 2019 00:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/pages/manage/role.html | 10 ++--
erp_web/pages/manage/systemConfig.html | 22 ++++-----
erp_web/pages/manage/user.html | 67 ++++++++++++--------------
3 files changed, 47 insertions(+), 52 deletions(-)
diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html
index 3eb5629f..25842934 100644
--- a/erp_web/pages/manage/role.html
+++ b/erp_web/pages/manage/role.html
@@ -115,16 +115,16 @@
pageList: initPageNum,
columns: [[
{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 rowInfo = rec.id + 'AaBb' + rec.name;
- str += '
编辑 ';
- str += '
删除 ';
+ str += ' ';
+ str += '';
return str;
}
- }
+ },
+ {title: '角色名称', field: 'name', width: 200}
]],
toolbar: [
{
diff --git a/erp_web/pages/manage/systemConfig.html b/erp_web/pages/manage/systemConfig.html
index d20b21bd..8de74a58 100644
--- a/erp_web/pages/manage/systemConfig.html
+++ b/erp_web/pages/manage/systemConfig.html
@@ -114,6 +114,17 @@
pageList: initPageNum,
columns: [[
{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 += ' ';
+ str += '';
+ return str;
+ }
+ },
{title: '公司名称', field: 'companyName', width: 150},
{title: '联系人', field: 'companyContacts', width: 80, align: "center"},
{title: '公司地址', field: 'companyAddress', width: 150, align: "center"},
@@ -131,17 +142,6 @@
formatter: function (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 += ' 编辑 ';
- str += ' 删除 ';
- return str;
- }
}
]],
toolbar: [
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index 217d2ce0..5d6c970e 100644
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -176,6 +176,19 @@
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", checkbox:true},
+ {
+ title: '操作', field: 'isystem', align: "center", width: 80, formatter: function (value, rec, index) {
+ var str = '';
+ str += ' ';
+ if (rec.id != rec.tenantId) {
+ str += '';
+ }
+ else {
+ str += '';
+ }
+ return str;
+ }
+ },
{title: '登录名称', field: 'loginame', width: 80},
{title: '用户名称', field: 'username', width: 80, align: "center"},
{title: '职位', field: 'position', width: 115, align: "center"},
@@ -184,24 +197,7 @@
{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) {
- var str = '';
- var rowInfo = rec.id + 'AaBb' + rec.username + 'AaBb' + rec.loginame + 'AaBb' + rec.position
- + '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 += ' 编辑 ';
- if (rec.id != rec.tenantId) {
- str += ' 删除 ';
- }
- else {
- str += '';
- }
- return str;
- }
- }
+ {field: 'orgaId',hidden:true, width: 10}
]],
toolbar: [
{
@@ -282,7 +278,7 @@
url: "/user/deleteUser",
dataType: "json",
data: ({
- ids: userID,
+ ids: userID
}),
success: function (res) {
if(res && res.code != 200) {
@@ -442,32 +438,31 @@
});
//编辑用户信息
- function editUser(usernameTotalInfo) {
- var usernameInfo = usernameTotalInfo.split("AaBb");
+ function editUser(index) {
+ var rowsdata = $("#tableData").datagrid("getRows")[index];
var row = {
- username: usernameInfo[1],
- loginame: usernameInfo[2],
- position: usernameInfo[3],
- email: usernameInfo[5],
- phonenum: usernameInfo[6],
- description: usernameInfo[9],
- orgAbr: usernameInfo[4]=='undefined'?'':usernameInfo[4],
- orgaId: usernameInfo[10]=='undefined'?'':usernameInfo[10],
- orgaUserRelId:usernameInfo[11]=='undefined'?'':usernameInfo[11],
- userBlngOrgaDsplSeq:usernameInfo[12]=='undefined'?'':usernameInfo[12]
-
+ username: rowsdata.username,
+ loginame: rowsdata.loginame,
+ position: rowsdata.position,
+ email: rowsdata.email,
+ phonenum: rowsdata.phonenum,
+ description: rowsdata.description,
+ orgAbr: rowsdata.orgAbr,
+ orgaId: rowsdata.orgaId,
+ orgaUserRelId: rowsdata.orgaUserRelId,
+ userBlngOrgaDsplSeq: rowsdata.userBlngOrgaDsplSeq
};
- oldLoginName = usernameInfo[1];
+ oldLoginName = rowsdata.username;
$('#userDlg').dialog('open').dialog('setTitle', ' 编辑用户信息');
$(".window-mask").css({width: webW, height: webH});
$('#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");
/**机构选择*/
$("#selectType").val("org");
- url = '/user/updateUser?id=' + usernameInfo[0];
+ url = '/user/updateUser?id=' + rowsdata.id;
}