Index: ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
===================================================================
diff -u -r16779 -r27301
--- ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 16779)
+++ ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 27301)
@@ -187,7 +187,7 @@
 	 * 显示器械包废弃原因
 	 */
 	function showSelectTousseDiscardCauseWin(){
-		return openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp?time="+new Date(), "选择回收员", "760", "400");
+		return openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp",'', "选择废弃原因", "760", "400");
 	}
 	function addTousseDiscardTbar(grid){
 		var tbar = {
@@ -209,19 +209,34 @@
 						return;
 					}
 					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) {
-					    	            showResult("废弃成功!");
-					    	            grid.getStore().reload();
-					    	        },
-					    	        failure : function(response, options) {}
-					    	    });
-					    }
+						var remark = showSelectTousseDiscardCauseWin();
+
+						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) {
+						    	            showResult("废弃成功!");
+						    	            grid.getStore().reload();
+						    	        },
+						    	        failure : function(response, options) {}
+						    	    });
+				                  }
+				            },500);
+				        }
 					}
 				}
 			}