diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index f1462e4d..28693ca8 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js index e6e9aa31..25d232b5 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js @@ -986,7 +986,7 @@ function openRelationDialog(obj, callback) { methodName="新建绩效模型"; } - var getteamId=$('#teamId').val()==undefined?"":$('#teamId').val(); + var getteamId=parent.$("#teamId").val()==undefined?"":parent.$('#teamId').val(); if(method=="control.kpi") { //根据角色 @@ -1021,6 +1021,21 @@ function openRelationDialog(obj, callback) { id: "relationDialog", buttons: [ + { + text : '跳转模型', + cls : "blue", + handler : function() { + var clickNodeId=parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.getClickNodeId(); + if(clickNodeId==''){ + $.simpleAlert("请选择需要打开的流程", 'warning'); + }else{ + var url="./w?uuid=" +clickNodeId+"&teamId="+getteamId + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val()); + window.open(url); + } + + } + }, { text: '确定', cls: "blue", handler: function () { var attrId = obj.attr("id"); @@ -1094,6 +1109,20 @@ function openRelationDialog(obj, callback) { // 刷新页面 parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.location.reload(true); } + },{ + text : '跳转模型', + cls : "blue", + handler : function() { + var clickNodeId=parent.document.getElementById("id-awsui-win-frm-2013-frmrelationDialog").contentWindow.getClickNodeId(); + if(clickNodeId==''){ + $.simpleAlert("请选择需要打开的流程", 'warning'); + }else{ + var url="./w?uuid=" +clickNodeId+"&teamId="+getteamId + + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val()); + window.open(url); + } + + } }, { text: methodName, cls: "green", diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js index 2b873ae7..5e9cc06e 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js @@ -1381,7 +1381,6 @@ function attributeShowTabContent(currentShape) { var tableObj = {} var curTableId = '' function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { - debugger; // 属性排序 var defaultMoreAttr = $('#defaultMoreAttrSort').val(); if (shape.category != undefined) { @@ -3468,7 +3467,7 @@ function openRelationDig(obj,value) { var str = ''; conObj.append(str); - var getteamId=$('#teamId').val()==undefined?"":$('#teamId').val(); + var getteamId=parent.$('#teamId').val()==undefined?"":parent.$('#teamId').val(); $("#attr_dialog_normal_relevance_shapes_div").attr("title", title); $('#attr_content_iframe_relevance_shapes').attr(