Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r16754 -r16777
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 16754)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 16777)
@@ -178,6 +178,35 @@
     }
 }
 
+function deleteConfirm(confirmMsg,actionFunction,row,deleteButton,basketBarcode,basketId){
+	$("#dialogConfirm").dialog({
+	      resizable: false,
+	      height:310, 
+	      width:600, 
+	      modal: true,
+	      open: function() {
+	          $("#confirmMsg").text(confirmMsg);
+	      },
+	      close: function() {
+	          $("#confirmMsg").text("");
+	      },
+	      buttons: {
+	        "是": function() {
+	        	if(actionFunction == 'deleteTousse'){//删器械包
+	        		deleteTousseItem(row);
+	        	}else if(actionFunction == 'deleteBasketItem'){//删篮筐内物品
+	        		deleteBasketItem(deleteButton);
+	        	}else if(actionFunction == 'deleteBasket'){//删篮筐
+	        		deleteBasket(deleteButton,basketBarcode,basketId);
+	        	}
+	        	$(this).dialog("close");
+	        },"否": function() {
+	          $(this).dialog("close");
+	        }
+	      }
+  });
+}
+
 function deleteTousseItem(row){
 	
 	var returnMsg = "";
@@ -579,7 +608,7 @@
 			element += '<dd class="name">' + showName + '</dd>';
 			element += '<dd class="barcode"><span>&nbsp' + showBarcode + '</span></dd>';
 			element += '<dd class="num">' + amount + '</dd>';
-			element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);">删除</a></dd>';
+			element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除【'+showName+'】？\',\'deleteBasketItem\',\'\',this,\'\',\'\');">删除</a></dd>';
 		
 		var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount);
 		basketElement.prepend($(element));
@@ -661,7 +690,7 @@
 	var basketElement = '<li>';
   	basketElement += '<input type="hidden">';
   	basketElement += '<i>';
-  	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this,\''+basketBarcode+'\',\''+classifyBasketId+'\');">删除</a>';
+  	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要删除篮筐【'+basketName+'】？\',\'deleteBasket\',\'\',this,\''+basketBarcode+'\',\''+classifyBasketId+'\');">删除</a>';
   	basketElement += '</i>';
   	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
   	
@@ -1562,7 +1591,7 @@
                    '<td><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putTousseInTheBasket('+row+');">入筐</a></td>'+
                    '<td><a href="javascript:void(0);" id="recyclingErrorButton'+row+'" class="btn-b" onclick="openRecyclingErrorPage('+row+');">丢失</a></td>'+
                    '<td><a href="javascript:void(0);" id="recyclingDamageButton'+row+'" class="btn-c" onclick="openRecyclingDamagePage('+row+',\''+encodeAll(tousseName)+'\',\''+tousseItemId+'\');">报废</a></td>'+
-                   '<td><a href="javascript:void(0);" class="btn-d" onclick="deleteTousseItem('+row+');">删除</a></td></tr>');
+                   '<td><a href="javascript:void(0);" class="btn-d" onclick="deleteConfirm(\'是否要删除器械包【' + tousseName + '】？\',\'deleteTousse\','+row+',\'\',\'\',\'\');">删除</a></td></tr>');
          trElement.prependTo("#tousseItemTable");//在表格第一行追加行
     }
     return b;
@@ -2537,7 +2566,7 @@
                             	element += '<dd class="name"><span>'+materialName+'</span></dd>';
                             	element += '<dd class="barcode">&nbsp'+showBarcode+'</dd>';
                             	element += '<dd class="num">'+ci.amount+'</dd>';
-                            	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);">删除</a></dd>';
+                            	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除物品【' + materialName + '】？\',\'deleteBasketItem\',\'\',this,\'\',\'\',\'\');">删除</a></dd>';
                            
                             $('dl[class="sed clearfix"]:eq(0)').prepend(element);
                             var json = getBasketItemJSON(ci.id,'材料',ci.orgUnitName,tousseNameForMaterial,materialName,ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount);
@@ -2558,7 +2587,7 @@
                             	element += '<dd class="name"><span>'+ci.tousseDefinition.name+'</span></dd>';
                             	element += '<dd class="barcode">&nbsp'+ci.idCardBarcode+'</dd>';
                             	element += '<dd class="num">'+ci.amount+'</dd>';
-                            	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this);">删除</a></dd>';
+                            	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除物品【'+ci.tousseDefinition.name+'】？\',\'deleteBasketItem\',\'\',this,\'\',\'\',\'\');">删除</a></dd>';
                             $('dl[class="sed clearfix"]:eq(0)').prepend(element);
                             
                             var json = getBasketItemJSON(ci.id,"器械包",ci.orgUnitName,ci.tousseDefinition.name,"",ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount);