Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css
===================================================================
diff -u -r14296 -r20067
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css	(.../expressStyle.css)	(revision 14296)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css	(.../expressStyle.css)	(revision 20067)
@@ -28,6 +28,9 @@
 .blank40 {clear:both; height:40px; display:block; font-size:1px;overflow:hidden;}
 
 .mbody{ background:url(express_recycle.jpg) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative}
+.mbody .btn-h{ margin-left: 95px;margin-top: 113px; background:url(allIntoBasket.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;}
+.mbody .btn-h:hover{ margin-left: 95px;margin-top: 113px; background:url(allIntoBaskehovert.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;}
+
 .add-form{ position:absolute; width:855px; height:151px; top:233px; left:175px}
 .add-form div{ position:absolute;}
 .add-form .input{ background:url(pic_bg.jpg) no-repeat 0 -135px; width:272px; height:42px; border:0px; font-size:26px; padding:10px 10px; line-height:40px;}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r19996 -r20067
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 19996)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20067)
@@ -183,5 +183,7 @@
   //对申请单的物品申请数量是否启用干预功能（true为启用,false或者不配置都不启用）
   enableInterfereApplyAmount:true,
   //同步入库单失效时期默认值，添加3年
-  defaultExpDate:3
+  defaultExpDate:3,
+  //是否启用快速回收一键入筐功能
+  recycleAllTousseIntoBasketInExpressRecycle:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r20064 -r20067
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 20064)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 20067)
@@ -32,6 +32,7 @@
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script src="${ctx}/js/magnificPopup/jquery.magnific-popup.js"></script>
 <script type="text/javascript" src="commonRecycle.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <link rel="stylesheet" href="${ctx}/jquery/jquery-ui-1.10.2/css/south-street/jquery-ui-1.10.2.custom.css" type="text/css" />
 <script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/divselect.js"></script>
@@ -59,14 +60,14 @@
 </style>
 
 <style>
-	#divselect{width:300px; margin:-85px 700px auto; position:relative; z-index:10000;}
+	#divselect{width:300px; margin:-53px 700px; position:relative; z-index:10000;}
 	#divselect cite{width:250px; height:50px;line-height:50px;font-size:30px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
 	#divselect ul{width:284px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;}
 	#divselect ul li{height:60px; line-height:60px;}
 	#divselect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
 	#divselect ul li a:hover{background-color:#CCC;}
 	
-	#divTousseGroup{width:300px; margin:-50px -80px; position:relative; z-index:10000;}
+	#divTousseGroup{width:300px; margin:-20px -80px; position:relative; z-index:10000;}
 	#divTousseGroup cite{width:250px; height:50px;line-height:50px;font-size:30px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
 	#divTousseGroup ul{width:284px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;}
 	#divTousseGroup ul li{height:60px; line-height:60px;}
@@ -130,6 +131,7 @@
 
 <div class="mbody">
     <!--操作 start-->
+    <input id="allIntoBasket" type="button" value="一键入筐" class="btn-h" onclick="allInputBasket();"/>
     <div class="add-form">
         <form id="recyclingRecordForm" method="post" action="${ctx}/disinfectSystem/recyclingRecordAction!saveExpressRecycling.do">
             <input type="hidden" id="resolution" name="resolution" value="${param.resolution}"/>
@@ -744,7 +746,16 @@
 	basketElement.prepend($(element));
 	basketElement.find("input:first").val(json);
 }
-
+//一键入筐
+function allInputBasket(){
+	$('#tousseItemTable .btn-a').each(function(row,element){
+		var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10);
+		if(amount > 0){
+			$(this).click();
+		}
+		
+	});
+}
 //将器械包放入篮筐中
 function putTousseInTheBasket(row){
     if($('#basketsUl').children().length > 0){
@@ -1126,6 +1137,11 @@
 function init(){
 	$.divselect("#divselect","#inputselect");
 	$.divselect("#divTousseGroup","#tousseGroupSelect");
+	if(sstsConfig.recycleAllTousseIntoBasketInExpressRecycle){
+		$('#allIntoBasket').show();
+	}else{
+		$('#allIntoBasket').hide();
+	}
 }
 
 function loadItem() {