Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25566 -r25598
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25566)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25598)
@@ -3232,9 +3232,14 @@
 }
 
 function cancel(){
-    if (confirm("确认取消吗?")) {
-    	location.href = 'awaitForRecycleList.jsp?resolution=' + resolution;
-    }
+	layer.confirm('确认取消吗?', {
+		  btn: ['确定', '取消']
+		}, function(index, layero){
+			// 确定按钮的回调
+			location.href = 'awaitForRecycleList.jsp?resolution=' + resolution;
+		}, function(index){
+		    //取消按钮
+		});
 }
 
 function getUnCleanedEntirelyTousseInfo(){
@@ -3661,8 +3666,8 @@
 	return canEmpty;
 }
 
-/*根据科室编码获取绑定的篮筐*/
-function openDepart(departCode,departName){
+/*根据科室编码加载该科室绑定的清洗篮筐*/
+function loadWashBasketsByDepartCode(departCode){
     $.ajax({
         type:'get',
         url: WWWROOT + '/disinfectSystem/baseData/containerAction!getWashContainerByBindDepartCode.do',
@@ -3673,7 +3678,6 @@
                 $('#scanContainerBarcodeTipUl').hide();
                 $("#basketsUl").empty();
                 for (var i =0 ;i < retuls.length; i++){
-                    createBasketUiElement(retuls[i].barcode,retuls[i].id,retuls[i].containerName,retuls[i].washClassifyType);
                     loadBarcodeDevice(retuls[i].barcode);
                 }
             }else{
@@ -3727,7 +3731,7 @@
                    				addToussItem(toussItem,false);
                     		}
                     	}
-                        openDepart(departCode,departName);
+                    	loadWashBasketsByDepartCode(departCode);
                     }
             	});
     		}