Index: ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
===================================================================
diff -u -r29535 -r29551
--- ssts-web/src/main/webapp/systemmanage/orgUnitExt.js	(.../orgUnitExt.js)	(revision 29535)
+++ ssts-web/src/main/webapp/systemmanage/orgUnitExt.js	(.../orgUnitExt.js)	(revision 29551)
@@ -1,124 +1,26 @@
 var	isNotRepeatCoding = true;
 var	isNotRepeatName = true;  //（陈家儒改）
 var oldName = null;
-
-function selectePerson(action){
-	var userIds = "";
-	var userNames = "";
-	if(action == 'principal'){
-		userIds = "";
-		userNames = Ext.getCmp('principal').getValue();
-	}else{
-		userIds = Ext.getCmp(action + "Ids").getValue();
-		userNames = Ext.getCmp(action + "Names").getValue();
-	}
-	
-	var arg = {};
-	arg.userIds = userIds;
-	arg.userNames = userNames;
-	
-	arg.userIdsArray = userIds.split(";");
-	arg.userNamesArray = userNames.split(";");
-	arg.action = action;
-    //GGSRMYY-129修改了参数的提交方式
-    sessionStorage.setItem('arg',JSON.stringify(arg));
-	var selectLeadersArray = openModalWindow(WWWROOT+'/common/selPersonByOrgUnitByExt.jsp', {}, '700', '430');
-
-    if(selectLeadersArray == undefined){
-        return;
-    }else if(selectLeadersArray[0] !== undefined){
-        if(action == 'principal'){//负责人
-            var userNames = null;
-            for(var i = 0 ; i < selectLeadersArray.length ; i++){
-                var index = selectLeadersArray[i].indexOf("#*");
-                if(index == -1){
-                    if(userNames == null){
-                        userNames = selectLeadersArray[i];
-                    }else{
-                        userNames += ';'+selectLeadersArray[i];
-                    }
-                }else{
-                    if(userNames == null){
-                        userNames = selectLeadersArray[i].split('#*')[1];
-                    }else{
-                        userNames += ';'+selectLeadersArray[i].split('#*')[1];
-                    }
-                }
-                
-            }
-            Ext.getCmp("principal").setValue(userNames);
-        }else {
-            var userIds = null;
-            var userNames = null;
-            for(var i = 0 ; i < selectLeadersArray.length ; i++){
-                if(userIds == null){
-                    userIds = selectLeadersArray[i].split('#*')[0];
-                }else{
-                    userIds += ';'+selectLeadersArray[i].split('#*')[0];
-                }
-                
-                if(userNames == null){
-                    userNames = selectLeadersArray[i].split('#*')[1];
-                }else{
-                    userNames += ';'+selectLeadersArray[i].split('#*')[1];
-                }
-            }
-            Ext.getCmp(action + "Ids").setValue(userIds) ;
-            Ext.getCmp(action + "Names").setValue(userNames) ;
-        }
+//打开用户选择界面，GGSRMYY-129问题后，负责人，分管领导，包含用户都用同一个公共的方法去维护
+function changeUser(action){
+    var userIdsElement;
+    var userNamesElement;
+    if(action == 'includeUsers'){
+        userIdsElement = Ext.getCmp("userIds") || top.Ext.getCmp("userIds");
+        userNamesElement = Ext.getCmp("userNames") || top.Ext.getCmp("userNames");
+    }else if(action == 'leader'){
+        userIdsElement = Ext.getCmp(action + "Ids") || top.Ext.getCmp(action + "Ids");
+        userNamesElement = Ext.getCmp(action + "Names") || top.Ext.getCmp(action + "Names");
     }else {
-        var loop = setInterval(function() {
-              if(selectLeadersArray.closed) {
-                clearInterval(loop);
-
-                var returnValue = selectLeadersArray.returnValue || [];
-
-                if(action == 'principal'){//负责人
-                    var userNames = null;
-                    if(returnValue.length > 0){
-                        for(var i = 0 ; i < returnValue.length ; i++){
-                            var index = returnValue[i].indexOf("#*");
-                            if(index == -1){
-                                if(userNames == null){
-                                    userNames = returnValue[i];
-                                }else{
-                                    userNames += ';'+returnValue[i];
-                                }
-                            }else{
-                                if(userNames == null){
-                                    userNames = returnValue[i].split('#*')[1];
-                                }else{
-                                    userNames += ';'+returnValue[i].split('#*')[1];
-                                }
-                            }
-                            
-                        }
-                        Ext.getCmp("principal").setValue(userNames);
-                    }
-                }else {
-                    var userIds = null;
-                    var userNames = null;
-                    if(returnValue.length > 0){
-                        for(var i = 0 ; i < returnValue.length ; i++){
-                            if(userIds == null){
-                                userIds = returnValue[i].split('#*')[0];
-                            }else{
-                                userIds += ';'+returnValue[i].split('#*')[0];
-                            }
-                            
-                            if(userNames == null){
-                                userNames = returnValue[i].split('#*')[1];
-                            }else{
-                                userNames += ';'+returnValue[i].split('#*')[1];
-                            }
-                        }
-                        Ext.getCmp(action + "Ids").setValue(userIds) ;
-                        Ext.getCmp(action + "Names").setValue(userNames) ;
-                    }
-                }
-              }
-        },500);
+        userIdsElement = Ext.getCmp("userIds") || top.Ext.getCmp("userIds");
+        userNamesElement = Ext.getCmp("principal") || top.Ext.getCmp("principal");
     }
+    var params = {
+        userIdsElement:userIdsElement,
+        userNamesElement:userNamesElement,
+        action:action
+    }
+    openSelectUser(params);
 }
 Ext.onReady(function(){
     Ext.QuickTips.init();
@@ -143,17 +45,17 @@
            name: 'parentId'
         },{
             xtype:'hidden',
-            // fieldLabel: 'userIds',
-            // xtype: 'textfield',
             id:'userIds',
             name: 'userIds'
          },{
         	 xtype:'hidden',
-             // fieldLabel: 'leaderIds',
-            // xtype: 'textfield',
         	 id:'leaderIds',
         	 name:'leaderIds'
          },{
+            xtype:'hidden',
+            id:'leaderIds',
+            name:'leaderIds'
+        },{
         	 xtype:'hidden',
         	 id:'type',
         	 name:'type',
@@ -176,7 +78,7 @@
 			name: 'principal',
             id: 'principal',
             readOnly:true,
-			onTriggerClick : function(){selectePerson("principal")},
+			onTriggerClick : function(){changeUser("principal")},
 			triggerClass : 'x-form-search-trigger'
         },{
             fieldLabel: '分管领导',
@@ -185,7 +87,7 @@
 			name: 'leaderNames',
             id: 'leaderNames',
             readOnly:true,
-			onTriggerClick : function(){selectePerson("leader")},
+			onTriggerClick : function(){changeUser("leader")},
 			triggerClass : 'x-form-search-trigger'
         },{
             fieldLabel: '包含用户',
@@ -194,7 +96,7 @@
             readOnly:true,
 			name: 'userNames',
             id: 'userNames',
-			onTriggerClick : function(){openSelectUser()},
+			onTriggerClick : function(){changeUser('includeUsers')},
 			triggerClass : 'x-form-search-trigger'
         },{
             layout:'column',//两列