Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js
===================================================================
diff -u -r27277 -r27312
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js	(.../departmentgroupForm.js)	(revision 27277)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js	(.../departmentgroupForm.js)	(revision 27312)
@@ -15,17 +15,18 @@
 		departNames :departNames,
 		departCodes : codes
 	};
+
 	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
 	//org_3306;org_3219,口腔科;妇科
 	var codes ='';
-
+	
 	if(selectedOrgUnitArray == undefined){
     	return;
     }else {
     	var loop = setInterval(function() {
               if(selectedOrgUnitArray.closed) {
                 clearInterval(loop);
-
+                
                	codes = '';
 		    	var tem ='';
 		    	var returnValue = selectedOrgUnitArray.returnValue || [];
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r27266 -r27312
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 27266)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 27312)
@@ -313,32 +313,24 @@
 function openModalWindow(pageUrl,varArgIn,width,height)
 {
     width = parseInt(width,10);
-    height = parseInt(height,10);
+    height = parseInt(height,10);//window.showModalDialog
 
-    var showModalDialog = window.showModalDialog || '';
-
-    if(showModalDialog == ''){
-        var style="height="+height+",width="+width+",status=no,toolbar=no,menubar=no,location=no,resizable=no,scrollbars=0,titlebar=no"; 
+    var style="height="+height+",width="+width+",status=no,toolbar=no,menubar=no,location=no,resizable=no,scrollbars=0,titlebar=no"; 
         
-        if(typeof varArgIn == 'object'){
-            var html = '';
+    if(typeof varArgIn == 'object'){
+        var html = '';
 
-            for(var k in varArgIn){
-                html += k+'='+varArgIn[k]+'&';
-            }
+        for(var k in varArgIn){
+            html += k+'='+varArgIn[k]+'&';
+        }
 
-            html = html.slice(0,html.length-1);
+        html = html.slice(0,html.length-1);
 
-            var recyclingWindow = window.open(pageUrl+'?'+html,"_blank",style);
-            return recyclingWindow;
-        }else {
-            var recyclingWindow = window.open(pageUrl,"_blank",style);
-            return recyclingWindow;
-        }
+        var recyclingWindow = window.open(pageUrl+'?'+html,"_blank",style);
+        return recyclingWindow;
     }else {
-        var style="dialogHeight: "+height+"px; dialogWidth: "+width+"px;  center: Yes; help: No; resizable: No; status: No;"; 
-        var retval = window.showModalDialog(pageUrl,varArgIn,style);
-        return retval;
+        var recyclingWindow = window.open(pageUrl,"_blank",style);
+        return recyclingWindow;
     }
 }
 
@@ -1598,19 +1590,6 @@
     }
 }
 
-function openSelectTime(ctx,elementId,width,height){
-	if(width==null){
-		width = 230;
-	}
-	if(height==null){
-		height = 120;
-	}
-	var selectedTime = openModalWindow(ctx+"/common/selTime.jsp?noSecond=true","选择时间",width,height);
-	if(selectedTime!=null){
-		$Id(elementId).value = selectedTime;
-		}
-}
-
 String.prototype.startWith=function(str){
 	if(str==null||str==""||this.length==0||str.length>this.length){
 		return false;
@@ -1859,19 +1838,6 @@
 	}
 }
 
-function openSelectWorkTime(ctx,elementId,width,height){
-	if(width==null){
-		width = 230;
-	}
-	if(height==null){
-		height = 120;
-	}
-	var selectedTime = openModalWindow(ctx+"/common/selWorkTime.jsp?noSecond=true","选择时间",width,height);
-	if(selectedTime!=null){
-		$Id(elementId).value = selectedTime;
-		}
-}
-
 function autoSaveFormSerialNumber(fileName,formName)
 {
 	formSerialNumber=fileName.value.Trim();
@@ -2528,25 +2494,6 @@
 
     if(selectedUsersArray == undefined){
         return;
-    }else if(selectedUsersArray[0] != null&&selectedUsersArray[0]!=undefined){
-        if (selectedUsersArray.length > 0){
-            for(var i = 0;i<selectedUsersArray.length;i++){
-                var userStr = selectedUsersArray[i];
-                if(userIds == ''){
-                    userIds = userStr.split('#*')[0];
-                }else{
-                    userIds += ';'+userStr.split('#*')[0];
-                }
-
-                if(userNames == ''){
-                    userNames = userStr.split('#*')[1];
-                }else{
-                    userNames += ';'+userStr.split('#*')[1];
-                }
-            }
-        }
-        userIdsElement.setValue(userIds) ;
-        userNamesElement.setValue(userNames) ;
     }else {
         var loop = setInterval(function() {
               if(selectedUsersArray.closed) {
@@ -2573,7 +2520,7 @@
                     userNamesElement.setValue(userNames) ;
                 }
               }
-        });
+        },500);
     }
 }
 function dumpObj(obj){
Index: ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js
===================================================================
diff -u -r27285 -r27312
--- ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js	(.../messageForm.js)	(revision 27285)
+++ ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js	(.../messageForm.js)	(revision 27312)
@@ -35,15 +35,18 @@
 
 		    	codes = '';
 		    	var tem ='';
-		    	var tempArray = returnValue[0].split(';');
-		    	for(var i=0;i<tempArray.length;i++){
-		    		codes += tempArray[i]+";";
-			    }
-		    	for(var j=0;j<codes.length-1;j++){
-		    		tem += codes.charAt(j);
+		    	
+		    	if(returnValue.length > 0){
+		    		var tempArray = returnValue[0].split(';');
+			    	for(var i=0;i<tempArray.length;i++){
+			    		codes += tempArray[i]+";";
+				    }
+			    	for(var j=0;j<codes.length-1;j++){
+			    		tem += codes.charAt(j);
+			    	}
+			    	top.Ext.getCmp("departName").setValue(returnValue[1]);
+			    	top.Ext.getCmp("departCodes").setValue(tem);
 		    	}
-		    	top.Ext.getCmp("departName").setValue(returnValue[1]);
-		    	top.Ext.getCmp("departCodes").setValue(tem);
               }
         },500);
     }
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
===================================================================
diff -u -r26534 -r27312
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js	(.../inventoryMaterialForm.js)	(revision 26534)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js	(.../inventoryMaterialForm.js)	(revision 27312)
@@ -335,7 +335,7 @@
     	materialIdStr.push(materialStr.trim());  
     });
     var url = WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.mhtml?type=materialInventoryRecord';
-    //若导入成功则返回excel的导入数据
+    //若导入成功则返回excel的导入数据(找不到这个功能)
 	var importItemsJsonStr = openModalWindow(url,materialIdStr,'760','400');
 	if(importItemsJsonStr){
 		//获得excel数据json对象
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
===================================================================
diff -u -r26887 -r27312
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 26887)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 27312)
@@ -720,7 +720,7 @@
 	    }); 
 //	    console.log(batchNumberList);
 	    var url = WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importInventoryRecord.mhtml?type=disposableInventoryRecord';
-	    //若导入成功则返回execel的导入数据
+	    //若导入成功则返回execel的导入数据  (找不到这个功能)
 		var importItemsJsonStr = openModalWindow(url,batchNumberList,'760','400');
 		if(importItemsJsonStr){
 			//获得execel数据json对象
Index: ssts-web/src/main/webapp/disinfectsystem/recycle/tousseTransition/tousseTransitionView.js
===================================================================
diff -u -r17603 -r27312
--- ssts-web/src/main/webapp/disinfectsystem/recycle/tousseTransition/tousseTransitionView.js	(.../tousseTransitionView.js)	(revision 17603)
+++ ssts-web/src/main/webapp/disinfectsystem/recycle/tousseTransition/tousseTransitionView.js	(.../tousseTransitionView.js)	(revision 27312)
@@ -23,11 +23,6 @@
 	loadFormData(grid);
 }
 
-function openWashDataLineChart(id){
-	openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600');
-}
-
-
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/registrationCertificateForm.js
===================================================================
diff -u -r27270 -r27312
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/registrationCertificateForm.js	(.../registrationCertificateForm.js)	(revision 27270)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/registrationCertificateForm.js	(.../registrationCertificateForm.js)	(revision 27312)
@@ -82,7 +82,7 @@
 						time:new Date().getTime()
 					}
 
-					openModalWindowForExt(WWWROOT+'/disinfectsystem/basedatamanager/supplier/pictureDetail.jsp',params, 1200, 800);
+					openModalWindowForExt(WWWROOT+'/disinfectsystem/basedatamanager/supplier/pictureDetail.jsp',params,'查看图片', 1200, 800);
 				}
 		    }
 		},
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
===================================================================
diff -u -r24986 -r27312
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 24986)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 27312)
@@ -12,7 +12,7 @@
 	/**
 	 * 显示和选择打印发货单的配置
 	 */
-	function showSelectUser(){
+	function showSelectUser(){//没看到这个方法有被调用过
 		return openModalWindow(WWWROOT+"/disinfectsystem/invoice/selectInvoiceConfig.jsp?","选择打印分组", "760", "400");
 	}
 	var mask = null;