Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r35140 -r37504
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 35140)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 37504)
@@ -156,7 +156,7 @@
 .clds-box .table{ border:1px solid #ddd; padding:1px}
 .clds-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;}
 .clds-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:45px;}
-.clds-box .box{height:500px; overflow-y:scroll; background:#fff; overflow-x:hidden}
+.clds-box .box{height:465px; overflow-y:scroll; background:#fff; overflow-x:hidden}
 .clds-box .box table{ margin:0 auto; width:935px}
 .clds-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:26px; color:#2e6271; padding:8px 0}
 .clds-box .box .w1{ width:236px;}
@@ -165,9 +165,9 @@
 .clds-box .box .w4{ width:143px}
 .clds-box .box .w5{ width:475px}
 .clds-box .box .w6{ width:171px}
-
+.clds-box .box .checkbox{ width:45px;}
 /*设置加急数量页面,器械包名称的样式*/
-.clds-box .box .urgentTousseName{ width:255px;}
+.clds-box .box .urgentTousseName{ width:210px;}
 /*设置加急数量页面,器械包申请数量、回收数量、加急数量和加急类型的样式*/
 .clds-box .box .urgentNumber{ width:133px;}
 
@@ -178,6 +178,13 @@
 	padding:8px 0px;
 	border:1px solid #ddd;
 }
+#changeUrgentAll {
+	width:230px;
+	font-size:26px;
+	color:#2e6271;
+	padding:4px 0px;
+	border:1px solid #ddd;
+}
 /*Annie* 材料统计*/
 #materials{margin-left:20px;font-size:20px;color:red;}
 .clds-box .box .w11{ width:380px;}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
===================================================================
diff -u -r36934 -r37504
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 36934)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 37504)
@@ -5,6 +5,7 @@
 <%@page import="com.forgon.tools.SpringBeanManger"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.urgent.service.UrgentLevelManager"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
 <%
 	UrgentLevelManager urgentLevelManager = (UrgentLevelManager)SpringBeanManger.getBean("urgentLevelManager");
 	List<UrgentLevel> urgentLevels = urgentLevelManager.getAllExceptVoluntarily();
@@ -59,29 +60,32 @@
 			var urgentLevelSelectVal = $('#urgentLevelTd_'+i+' select option:selected').val();
 			var ulObj = getUrgentLevel(urgentLevel);
 			var row = $('#row_'+i).val();
-			if(sstsConfig.enableUrgentFunction){
-				if(ulObj){
-					if(urgentAmount <= 0){
-						layer.alert('加急数量为0,需要把加急级别清空!',{
-							time: 2000 //2秒关闭（如果不配置，默认是3秒）
-						});
-						return;
+			var checkbox = $('#checkbox_'+i).is(':checked');
+			if(checkbox){
+				if(sstsConfig.enableUrgentFunction){
+					if(ulObj){
+						if(urgentAmount <= 0){
+							layer.alert('加急数量为0,需要把加急级别清空!',{
+								time: 2000 //2秒关闭（如果不配置，默认是3秒）
+							});
+							return;
+						}
 					}
-				}
-				if(urgentLevelSelectVal == "" || urgentLevelSelectVal == undefined || urgentLevelSelectVal == null){
-					if(urgentAmount > 0){
-						layer.alert('加急数量已经选择,请选择加急级别',{
-							time: 2000 //2秒关闭（如果不配置，默认是3秒）
-						});
-						return;
+					if(urgentLevelSelectVal == "" || urgentLevelSelectVal == undefined || urgentLevelSelectVal == null){
+						if(urgentAmount > 0){
+							layer.alert('加急数量已经选择,请选择加急级别',{
+								time: 2000 //2秒关闭（如果不配置，默认是3秒）
+							});
+							return;
+						}
 					}
 				}
+				window.parent.updateUrgentAmount(row,urgentAmount,urgentLevel);
 			}
-			window.parent.updateUrgentAmount(row,urgentAmount,urgentLevel);
+			
 		}
 		closeLayer();
 	}
-	
 
 	function add(row) {
 		var recycleAmount = parseInt($('#recycleAmount_'+row).html(), 10);
@@ -140,6 +144,23 @@
 		$('#additionalInfo').hide();
 	}
 
+	function changeUrgentAll(){
+		var that = this;
+		$('#recyclingErrorTable').find('input[type="checkbox"]').each(function(){
+			if($(this).is(':checked')){
+				var index = $(this).parent().parent().find('input').eq(1).val();
+				var value = $('#changeUrgentAll').val();
+				var recycleAmount = $('#recycleAmount_'+index).text();
+				$('#urgentSelect_'+index).val(value);
+				if(value == ''){
+					$('#urgentAmount_'+index).text(0);
+				}else {
+					$('#urgentAmount_'+index).text(recycleAmount);
+				}
+			}
+		})
+	}
+
 	$(document).ready(function() {
 		var urgentLevels = $.parseJSON('<%=urgentItems%>');
 		var itemJson = sessionStorage.getItem('itemJson');
@@ -154,6 +175,8 @@
 			var row = itemArray[i].row;
 			var el = '<tr>'
 				el += '<input type="hidden" id="row_'+i+'" value="'+row+'" />'
+				el += '<input type="hidden" id="index_'+i+'" value="'+i+'" />'
+				el += '<td class="checkbox"><input type="checkbox" id="checkbox_'+i+'" checked=""></td>';
 			if(sstsConfig.enableUrgentFunction){
 				el += '<td id="urgentTousseNameTd_'+i+'" class="urgentTousseName">' + tousseName + '</td>';
 				el +=  '<td id="applyAmountTd_'+i+'" class="urgentNumber">' + applyAmount + '</td>';
@@ -164,11 +187,14 @@
 				el +=  '<td id="recycleAmount_'+i+'" class="w3">' + recycleAmount + '</td>';
 			}
 			if(sstsConfig.enableUrgentFunction){
+				var urgentOptionHtml = '';
 				el +=  '<td id="urgentAmount_'+i+'" class="urgentNumber">';
 				el +=   urgentAmount;
 				el +=  '</td>';
-				el +=  '<td id="urgentLevelTd_'+i+'" class="urgentNumber" ><select onchange="changeUrgent()">';
+				el +=  '<td id="urgentLevelTd_'+i+'" class="urgentNumber" ><select id="urgentSelect_'+i+'" onchange="changeUrgent()">';
 				el += "<option value=''>  </option>";
+				urgentOptionHtml += "<option selected hidden disabled value=''>请选择加急级别</option>";
+				urgentOptionHtml += "<option value=''>  </option>";
 				for(var j = 0; j < urgentLevels.length;++j){
 					if(sstsConfig.enableExtendedInformationOfUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode){
 						if(urgentLevels[j].additionalInfo == '是' && urgentLevels[j].name !== urgentName){
@@ -186,8 +212,10 @@
 						el += ' selected="selected"';
 					}
 					el += '>'+urgentLevels[j].name+'</option>';
+					urgentOptionHtml += '<option value="'+urgentLevels[j].name+'">'+urgentLevels[j].name+'</option>';
 				}
 				el += '</select></td>';
+				$("#changeUrgentAll").html(urgentOptionHtml);
 			}
 			el +=  '<td id="operatorTd_'+i+'"><a href="javascript:void(0);" class="add" onclick="add('+i+');">+</a>';
 			el +=  '<a href="javascript:void(0);" class="minus" onclick="reduce('+i+');">-</a>';
@@ -200,12 +228,12 @@
 			$(".urgentNumber").hide();
 			$("#urgentLevelHd").hide();
 			$("#urgentAmountHd").hide();
-			
+			$("#changeUrgentAllBox").hide();
 			$("#urgentTousseNameHd").css("width","40%");
 			$("#applyAmountHd").css("width","18%");
 			$("#recycleAmountHd").css("width","20%");
 			$("#operatorHd").css("width","20%");
-			
+			$(".clds-box .box").css("height","500px");
 			$("h1,h2,p").addClass("blue");
 		}
 		//ZSRY-53:补充额外信息
@@ -239,14 +267,32 @@
 				});
 			}
 		}
+		
+		//ZSYY-282：全选
+		$('#checkAll').click(function(){
+			$('input[type="checkbox"]').each(function(){
+				if($('#checkAll').is(':checked')){
+					$(this).prop('checked',true);
+				}else {
+					$(this).prop('checked',false);
+				}
+			})
+		})
 	});
 </script>
 <body onload="zoomTouchScreenViewToActualScreenSize(980,700,${param.width},${param.height});">
 	<div class="clds-box">
 		<div class="table">
+			<div style="padding: 5px" id="changeUrgentAllBox">
+				<span>批量加急：</span>
+				<select onchange="changeUrgentAll()" id="changeUrgentAll">
+					
+				</select>
+			</div>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr class="title">
-					<th width="27%" id="urgentTousseNameHd">器械包名称</th>
+					<th width="5%"><input type="checkbox" title="全选" id="checkAll" checked=""></th>
+					<th width="22%" id="urgentTousseNameHd">器械包名称</th>
 					<th width="14%" id="applyAmountHd">申请数量</th>
 					<th width="14%" id="recycleAmountHd">回收数量</th>
 					<th width="14%" id="urgentAmountHd">加急数量</th>