diff --git a/public/components/dev/addBasePrivilege/addBasePrivilege.js b/public/components/dev/addBasePrivilege/addBasePrivilege.js index cdb5b7756..bb14d700b 100644 --- a/public/components/dev/addBasePrivilege/addBasePrivilege.js +++ b/public/components/dev/addBasePrivilege/addBasePrivilege.js @@ -12,6 +12,7 @@ resource: '', domain: '', description: '', + mId:'' } }, @@ -19,7 +20,8 @@ }, _initEvent: function () { - vc.on('addBasePrivilege', 'openAddBasePrivilegeModal', function () { + vc.on('addBasePrivilege', 'openAddBasePrivilegeModal', function (_item) { + $that.addBasePrivilegeInfo.mId = _item.mId; $('#addBasePrivilegeModel').modal('show'); }); }, @@ -71,6 +73,13 @@ errInfo: "备注内容不能超过200" }, ], + 'addBasePrivilegeInfo.mId': [ + { + limit: "required", + param: "", + errInfo: "非法操作,菜单为空" + } + ], }); diff --git a/public/components/dev/editBasePrivilege/editBasePrivilege.js b/public/components/dev/editBasePrivilege/editBasePrivilege.js index dafbf2799..f8feced69 100644 --- a/public/components/dev/editBasePrivilege/editBasePrivilege.js +++ b/public/components/dev/editBasePrivilege/editBasePrivilege.js @@ -8,6 +8,7 @@ resource: '', domain: '', description: '', + mId:'' } }, @@ -76,7 +77,6 @@ param: "", errInfo: "权限ID不能为空" }] - }); }, editBasePrivilege: function () { diff --git a/public/pages/dev/basePrivilegeManage/basePrivilegeManage.html b/public/pages/dev/basePrivilegeManage/basePrivilegeManage.html index 3805d3779..d864681ca 100644 --- a/public/pages/dev/basePrivilegeManage/basePrivilegeManage.html +++ b/public/pages/dev/basePrivilegeManage/basePrivilegeManage.html @@ -20,14 +20,7 @@ -
-
+
+
diff --git a/public/pages/dev/menuManage/menuManage.js b/public/pages/dev/menuManage/menuManage.js index 7350504fa..0fbd55f9e 100644 --- a/public/pages/dev/menuManage/menuManage.js +++ b/public/pages/dev/menuManage/menuManage.js @@ -91,6 +91,9 @@ }else{ vc.component.menuManageInfo.moreCondition = true; } + }, + _openPrivilegeModel:function(_menu){ + vc.jumpToPage("/admin.html#/pages/dev/basePrivilegeManage?mId="+_menu.mId); } ,