修改点击待审批弹窗跳转审批页面提示无权限问题

master
zengwh 6 years ago
parent 2efbb4cfec
commit e50e6cb9d4

@ -65,7 +65,8 @@
//noticeId = 'emr_record'为跳转病案管理系统的病案未审批页面
var url = '';
if(noticeId == 'emr_record'){
url = path+"/approve/approveManageList174?flag=1";
var approveUrl = $("#approveUrl").val();
url = path+approveUrl+"?flag=1";
parent.$("#iFrame1").prop("src",url);
}else{
url = powerUrlHead+"/gatewayPage?noticeId="+noticeId;

@ -4,7 +4,7 @@
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro" %>
<c:set var="path" value="${pageContext.request.contextPath}"/>
<html>
<html >
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -82,6 +82,8 @@
<input type="hidden" id="strSplit" value="<%=STR_SPLIT%>">
<!--是否审批权限-->
<input type="hidden" id="approvePower" value="<%=approvePower%>">
<!--审批列表的链接地址-->
<input type="hidden" id="approveUrl">
<div class="wrapper">
<header class="main-header">
<!--logo-->
@ -239,7 +241,7 @@
<div class="page-content-wrapper">
<div class="page-content">
<div class="container-fluid">
<iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList"
<iframe class="row-fluid" style="width:100%;" src="${path}/commom/commomList"
id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe>
</div>
</div>

@ -1,27 +1,30 @@
//禁止快捷键打印
function disabledPrint(){
if(event.keyCode==80 && event.ctrlKey){
event.keyCode=0;
event.returnValue=false;
function disabledPrint() {
if (event.keyCode == 80 && event.ctrlKey) {
event.keyCode = 0;
event.returnValue = false;
}
}
function indexSelected(_this){
function indexSelected(_this) {
$("ul.treeview-menu").find("a").removeClass("indexSelected");
$(_this).addClass("indexSelected");
}
/*========================menu========================*/
$(function () {
var POWER_JSP = $("#POWER_JSP").val()
function ajaxJsonFun() {
$.ajax({
url: POWER_JSP + "/font/getMenuByToken?token="+$("#token").val()+"&sysFlag=emr_record",
url: POWER_JSP + "/font/getMenuByToken?token=" + $("#token").val() + "&sysFlag=emr_record",
//url: POWER_JSP + "/font/getMenusByUserIdAndSysFlag?userName="+$("#userName").val()+"&sysFlag=emr_record",
type: "POST",
dataType:'json',
dataType: 'json',
success: function (result) {
if (result.code == 100) {
var menu = result.extend.list;
if(menu != '') {
if (menu != '') {
var menuArr = menuRoleFun(menu);
for (var i = 0; i < menuArr.length; i++) {
$('#indexTreeMenu').append(menuArr[i]);
@ -58,56 +61,70 @@ $(function () {
};
ajaxJsonFun();
});
//系统管理员
function menuRoleFun(menuArr) {
var muluArr=[];
var mulu=null;
var menuLiArr=[];
var muluArr = [];
var mulu = null;
var menuLiArr = [];
//是否包含常用查询
var flag = false;
//接收第一个页面的url
var url = '';
//接收审批页面的url地址
var approveUrl = '';
/*菜单*/
if(menuArr!=null){
if (menuArr != null) {
var commomUrl = '';
/*系统目录menuArr.length*/
for (var i = 0; i < menuArr.length; i++) {
if ( menuArr[i].menuUrl == null || menuArr[i].menuUrl == '' || menuArr[i].menuUrl == '#') {
if (menuArr[i].menuUrl == null || menuArr[i].menuUrl == '' || menuArr[i].menuUrl == '#') {
mulu = liFun(menuArr[i].menuName, menuArr[i].menuIcon);
/*链接跳转*/
for (var j = 0; j < menuArr.length; j++) {
if ((menuArr[j].menuUrl != null || menuArr[j].menuUrl != '')&&menuArr[i].menuId==menuArr[j].methodParent) {
var menuUrl = menuArr[j].menuUrl;
if ((menuUrl != null || menuUrl != '') && menuArr[i].menuId == menuArr[j].methodParent) {
menuLiArr.push(menuArr[j]);
//接收审批页面的地址
if (approveUrl == '' && (menuUrl == '/approve/approveManageList' || menuUrl == '/approve/approveManageList1' ||
menuUrl == '/approve/approveManageList174')) {
approveUrl = menuUrl;
}
}
}
if (menuLiArr != null) {
if (menuLiArr.length > 0) {
var liMenu = ulSysMenuFun(menuLiArr);
menuLiArr=[];
menuLiArr = [];
mulu.append(liMenu);
}
}
muluArr.push(mulu);
}
if(menuArr[i].menuName == '常用查询'){
if (menuArr[i].menuName == '常用查询') {
flag = true;
commomUrl = menuArr[i].menuUrl;
}
if(url == '' && menuArr[i].menuUrl != '#'){
if (url == '' && menuArr[i].menuUrl != '#') {
url = menuArr[i].menuUrl;
}
}
//跳转第一个页面
if(!flag && url != ''){
$("#iFrame1").prop("src",path+url);
}else{
$("#iFrame1").prop("src",path+commomUrl)
if (!flag && url != '') {
$("#iFrame1").prop("src", path + url);
} else {
$("#iFrame1").prop("src", path + commomUrl)
}
//赋值审批页面到index页面内隐藏域
if (approveUrl != '') {
$("#approveUrl").val(approveUrl)
}
}
return muluArr;
}
function listPowerFun(menuArr){
function listPowerFun(menuArr) {
var hosp = newUlFun();
if (menuArr != null && menuArr.length > 0) {
var muluArr = [];
@ -140,7 +157,7 @@ function listPowerFun(menuArr){
}
}
/*
/*
if (menuArr != null && menuArr.length > 0) {
/!*医院*!/
for (var i = 0; i < menuArr.length; i++) {
@ -216,19 +233,21 @@ function listPowerFun(menuArr){
}
}
}
*/
*/
return hosp;
}
function newUlFun(){
function newUlFun() {
var newUl = $("<ul class=\"treeview-menu\" style=\"display: block;\"></ul>");
return newUl;
}
function newLiFun(){
var newLi=$("<li class=\"treeview menu-open\"></li>");
function newLiFun() {
var newLi = $("<li class=\"treeview menu-open\"></li>");
return newLi;
}
function newAFun(aName, iconCss){
function newAFun(aName, iconCss) {
/*
<a href="#">
<i class="fa fa-share"></i> <span>Multilevel</span>
@ -247,12 +266,12 @@ function newAFun(aName, iconCss){
return newA;
}
function newAliFun(aName,iconCss,menuUrl){
function newAliFun(aName, iconCss, menuUrl) {
menuUrl = path + menuUrl;
/*<li><a href="#"><i class="fa fa-circle-o"></i> Level Three</a></li> */
var newli = $("<li></li> ");
var newicon=$("<i></i>");
var newA=$("<a href=\"" + menuUrl + "\" target=\"iFrame1\"></a>");
var newicon = $("<i></i>");
var newA = $("<a href=\"" + menuUrl + "\" target=\"iFrame1\"></a>");
newicon.addClass(iconCss);
newA.append(newicon);
newA.append(aName);
@ -260,16 +279,16 @@ function newAliFun(aName,iconCss,menuUrl){
return newli;
}
function menuFun(menuArr){
var menuUl=$("<ul class=\"sidebar-menu\" data-widget=\"tree\" ></ul>");
var arr=[];
var hospital=null;
if(menuArr.length>0){
for(var i=0;i< menuArr.length;i++){
if(menuArr[i].menuIcon==null){
menuArr[i].menuIcon="fa fa-circle-o";
}
if(menuArr[i].hospitalName!=null){
function menuFun(menuArr) {
var menuUl = $("<ul class=\"sidebar-menu\" data-widget=\"tree\" ></ul>");
var arr = [];
var hospital = null;
if (menuArr.length > 0) {
for (var i = 0; i < menuArr.length; i++) {
if (menuArr[i].menuIcon == null) {
menuArr[i].menuIcon = "fa fa-circle-o";
}
if (menuArr[i].hospitalName != null) {
/*
li-->a-->ul-->li-->a--ul-->li-->a-->ul-->li
*/
@ -296,14 +315,14 @@ function menuFun(menuArr){
var menArr = [];
for (var k = 0; k < menuArr.length; k++) {
if (menuArr[k].menuId == menuArr[j].menuId) {
if (menArr.indexOf(menuArr[k].menuId) == -1 && menuArr[k].menuName!="菜单列表") {
if (menArr.indexOf(menuArr[k].menuId) == -1 && menuArr[k].menuName != "菜单列表") {
menArr.push(menuArr[k].menuId);
menuLiFun.push(menuArr[k]);
}
}
}
/*系统-菜单*/
if(menuLiFun.length>0) {
if (menuLiFun.length > 0) {
if (sysArr.indexOf(menuArr[j].sysFlag) == -1) {
sysArr.push(menuArr[j].sysFlag);
sysUl = ulFun(menuArr[j].sysName, menuArr[j].menuIcon);
@ -325,7 +344,7 @@ function menuFun(menuArr){
}
}
}
deptArr=null;
deptArr = null;
}
return menuUl;
}
@ -348,7 +367,7 @@ function ulFun(liName, iconCss) {
return subUl;
}
function liFun(liName,iconCss) {
function liFun(liName, iconCss) {
var subLi = $("<li class=\"treeview menu-open\"></li>");
subLi.append(aFun(liName, iconCss));
return subLi;
@ -374,7 +393,7 @@ function ulSysMenuFun(menuArr) {
var subUl = $(" <ul class=\"treeview-menu \" style=\"display: block;\"></ul>");
for (var i = 0; i < menuArr.length; i++) {
var subLi = $("<li></li>");
var subA = $("<a href="+path+menuArr[i].menuUrl+" target=\"iFrame1\" onclick = 'indexSelected(this)'></a>");
var subA = $("<a href=" + path + menuArr[i].menuUrl + " target=\"iFrame1\" onclick = 'indexSelected(this)'></a>");
var subIcon = $("<i></i>");
if (menuArr[i].menuIcon != undefined || menuArr[i].menuIcon != null || menuArr[i].menuIcon != '') {
subIcon.addClass(menuArr[i].menuIcon);

Loading…
Cancel
Save