Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25608 -r25617
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25608)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25617)
@@ -1074,6 +1074,16 @@
 		}
 	}
 }
+function resetRadioInfo(subType){
+	if(subType == "select"){
+		$("#reasonLong").val("");
+		$("#reasonLong").hide();
+		
+	}
+	if(subType == "text"){
+		$("#reasonLong").show();
+	}
+}
 /**
  * 根据扫描的条码加载对应的对象.
  * @param barcodeTemp
@@ -1093,28 +1103,76 @@
             		if(msg.unfinishedPackingTask!=null){
             			showUnfinishedPackingTask(msg);
             		}else{
-                        $("#dialogConfirm").dialog({
-                            resizable: false,
-                            height:310,
-                            width:600,
-                            modal: true,
-                            open: function() {
-                                $("#confirmMsg").text(msg.errorMessage);
-                            },
-                            close: function() {
-                                $("#confirmMsg").text("");
-                            },
-                            buttons: {
-                                "是": function() {
-                                    // addBasketElement(msg.basket);
-                                    location.href = 'abandonDispose.jsp';
-                                    $( this ).dialog( "close" );
-                                },
-                                "否": function() {
-                                    $( this ).dialog( "close" );
-                                }
-                            }
-                        });
+										var ids = msg.tousseInstance.id;
+										$("#dialogConfirm").dialog({
+												resizable: false,
+												height:310,
+												width:600,
+												modal: true,
+												open: function() {
+														$("#confirmMsg").text(msg.errorMessage);
+												},
+												close: function() {
+														$("#confirmMsg").text("");
+												},
+												buttons: {
+														"是": function() {
+																$( this ).dialog( "close" );
+																var cfContain = '<div class="cfContain">';
+																cfContain += '<ul>';
+																cfContain += '<li>' + '<input type="radio" name="reason" value="测试" onclick="resetRadioInfo(\'select\')">测试' + '</li>';
+																cfContain += '<li>' + '<input type="radio" name="reason" value="重复" onclick="resetRadioInfo(\'select\')">重复' + '</li>';
+																cfContain += '<li>' + '<input type="radio" name="reason" value="过期" onclick="resetRadioInfo(\'select\')">过期' + '</li>';
+																cfContain += '<li>' + '<input type="radio" name="reason" value="多余废弃" onclick="resetRadioInfo(\'select\')">多余废弃' + '</li>';
+																cfContain += '<li>' + '<input type="radio" name="reason" value="其他" onclick="resetRadioInfo(\'text\')">其他' + '</li>';
+																cfContain += '</ul>';
+																cfContain += '<div class="textCloud">' + '<textarea id="reasonLong"></textarea>' + '</div>';
+																cfContain += '</div>';
+																$("#dialogConfirm").dialog({
+																		resizable: false,
+																		height:450,
+																		width:900,
+																		modal: true,
+																		title: "废弃原因",
+																		open: function() {
+																				$("#confirmMsg").html(cfContain);
+																		},
+																		close: function() {
+																				$("#confirmMsg").text("");
+																		},
+																		buttons: {
+																				"确定": function() {
+																					var leaveReason = $("input[name='reason']:checked").val();
+																					
+																					if(leaveReason == "其他"){
+																						var otherReason = $("#reasonLong").val();
+																						leaveReason = otherReason;
+																					}
+																					
+																					$.ajax({
+																						url : WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteTousseGood.do',
+																						type : "post",
+																						data : {ids : ids,reason:leaveReason},
+																						async : false,
+																						success : function(res){
+																							loadBarcodeDevice(barcodeTemp);
+																						}
+																					})
+																					$( this ).dialog( "close" );
+																						
+																				},
+																				"取消": function() {
+																					$( this ).dialog( "close" );
+																				}
+																		}
+																});
+																
+														},
+														"否": function() {
+																$( this ).dialog( "close" );
+														}
+												}
+										});
             		}
             	}else if(msg.orgUnit!= null){
             		//只更新科室名称及编码信息(since2015-12-16 SYF),添加新单时才更新部门
@@ -2762,7 +2820,7 @@
   	      width:dialogWidth ? dialogWidth : 600, 
   	      modal: true,
   	      open: function() {
-  	          $("#confirmMsg").html(text);
+  	          $("#confirmMsg").html("你你你"+text);
   	      },
   	      close: function() {
   	          $("#confirmMsg").html("");