diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/control.policy/shape/IO_L4.png b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/control.policy/shape/IO_L4.png new file mode 100644 index 00000000..6964caa9 Binary files /dev/null and b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/control.policy/shape/IO_L4.png differ diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/control.policy/shape/it11em111111.png b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/control.policy/shape/it11em111111.png new file mode 100644 index 00000000..a95953a5 Binary files /dev/null and b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/control.policy/shape/it11em111111.png differ diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.evc/shape/IO_L1.png b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.evc/shape/IO_L1.png new file mode 100644 index 00000000..7b2ba308 Binary files /dev/null and b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.evc/shape/IO_L1.png differ diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.evc/shape/IO_L3.png b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.evc/shape/IO_L3.png new file mode 100644 index 00000000..7b2ba308 Binary files /dev/null and b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.evc/shape/IO_L3.png differ diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.flowchart/shape/group.png b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.flowchart/shape/group.png new file mode 100644 index 00000000..04005369 Binary files /dev/null and b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/img/method/process.flowchart/shape/group.png differ 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 2e18cd98..0b68d99a 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 @@ -3727,25 +3727,29 @@ function saveRelevanceShapesTODB(shapesObj, shapeId, shapeName, fileName, } } //by bzp 校验角色和岗位不能同时选择 - if(objId == 'role' || objId == 'post'){ - if(objId == 'role'){ - //判断岗位 - var tmp = $("input[objid='post']").val(); - if(tmp.length > 0){ - $.simpleAlert("不能同时选择岗位和角色"); - return; + debugger; + if(shape.category!="org_role"){ + if(objId == 'role' || objId == 'post'){ + if(objId == 'role'){ + //判断岗位 + var tmp = $("input[objid='post']").val(); + if(tmp.length > 0){ + $.simpleAlert("不能同时选择岗位和角色"); + return; + } } - } - if(objId == 'post'){ - //判断角色 - var tmp = $("input[objid='role']").val(); - if(tmp.length > 0){ - $.simpleAlert("不能同时选择岗位和角色"); - return; + if(objId == 'post'){ + //判断角色 + var tmp = $("input[objid='role']").val(); + if(tmp.length > 0){ + $.simpleAlert("不能同时选择岗位和角色"); + return; + } } } } + //by bzp end var ref = $("input[objid_shapeId='" + objId + "']").attr("ref"); $.ajax({