Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r27094 -r27275
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 27094)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 27275)
@@ -208,7 +208,13 @@
  * 显示申请单终止原因
  */
 function showSelectTousseDiscardCauseWin(){
-	return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400");
+	var params = {
+        time:new Date().getTime()
+    }
+
+    var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp",params, "选择回收员", "760", "400");
+
+    return endCase;
 }
 
 function compareDate(DateOne,DateTwo) {
@@ -1230,29 +1236,44 @@
 					});
 					if(selections.length>0){
 						 var remark = showSelectTousseDiscardCauseWin();
-						 if(remark != undefined && remark != ""){
-							 var ids = selections.join(';');
-					    	 Ext.Ajax.request({
-					    	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
-					    	        params : {ids : ids,reason:remark},
-					    	        success : function(response, options) {
-					    	        	var result = Ext.decode(response.responseText);
-					    	        	if(result.message){
-				    	        			showResult(result.message);
-				    	        		}
-					    	        	if(result.success){
-					    	        		if(!result.message){
-					    	        			showResult("废弃成功!");
-					    	        		}
-					    	        		grid.dwrReload();
-					    	        	}else{
-					    	        		if(!result.message){
-					    	        			showResult("废弃失败!");
-					    	        		}
-					    	        	}
-					    	        },
-					    	        failure : function(response, options) {}
-					    	    });
+
+						if(remark == undefined){
+					        return '';
+					    }else {
+					        var loop = setInterval(function() {
+					              if(remark.hidden) {
+					                clearInterval(loop);
+					                
+					                var returnValue = remark.returnValue || '';
+
+					                if(returnValue == ''){
+					                    return '';
+					                }
+
+					                 var ids = selections.join(';');
+							    	 Ext.Ajax.request({
+							    	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
+							    	        params : {ids : ids,reason:returnValue},
+							    	        success : function(response, options) {
+							    	        	var result = Ext.decode(response.responseText);
+							    	        	if(result.message){
+						    	        			showResult(result.message);
+						    	        		}
+							    	        	if(result.success){
+							    	        		if(!result.message){
+							    	        			showResult("废弃成功!");
+							    	        		}
+							    	        		grid.dwrReload();
+							    	        	}else{
+							    	        		if(!result.message){
+							    	        			showResult("废弃失败!");
+							    	        		}
+							    	        	}
+							    	        },
+							    	        failure : function(response, options) {}
+							    	    });
+					              }
+					        },500);
 					    }
 					}
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r26370 -r27275
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 26370)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 27275)
@@ -45,35 +45,54 @@
 	rePrintBarcodeWin(cfg);
 }
 function showSelectTousseDiscardCauseWin(){
-	return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400");
+	var params = {
+        time:new Date().getTime()
+    }
+
+    var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp",params, "选择回收员", "760", "400");
+
+    return endCase;
 }
 // 废弃选中的器械包
 function discardTousseInstances(tousseInstancesIds){
 	var remark = showSelectTousseDiscardCauseWin();
-	if(remark != undefined && remark != ""){
-		top.Ext.MessageBox.wait('正在废弃，请稍候……', '请等待');
-		Ext.Ajax.request({
-	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
-	        params : {ids : tousseInstancesIds,reason:remark},
-	        success : function(response, options) {
-	        	hideMessageBox(true);
-	        	var retObj = JSON.parse(response.responseText);
-	        	if(isUndefinedOrNullOrEmpty(retObj.msg)){
-	        		showResult("废弃成功!" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	        	}else{
-	        		showResult(retObj.msg , null , sstsConfig.messagePauseTimeOnPackingPage);
-	        	}
-	        	reloadTousseInstances();
-	        },
-	        failure : function(response, options) {
-	        	hideMessageBox(true);
-	        	showResult("废弃失败!" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	        	reloadTousseInstances();
-	        }
-	    });
-	}else{
-		showResult("必须填写废弃原因！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-	}
+
+	if(remark == undefined){
+        return '';
+    }else {
+        var loop = setInterval(function() {
+              if(remark.hidden) {
+                clearInterval(loop);
+                
+                var returnValue = remark.returnValue || '';
+
+                if(returnValue == ''){
+                    return '';
+                }
+
+                top.Ext.MessageBox.wait('正在废弃，请稍候……', '请等待');
+				Ext.Ajax.request({
+			        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
+			        params : {ids : tousseInstancesIds,reason:returnValue},
+			        success : function(response, options) {
+			        	hideMessageBox(true);
+			        	var retObj = JSON.parse(response.responseText);
+			        	if(isUndefinedOrNullOrEmpty(retObj.msg)){
+			        		showResult("废弃成功!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+			        	}else{
+			        		showResult(retObj.msg , null , sstsConfig.messagePauseTimeOnPackingPage);
+			        	}
+			        	reloadTousseInstances();
+			        },
+			        failure : function(response, options) {
+			        	hideMessageBox(true);
+			        	showResult("废弃失败!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+			        	reloadTousseInstances();
+			        }
+			    });
+              }
+        },500);
+    }
 }
 function reloadTousseInstances(){
 	rePrintWin_tousseStore.removeAll();