Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r26977 -r27253
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 26977)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 27253)
@@ -545,10 +545,17 @@
                 showResult("请选中需终止的物品");
                 return;
             }
+
+            var params = {
+            	time:new Date()
+            }
             
-            var endCase = openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp?time="+new Date(), "选择终止原因", "760", "400");
-            if(endCase != null &&endCase != undefined && endCase.length > 0){
-            	var tousseItemIdsStr = JSON.stringify(tousseItemIds);
+            var endCase = openModalWindow(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp", params, "760", "400");
+            
+            if(endCase == undefined){
+		    	return;
+		    }else if(endCase[0] != null&&endCase[0]!=undefined){
+		    	var tousseItemIdsStr = JSON.stringify(tousseItemIds);
                 Ext.Ajax.request({
                     url :  WWWROOT + '/disinfectSystem/invoicePlanAction!terminateTousseItems.do',
                     params : {tousseItemIds : tousseItemIdsStr,endCase : endCase},
@@ -564,7 +571,36 @@
                         showResult('终止失败!');
                     }
                 });
-            }
+		    }else {
+		    	var loop = setInterval(function() {
+		              if(endCase.closed) {
+		                clearInterval(loop);
+		                
+				    	var returnValue = endCase.returnValue || '';
+
+				    	if(returnValue == ''){
+				    		return;
+				    	}
+
+				    	var tousseItemIdsStr = JSON.stringify(tousseItemIds);
+		                Ext.Ajax.request({
+		                    url :  WWWROOT + '/disinfectSystem/invoicePlanAction!terminateTousseItems.do',
+		                    params : {tousseItemIds : tousseItemIdsStr,endCase : returnValue},
+		                    success : function(response, options) {
+		                        var result = JSON.parse(response.responseText);
+		                        showResult(result.message);
+		                        if(result.success){
+		                            applicationWindow.close();
+		                            grid.getStore().reload();
+		                        }
+		                    },
+		                    failure : function(response, options) {
+		                        showResult('终止失败!');
+		                    }
+		                });
+		              }
+		        });
+		    }
         }
     }];
 	
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectEndCause.jsp
===================================================================
diff -u -r26452 -r27253
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectEndCause.jsp	(.../selectEndCause.jsp)	(revision 26452)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectEndCause.jsp	(.../selectEndCause.jsp)	(revision 27253)
@@ -49,11 +49,11 @@
 			var val = $(chs[0]).val();
 			if(val == "other"){
 				var tem = $('#tem');
-				if($.trim(tem.text()).length==0){
+				if($.trim(tem.val()).length==0){
 					alert("请选择" + optionTip);
 					return false;
 				}else{
-					returnVal = tem.text();
+					returnVal = tem.val();
 				}
 			}else{
 				returnVal = val;
@@ -66,14 +66,14 @@
         self.close();
 	});
 	$("#tem").on("keyup",function(){
-		if($("#tem").text().length >= 2000){
+		if($("#tem").val().length >= 2000){
 			alert("备注内容长度不能大于2000!");
 		}
 	})
 	$("#clearRemark").on('click',function(){
 		var returnVal = "";
 		$(":radio").prop('checked',false);
-		if($("#tem").text() != ""){
+		if($("#tem").val() != ""){
 			$("#tem").text("");
 		}
 		self.returnValue = "";