Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/btn_batchUrgent1.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r34990 -r35055
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34990)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 35055)
@@ -674,7 +674,7 @@
 					errorDamageQmKey: detail.errorDamageQmKey,
 					amountPerTousse: detail.amountPerTousse
 				};
-				if((detail.errorRemark || '') !== ''){
+				if ((detail.errorRemark || '') !== '') {
 					errorRemark = detail.errorRemark
 				}
 				recyclingErrorJsonArray.push(errorObj);
@@ -690,7 +690,7 @@
 					errorDamageQmKey: detail.errorDamageQmKey,
 					amountPerTousse: detail.amountPerTousse
 				};
-				if((detail.damageRemark || '') !== ''){
+				if ((detail.damageRemark || '') !== '') {
 					damageRemark = detail.damageRemark
 				}
 				recyclingDamageJsonArray.push(item);
@@ -2475,17 +2475,25 @@
 	if (packed) {
 		return false;
 	}
+	var rowArr = row.split(',');
 
 	var isEditIDCardError = false;
 	if ($('#id').val() == "") {
 		isEditIDCardError = true;
 	}
-	var tousseName = $('#tousseName' + row).val();
-	var applyAmount = $('#applicationAmount' + row).val();
-	var recycleAmount = $('#recycleAmount' + row).val();
-	var urgentAmount = $('#urgentAmount' + row).val();
-	var urgentLevel = $('#urgentLevel' + row).val();
 
+	var itemJson = [];
+
+	for (var i = rowArr.length - 1; i >= 0; i--) {
+		itemJson.push({
+			tousseName: $('#tousseName' + rowArr[i]).val(),
+			applyAmount: $('#applicationAmount' + rowArr[i]).val(),
+			recycleAmount: $('#recycleAmount' + rowArr[i]).val(),
+			urgentAmount: $('#urgentAmount' + rowArr[i]).val(),
+			urgentName: $('#urgentLevel' + rowArr[i]).val(),
+			row: rowArr[i]
+		})
+	}
 	var width = 740;
 	var height = 400;
 	var designedTousseWidth = 980;
@@ -2512,16 +2520,12 @@
 
 	width = size.width;
 	height = size.height;
-
 	offsetTop = offsetTop * zoomRatio;
 	layerIndex = layer.open({
 		type: 2,
 		title: ['器械包加急', true],
-		//iframe : {src : 'setTousseUrgentAmount.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+encodeAll(tousseName)+'&applyAmount='+applyAmount+'&recycleAmount='+recycleAmount+'&urgentAmount='+urgentAmount},
 		content: 'setTousseUrgentAmount.jsp?resolution=' + resolution + '&width=' + width
-			+ '&height=' + height + '&row=' + row + '&tousseDefinitionID=' + $('#tousseDefinitionID' + row).val()
-			+ '&tousseName=' + encodeAll(tousseName) + '&applyAmount=' + applyAmount + '&recycleAmount='
-			+ recycleAmount + '&urgentAmount=' + urgentAmount + '&urgentName=' + encodeAll(urgentLevel),
+			+ '&height=' + height + '&itemJson=' + encodeURI(JSON.stringify(itemJson)),
 		area: [width + 'px', height + heightExtra + 'px'],
 		border: [5, 0.3, '#fff', true],
 		closeBtn: [2, true],
@@ -4022,7 +4026,8 @@
 				}
 				urgentAmountElement += '</div>';
 			}
-			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="background-image:url(urgentBg.png);font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
+			var arr = [row];
+			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="background-image:url(urgentBg.png);font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(\'' + arr.join(',') + '\',' + packed + ');">' + msg + '</div>';
 		} else {
 			//ZSWY-180
 			packed = false;
@@ -4046,7 +4051,8 @@
 				}
 				urgentAmountElement += '</div>';
 			}
-			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="' + bgMsg + 'font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
+			var arr = [row];
+			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="' + bgMsg + 'font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(\'' + arr.join(',') + '\',' + packed + ');">' + msg + '</div>';
 		}
 
 		var textWidth = textSize("26px", "宋体", showTousseName).width || 0;
@@ -5300,6 +5306,21 @@
 	submitFunction(false, false, false, false);
 }
 
+//ZSYY-282：批量加急
+function batchUrgent() {
+	var arr = [];
+	$('#tousseItemTable').children().first().children().each(function (row, element) {
+		if ($('#deleted' + row).val() == '0') {
+			arr.push(row)
+		}
+	})
+	if(arr.length > 0){
+		openSetUrgentAmountPage(arr.join(','), false)
+	}else {
+		alertDiv("请添加器械包！");
+	}
+}
+
 /**
  * 提交清点确认
  * @param confirmation 是否清点确认
@@ -6697,6 +6718,9 @@
 	if (recyclingStatus == '部分回收') {
 		$('#saveBtnTd').show();
 	}
+	if (sstsConfig.enableUrgentFunction) {
+		$('#batchUrgentTd').show();
+	}
 	//选择模板按钮显示，isOpenLoadTemplateByUnitInRecyclingModule为true
 	if (sstsConfig.isOpenLoadTemplateByUnitInRecyclingModule || sstsConfig.isLoadApplyTemplateForAddRecycleRecord) {
 		var appType = $("#appType").val();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
===================================================================
diff -u -r31185 -r35055
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 31185)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 35055)
@@ -33,77 +33,58 @@
 	  	skin: 'layer-ext-myskin'
 	});
 	var WWWROOT = '${ctx}';
-	var tousseName = '${param.tousseName}';
-	var tousseDefinitionID = '${param.tousseDefinitionID}';
-	var applyAmount = '${param.applyAmount}';
-	var recycleAmount = '${param.recycleAmount}';
-	var urgentAmount = '${param.urgentAmount}';
-	var urgentName = '${param.urgentName}';
-	if(urgentAmount == null || urgentAmount == "" ){
-		urgentAmount = 0;
-	}
-	var row = '${param.row}';
+	var itemJson = '${param.itemJson}';
 	var length = 0;
 
 	//动态加载JS和CSS
 	document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 	
 	function submit() {
-		var urgentAmount = parseInt($('#urgentAmount').html(),10);
-		var urgentLevel = $('.urgentNumber select').val()
-		var urgentLevelSelectVal = $('.urgentNumber select option:selected').val();
-		var ulObj = getUrgentLevel(urgentLevel);
-		if(sstsConfig.enableUrgentFunction){
-			if(ulObj){
-				//if(ulObj.urgent == '是'){
+		var itemArray = JSON.parse(itemJson);
+		for(var i=0;i<itemArray.length;i++){
+			var urgentAmount = parseInt($('#urgentAmount_'+i).html(),10);
+			var urgentLevel = $('#urgentLevelTd_'+i+' select').val()
+			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(ulObj.name + '需要加急数量大于0',{
-							time: 2000 //2秒关闭（如果不配置，默认是3秒）
-						}); */
 						layer.alert('加急数量为0,需要把加急级别清空!',{
 							time: 2000 //2秒关闭（如果不配置，默认是3秒）
 						});
 						return;
 					}
-				
-				//}else{
-					/* if(urgentAmount > 0){
-						layer.alert(ulObj.name + '需要加急数量为0',{
-							  time: 2000 //2秒关闭（如果不配置，默认是3秒）
+				}
+				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() {
-		var recycleAmount = parseInt($('#recycleAmount').html(), 10);
-		var urgentAmount = parseInt($('#urgentAmount').html(), 10);
+	function add(row) {
+		var recycleAmount = parseInt($('#recycleAmount_'+row).html(), 10);
+		var urgentAmount = parseInt($('#urgentAmount_'+row).html(), 10);
 		if(recycleAmount > urgentAmount){
-			$('#urgentAmount').html( urgentAmount + 1);
-			var urgentAmountVal = parseInt($('#urgentAmount').html(), 10);
+			$('#urgentAmount_'+row).html( urgentAmount + 1);
+			var urgentAmountVal = parseInt($('#urgentAmount_'+row).html(), 10);
 			
 			if(sstsConfig.enableUrgentFunction){//设置加急级别默认值
 				var urgentLevels = $.parseJSON('<%=urgentItems%>');
 				for(var i = 0;i < urgentLevels.length;i++){
 					if(urgentLevels[i].urgentDefaultValue == "是"){
 						var name = urgentLevels[i].name;
-						if(urgentAmountVal > 0 && $("#urgentLevelTd select").val() == ""){
-							$("#urgentLevelTd select option[value='"+name+"']").attr("selected","selected"); 
+						if(urgentAmountVal > 0 && $("#urgentLevelTd_"+row+" select").val() == ""){
+							$("#urgentLevelTd_"+row+" select option[value='"+name+"']").attr("selected","selected"); 
 						}
 						break;
 					}
@@ -112,9 +93,9 @@
 		}
 	}
 
-	function reduce() {
-		if (parseInt($('#urgentAmount').html(), 10) > 0) {
-			$('#urgentAmount').html(parseInt($('#urgentAmount').html(), 10) - 1);
+	function reduce(row) {
+		if (parseInt($('#urgentAmount_'+row).html(), 10) > 0) {
+			$('#urgentAmount_'+row).html(parseInt($('#urgentAmount_'+row).html(), 10) - 1);
 		}
 	}
 
@@ -144,56 +125,58 @@
 	}
 	$(document).ready(function() {
 		var urgentLevels = $.parseJSON('<%=urgentItems%>');
-		var el = '<tr>'
-			el += '<td id="urgentTousseNameTd" class="urgentTousseName">' + tousseName + '</td>';
-			el +=  '<td id="applyAmountTd" class="urgentNumber">' + applyAmount + '</td>';
-			el +=  '<td id="recycleAmount" class="urgentNumber">' + recycleAmount + '</td>';
+		var itemArray = JSON.parse(itemJson);
+		for(var i=0;i<itemArray.length;i++){
+			var tousseName = itemArray[i].tousseName;
+			var applyAmount = itemArray[i].applyAmount;
+			var recycleAmount = itemArray[i].recycleAmount;
+			var urgentAmount = itemArray[i].urgentAmount;
+			var urgentName = itemArray[i].urgentName;
+			var row = itemArray[i].row;
+			var el = '<tr>'
+				el += '<input type="hidden" id="row_'+i+'" value="'+row+'" />'
 			if(sstsConfig.enableUrgentFunction){
-				
-					el +=  '<td id="urgentAmount" class="urgentNumber">';
-					el +=   urgentAmount;
-					el +=  '</td>';
-					el +=  '<td id="urgentLevelTd" class="urgentNumber" ><select>';
+				el += '<td id="urgentTousseNameTd_'+i+'" class="urgentTousseName">' + tousseName + '</td>';
+				el +=  '<td id="applyAmountTd_'+i+'" class="urgentNumber">' + applyAmount + '</td>';
+				el +=  '<td id="recycleAmount_'+i+'" class="urgentNumber">' + recycleAmount + '</td>';
+			}else {
+				el += '<td id="urgentTousseNameTd_'+i+'" class="w1">' + tousseName + '</td>';
+				el +=  '<td id="applyAmountTd_'+i+'" class="w2">' + applyAmount + '</td>';
+				el +=  '<td id="recycleAmount_'+i+'" class="w3">' + recycleAmount + '</td>';
+			}
+			if(sstsConfig.enableUrgentFunction){
+				el +=  '<td id="urgentAmount_'+i+'" class="urgentNumber">';
+				el +=   urgentAmount;
+				el +=  '</td>';
+				el +=  '<td id="urgentLevelTd_'+i+'" class="urgentNumber" ><select>';
 				el += "<option value=''>  </option>";
-				for(var i = 0; i < urgentLevels.length;++i){
-					el += '<option value="'+urgentLevels[i].name+'"';
-					if(urgentLevels[i].name == urgentName){
+				for(var j = 0; j < urgentLevels.length;++j){
+					el += '<option value="'+urgentLevels[j].name+'"';
+					if(urgentLevels[j].name == urgentName){
 						el += ' selected="selected"';
-					}/* else if(urgentLevels[i].urgentDefaultValue == "是" && urgentAmount > 0){
-						el += ' selected="selected"';
-					} */
-					el += '>'+urgentLevels[i].name+'</option>';
+					}
+					el += '>'+urgentLevels[j].name+'</option>';
 				}
-					el += '</select></td>';
+				el += '</select></td>';
 			}
-			el +=  '<td id="operatorTd"><a href="javascript:void(0);" class="add" id="addButton0" onclick="add();">+</a>';
-			el +=  '<a href="javascript:void(0);" class="minus" onclick="reduce();">-</a>';
+			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>';
 			el +=  '</td>';
 			el +=  '</tr>';
-		var materialElement = $(el);
-		$("#recyclingErrorTable").append(materialElement);
+			var materialElement = $(el);
+			$("#recyclingErrorTable").append(materialElement);
+		}
 		if(!sstsConfig.enableUrgentFunction){
-			$("#urgentLevelTd").hide();
+			$(".urgentNumber").hide();
 			$("#urgentLevelHd").hide();
 			$("#urgentAmountHd").hide();
 			
 			$("#urgentTousseNameHd").css("width","40%");
 			$("#applyAmountHd").css("width","18%");
 			$("#recycleAmountHd").css("width","20%");
-			/* $("#urgentAmountHd").css("width","15%"); */
 			$("#operatorHd").css("width","20%");
 			
 			$("h1,h2,p").addClass("blue");
-
-			$("#urgentTousseNameTd").removeClass("urgentTousseName");
-			$("#applyAmountTd").removeClass("urgentNumber");
-			$("#recycleAmount").removeClass("urgentNumber");
-			$("#urgentAmount").removeClass("urgentNumber");
-			
-			$("#urgentTousseNameTd").addClass("w1");
-			$("#applyAmountTd").addClass("w2");
-			$("#recycleAmount").addClass("w3");
-			/* $("#urgentAmount").addClass("w4"); */
 		}
 	});
 </script>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/btn_batchUrgent.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r34556 -r35055
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 34556)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 35055)
@@ -589,6 +589,9 @@
     #dialogShowIDCardBarcodes  tbody tr td:first-child {
         border-left: 1px solid #ddd;
     }
+    #batchUrgentTd {
+        display: none;
+    }
 </style>
 
 
@@ -677,6 +680,7 @@
             <table width="50%" border="0" cellspacing="0" cellpadding="0">
               <tr>
                 <td id="inventory"><input type="button" id="isCheckIntoTheBox" value="清点确认" class='btn-inventory' onclick="inventoryConfirm();"></td>
+                <td id="batchUrgentTd"><input type="button" value="批量加急" id="saveBtn2" class="btn-urgent" onclick="batchUrgent();"/></td>
                 <td id="saveBtnTd"><input type="button" value="保存" id="saveBtn" class="btn-e" onclick="doSaveAction();"/></td>
                 <td id="saveAndNewBtnTd"><input type="button" value="保存并新建" class="btn-b" onclick="doSaveAndNewAction();"/></td>
                 <td id="saveAndPrintBtnTd"><input type="button" value="保存并打印" class="btn-p" onclick="doSaveAndPrintAction();"/></td>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r29515 -r35055
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 29515)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 35055)
@@ -73,6 +73,8 @@
 .data-table .btn-box input.btn-inventory:hover{    width: 140px;height: 64px;border: none; background:url(btn-box.png) no-repeat; background-position:-1210px -64px; 	no-repeat; line-height: 0; border:none;  overflow:hidden; text-indent:-9999px}
 .data-table .btn-box .btn-e{ background:url(btn_save.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
 .data-table .btn-box .btn-e:hover{ background:url(btn_save1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-urgent{ background:url(btn_batchUrgent.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-urgent:hover{ background:url(btn_batchUrgent1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
 .data-table .btn-box .btn-b{ background-position:-142px 0; width:203px; height:64px;}
 .data-table .btn-box .btn-b:hover{ background-position:-142px -64px; }
 .data-table .btn-box .btn-p{ background-position:-632px 0; width:208px; height:64px;}