Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp
===================================================================
diff -u -r12331 -r27269
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp	(.../selectTousseDiscardCause.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseDiscardCause.jsp	(.../selectTousseDiscardCause.jsp)	(revision 27269)
@@ -33,19 +33,21 @@
 			var val = $(chs[0]).val();
 			if(val == "other"){
 				var tem = $('#tem');
-				if($.trim(tem.text()).length==0){
+				if($.trim(tem.val()).length==0){
 					alert("请选择废弃原因");
 				}else{
-					returnVal = tem.text();
+					returnVal = tem.val();
 				}
 			}else{
 				returnVal = val;
 			}
 		}else{
 			alert("请选择终止原因");
 		}
-		self.returnValue = returnVal;
-        self.close();
+
+		var win = parent.Ext.getCmp('extWindow');
+		win.returnValue = returnVal;
+		win.close();
 	});
 });
 </script>
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r26415 -r27269
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 26415)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 27269)
@@ -15,7 +15,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 deleteTousseGood(grid) {
@@ -34,16 +40,31 @@
         }
     }
     var remark = showSelectTousseDiscardCauseWin();
-    if(remark != undefined && remark != ""){
-    	 Ext.Ajax.request({
-    	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
-    	        params : {ids : ids,reason:remark},
-    	        success : function(response, options) {
-    	            showResult("废弃成功!");
-    	            grid.dwrReload();
-    	        },
-    	        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 '';
+                }
+
+                Ext.Ajax.request({
+                    url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
+                    params : {ids : ids,reason:returnValue},
+                    success : function(response, options) {
+                        showResult("废弃成功!");
+                        grid.dwrReload();
+                    },
+                    failure : function(response, options) {}
+                });
+              }
+        },500);
     }
 }
 
@@ -57,26 +78,45 @@
     	var warningType = Ext.getCmp('warningType').getValue();
     	var tousseType = Ext.getCmp('tousseType').getValue();
 	    var remark = showSelectTousseDiscardCauseWin();
-	    Ext.getBody().mask("正在处理,请稍候...");
-	    Ext.Ajax.request({
-	    	timeout:3 * 60 * 60 * 1000,//3小时
-	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteAllTousseGoods.do',
-	        params : {reason:remark,warningType : warningType , tousseType : tousseType,department:department},
-	        success : function(response, options) {
-	        	Ext.getBody().unmask();
-	        	var result = Ext.decode(response.responseText);
-				if(result.success){
-		            showResult("废弃完成,废弃的器械包总数量为" + result.amount);
-		            grid.dwrReload();
-				}else{
-					showResult("废弃失败,原因为:" + result.message);
-				}
-	        },
-	        failure : function(response, options) {
-	        	Ext.getBody().unmask();
-	        	showResult("废弃失败,请稍后再试...");
-	        }
-	    });
+
+        if(remark == undefined){
+            return '';
+        }else {
+            Ext.getBody().mask("正在处理,请稍候...");
+
+            var loop = setInterval(function() {
+                  if(remark.hidden) {
+                    clearInterval(loop);
+                    
+                    var returnValue = remark.returnValue || '';
+
+                    if(returnValue == ''){
+                        Ext.getBody().unmask();
+                        return '';
+                    }
+
+                    Ext.Ajax.request({
+                        timeout:3 * 60 * 60 * 1000,//3小时
+                        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteAllTousseGoods.do',
+                        params : {reason:remark,warningType : warningType , tousseType : tousseType,department:department},
+                        success : function(response, options) {
+                            Ext.getBody().unmask();
+                            var result = Ext.decode(response.responseText);
+                            if(result.success){
+                                showResult("废弃完成,废弃的器械包总数量为" + result.amount);
+                                grid.dwrReload();
+                            }else{
+                                showResult("废弃失败,原因为:" + result.message);
+                            }
+                        },
+                        failure : function(response, options) {
+                            Ext.getBody().unmask();
+                            showResult("废弃失败,请稍后再试...");
+                        }
+                    });
+                  }
+            },500);
+        }
     }
 }