Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
===================================================================
diff -u -r16252 -r17930
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 16252)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 17930)
@@ -15,6 +15,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <title>消毒供应中心质量追溯管理系统</title>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script src="alertDiv/CJL.0.1.min.js"></script>
 <script src="alertDiv/AlertBox.js"></script>
 <script type="text/javascript" src="js/jquery-min.js"></script>
@@ -365,6 +366,7 @@
 
 //将器械包放入篮筐中
 function putMaterialInBasket(row){
+	var inputSuccess = false;
     if($('#basketsUl').children().length > 0){
         var tousseName = $('#tousseName'+row).val();
         var isCleanedEntirely = $('#isCleanedEntirely'+row).val();
@@ -388,9 +390,11 @@
         if(applicationAmount == parseInt($('#loadedAmount'+row).val(),10)){
 	        deleteTousseItem(row);
         }
+        inputSuccess = true;
     }else{
         alertDiv('请先扫描篮筐条码。');
     }
+    return inputSuccess;
 }
 
 function deleteTousseItem(row){
@@ -536,8 +540,28 @@
 function cancel() {
 	window.close();
 }
-
+//一键入筐
+function allInputBasket(){
+	$('#tousseItemTable').children().first().children().each(function(row,element){
+        if($('#deleted'+row).val() == '0'){
+        	var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10);
+        	
+        	if(amount > 0){
+        		var success = putMaterialInBasket(row);
+            	if(!success){
+            		return false;
+            	}
+        	}
+        }
+	});
+}
 function loadItem() {
+	
+	if(sstsConfig.recycleAllTousseIntoBasket){
+		var divElement = document.getElementById('divElement');
+		divElement.innerHTML = '<input type="button" value="一键入筐" class="btn-h" onclick="allInputBasket();"/>';
+	}
+	
 	$("#tousseItemTable").empty();
     $("#basketsUl").empty();
 	document.onkeydown = showKeyDown;
@@ -613,6 +637,9 @@
             </c:if>
         </form>
     </div>
+    
+    <div id="divElement"></div>
+    
     <!--操作 end-->
     <!--表单 start-->
     <div class="data-table">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css
===================================================================
diff -u -r14407 -r17930
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css	(.../customIntoBasketStyle.css)	(revision 14407)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasketStyle.css	(.../customIntoBasketStyle.css)	(revision 17930)
@@ -28,6 +28,10 @@
 .blank40 {clear:both; height:40px; display:block; font-size:1px;overflow:hidden;}
 
 .mbody{ background:url(customIntoBasket.png) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative}
+
+.mbody .btn-h{ margin-left: 220px;margin-top: 140px; 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: 220px;margin-top: 140px; 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;}