Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r16114 -r16149
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16114)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16149)
@@ -780,35 +780,67 @@
 			id : 'returnBtn',
 			disabled : disableReturnStatus,
 			handler : function(){
-				top.Ext4.MessageBox.confirm("请确认","确认归还" + entityName + "信息？",function(btn) {
-					if(btn=='yes') {
-						if(!foreignTousseForm.getForm().isValid()){
-							showResult('请正确填写表单各值');
-							return false;
+				var tmpWindow = new top.Ext4.window.Window({
+					title : '请确认',
+					modal : true,
+					border : true,
+					html : '<br>&nbsp&nbsp确认归还' + entityName + '信息？&nbsp&nbsp<br><br>',
+					buttonAlign : 'center',
+					buttons:[{
+						text:'是',
+						handler : function() {
+							tmpWindow.close();
+							if(!foreignTousseForm.getForm().isValid()){
+								showResult('请正确填写表单各值');
+								return false;
+							}
+							var success = getForeignTousseInfo();
+							if(success){
+								submintForeignTousseForm(actionType_confirmReturn);
+							}
 						}
-						var success = getForeignTousseInfo();
-						if(success){
-							submintForeignTousseForm(actionType_confirmReturn);
+					},{
+						text:'否',
+						handler : function() {
+							tmpWindow.close();
 						}
-					}
+					}]
 				});
+				tmpWindow.show();
 			}
 		},{
 			text : '提前归还',
 			disabled:disableReturnStatus2,
 			handler : function(){
-				top.Ext4.MessageBox.confirm("请确认","提前归还会终止申请单,并删除装配任务,是否要提交归还?",function(btn) {
-					if(btn=='yes') {
-						if(!foreignTousseForm.getForm().isValid()){
-							showResult('请正确填写表单各值');
-							return false;
+				//由于Ext4.MessageBox.confirm兼容性问题，在全部申请单列表中点【是】按钮事件无反应，故而改用window显示
+				var tmpWindow = new top.Ext4.window.Window({
+					title : '请确认',
+					modal : true,
+					border : true,
+					html : '<br>&nbsp&nbsp提前归还会终止申请单,并删除装配任务,是否要提交归还?&nbsp&nbsp<br><br>',
+					buttonAlign : 'center',
+					buttons:[{
+						text:'是',
+						handler : function() {
+							tmpWindow.close();
+							if(!foreignTousseForm.getForm().isValid()){
+								showResult('请正确填写表单各值');
+								return false;
+							}
+							var success = getForeignTousseInfo();
+							if(success){
+								submintForeignTousseForm(actionType_confirmReturn);
+							}
 						}
-						var success = getForeignTousseInfo();
-						if(success){
-							submintForeignTousseForm(actionType_confirmReturn);
+					},{
+						text:'否',
+						handler : function() {
+							tmpWindow.close();
 						}
-					}
+					}]
 				});
+				
+				tmpWindow.show();
 			}
 		},{
 			text : '取消',
@@ -876,19 +908,6 @@
                     this.selectText();  
                 }  
             }  
-        
-            /*xtype: 'combo',
-            minChars : 0,
-            queryParam : 'spell',
-			valueField : 'name',
-			displayField : 'name',
-			store : foreignMaterialJsonStore,
-			forceSelection : true,
-			lazyInit : true,
-			triggerAction : 'all',
-			hideTrigger : true,
-			typeAhead : true,
-			allowBlank : false*/
         }
     },{
     	header: '是否植入物',