purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决权限bug

Browse Source
This commit is contained in:
季圣华
2018-12-23 21:53:22 +08:00
parent c554e24e56
commit b163bc1d4a
10 changed files with 174 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erp_web/js/pages/materials/in_out.js
View File

@@ -1348,11 +1348,11 @@
{
if(i == row.length-1)
{
ids += row[i].Id;
ids += row[i].id;
break;
}
//alert(row[i].id);
ids += row[i].Id + ",";
ids += row[i].id + ",";
}
//批量更新会员的预收款信息
for(var i = 0;i < row.length; i ++) {
@@ -1422,10 +1422,10 @@
{
if(i == row.length-1)
{
ids += row[i].Id;
ids += row[i].id;
break;
}
ids += row[i].Id + ",";
ids += row[i].id + ",";
}
$.ajax({
type:"post",
@@ -1474,10 +1474,10 @@
{
if(i == row.length-1)
{
ids += row[i].Id;
ids += row[i].id;
break;
}
ids += row[i].Id + ",";
ids += row[i].id + ",";
}
$.ajax({
type:"post",

8
erp_web/pages/common/menu.html
View File

@@ -89,11 +89,11 @@
}
//按钮权限列表
else if (lei == 3) {
var btnStr = userBusinessList[0].btnStr;
var btnStr = userBusinessList[0].btnstr;
if (btnStr != null) {
btnStr = JSON.parse(btnStr);
for (var j = 0; j < btnStr.length; j++) {
btnStrList.push(btnStr[j]);
var btnObj = JSON.parse(btnStr);
for (var j = 0; j < btnObj.length; j++) {
btnStrList.push(btnObj[j]);
}
}
}

15
erp_web/pages/manage/role.html
View File

@@ -184,11 +184,10 @@
onSelectPage: function (pageNum, pageSize) {
opts.pageNumber = pageNum;
opts.pageSize = pageSize;
pager.pagination('refresh',
{
pageNumber: pageNum,
pageSize: pageSize
});
pager.pagination('refresh', {
pageNumber: pageNum,
pageSize: pageSize
});
showRoleDetails(pageNum, pageSize);
}
});
@@ -427,7 +426,7 @@
alert("请选择一条数据再操作！");
return false;
}
this.href = "/pages/manage/roleApp.html?id=" + currentRow.Id;
this.href = "/pages/manage/roleApp.html?id=" + currentRow.id;
});
//分配功能
@@ -437,7 +436,7 @@
alert("请选择一条数据再操作！");
return false;
}
this.href = "/pages/manage/roleFunctions.html?id=" + currentRow.Id;
this.href = "/pages/manage/roleFunctions.html?id=" + currentRow.id;
});
//分配按钮
@@ -447,7 +446,7 @@
alert("请选择一条数据再操作！");
return false;
}
this.href = "/pages/manage/rolePushBtn.html?id=" + currentRow.Id;
this.href = "/pages/manage/rolePushBtn.html?id=" + currentRow.id;
});
</script>
</body>

40
erp_web/pages/manage/rolePushBtn.html
View File

@@ -111,11 +111,10 @@
onSelectPage: function (pageNum, pageSize) {
opts.pageNumber = pageNum;
opts.pageSize = pageSize;
pager.pagination('refresh',
{
pageNumber: pageNum,
pageSize: pageSize
});
pager.pagination('refresh', {
pageNumber: pageNum,
pageSize: pageSize
});
showDetails(pageNum, pageSize);
}
});
@@ -127,29 +126,32 @@
function showDetails(pageNo, pageSize) {
$.ajax({
url: "/userBusiness/getBasicData.action",
url: "/userBusiness/getBasicData",
type: "get",
data: {
Type: 'RoleFunctions',
KeyId: keyId
},
success: function (res) {
if (res && res.showModel && res.showModel.map && res.showModel.map.userBusinessList && res.showModel.map.userBusinessList[0]) {
userBusinessId = res.showModel.map.userBusinessList[0].id;
roleBtnStr = res.showModel.map.userBusinessList[0].btnStr;
var getValue = res.showModel.map.userBusinessList[0].value;
if (res && res.code === 200) {
var ubList = res.data.userBusinessList;
userBusinessId = ubList[0].id;
roleBtnStr = ubList[0].btnstr;
var getValue = ubList[0].value;
getValue = getValue.substring(1, getValue.length - 1);
if (getValue.indexOf("][")) {
var arr = getValue.split("][");
arr = arr.toString();
$.ajax({
url: "/functions/findByIds.action",
url: "/functions/findByIds",
type: "get",
data: {
FunctionsIDs: arr
functionsIds: arr
},
success: function (rec) {
$("#tableData").datagrid('loadData', JSON.parse(rec));
success: function (res) {
if(res && res.code === 200) {
$("#tableData").datagrid('loadData', res.data);
}
},
error: function () {
$.messager.alert('提示', '查询数据异常，请稍后再试！', 'error');
@@ -228,14 +230,14 @@
btnStr = JSON.stringify(bindArr);
}
$.ajax({
url: "/userBusiness/updateBtnStr.action",
type: "get",
url: "/userBusiness/updateBtnStr",
type: "post",
data: {
UserBusinessID: userBusinessId,
BtnStr: btnStr
userBusinessId: userBusinessId,
btnStr: btnStr
},
success: function (res) {
if (res) {
if (res && res.code === 200) {
self.parent.$.colorbox.close();
alert("操作成功！");
}