Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
===================================================================
diff -u -r27252 -r27259
--- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 27252)
+++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 27259)
@@ -52,7 +52,6 @@
 	        return false;
 	    }
     }
-
     var params = {
         time:new Date()
     }
@@ -61,7 +60,7 @@
     
     if(endCase == undefined){
         return;
-    }else if(endCase[0] != null&&endCase[0]!=undefined){
+    }else if(typeof endCase == 'string'){
          Ext.Ajax.request({
             url: WWWROOT + url,
             params: { recyclingAppId : id ,endCause:endCase},
Index: ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js
===================================================================
diff -u -r27248 -r27259
--- ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js	(.../printInvoiceConfigForm.js)	(revision 27248)
+++ ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js	(.../printInvoiceConfigForm.js)	(revision 27259)
@@ -19,7 +19,7 @@
 	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
 	//org_3306;org_3219,口腔科;妇科
 	var codes ='';
-
+	
     if(selectedOrgUnitArray == undefined){
     	return;
     }else if(selectedOrgUnitArray[0] != null&&selectedOrgUnitArray[0]!=undefined){
@@ -32,8 +32,8 @@
     	for(var j=0;j<codes.length-1;j++){
     		tem += codes.charAt(j);
     	}
-    	top.Ext4.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
-    	top.Ext4.getCmp("departCodes").setValue(tem);
+    	Ext4.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
+    	Ext4.getCmp("departCodes").setValue(tem);
     }else {
     	var loop = setInterval(function() {
               if(selectedOrgUnitArray.closed) {
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r27252 -r27259
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 27252)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 27259)
@@ -314,13 +314,12 @@
 {
     width = parseInt(width,10);
     height = parseInt(height,10);
-    var style="dialogHeight: "+height+"px; dialogWidth: "+width+"px;  center: Yes; help: No; resizable: No; status: No;"; 
+    
     var showModalDialog = window.showModalDialog || '';
 
     if(showModalDialog == ''){
-        window.hasOpenWindow = true;
-        style = style.replace(/(dialog)|(px)/ig,"").replace(/;/g,',').replace(/\:/g,"=");
-
+        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 = '';
 
@@ -337,6 +336,7 @@
             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;
     }
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r27253 -r27259
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 27253)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 27259)
@@ -554,7 +554,7 @@
             
             if(endCase == undefined){
 		    	return;
-		    }else if(endCase[0] != null&&endCase[0]!=undefined){
+		    }else if(typeof endCase == 'string'){
 		    	var tousseItemIdsStr = JSON.stringify(tousseItemIds);
                 Ext.Ajax.request({
                     url :  WWWROOT + '/disinfectSystem/invoicePlanAction!terminateTousseItems.do',
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r27252 -r27259
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 27252)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 27259)
@@ -3587,7 +3587,7 @@
 	
   if(endCase == undefined){
       return;
-  }else if(endCase[0] != null&&endCase[0]!=undefined){
+  }else if(typeof endCase == 'string'){
        var paramStr = JSON.stringify(canTerminateTousseItemIds);
         $.ajax({
                type:'get',
@@ -3606,6 +3606,7 @@
         });
   }else {
       var loop = setInterval(function() {
+        console.log(endCase)
             if(endCase.closed) {
               clearInterval(loop);
               var returnValue = endCase.returnValue || '';