Index: ssts-web/src/main/webapp/systemmanage/roleFormExt.js
===================================================================
diff -u -r15532 -r27305
--- ssts-web/src/main/webapp/systemmanage/roleFormExt.js (.../roleFormExt.js) (revision 15532)
+++ ssts-web/src/main/webapp/systemmanage/roleFormExt.js (.../roleFormExt.js) (revision 27305)
@@ -5,9 +5,20 @@
function openSelectRole(){
var roleIds = $Id('parentIds').value;
var selectedRole = openModalWindow(WWWROOT+'/common/selRoleByExt.jsp?companyId='+companyId+'&separator=,&roleIds='+roleIds, '选择角色', '550', '274');
- if(selectedRole != null){
- Ext.getCmp('parentIds').setValue(selectedRole[0]) ;
- Ext.getCmp('parentNames').setValue(selectedRole[1]) ;
+
+ if(selectedRole == undefined){
+ return;
+ }else {
+ var loop = setInterval(function() {
+ if(selectedRole.closed) {
+ clearInterval(loop);
+
+ var returnValue = selectedRole.returnValue || [];
+
+ Ext.getCmp('parentIds').setValue(returnValue[0]) ;
+ Ext.getCmp('parentNames').setValue(returnValue[1]) ;
+ }
+ },500);
}
}
Index: ssts-web/src/main/webapp/common/selOrgUnit.jsp
===================================================================
diff -u -r12331 -r27305
--- ssts-web/src/main/webapp/common/selOrgUnit.jsp (.../selOrgUnit.jsp) (revision 12331)
+++ ssts-web/src/main/webapp/common/selOrgUnit.jsp (.../selOrgUnit.jsp) (revision 27305)
@@ -1,10 +1,10 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
-<%@ include file="/common/taglibs.jsp"%>
-
-
-
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
-<%@ include file="/common/clearCache.jsp"%>
+<%@ include file="/common/clearCache.jsp"%>
选择组织单位