Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r18159 -r18210
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18159)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18210)
@@ -1174,7 +1174,51 @@
 		$('#hiddenErrorRemark' + row).val(errorRemark);
 	}
 	refreshErrorRemarkView(row);
+	refreshErrorMaterialsView(row);
 }
+/**
+ * 将丢失报废的材料json字符串格式化为 名称*数量;名称*数量 的形式.如果数量为0,则排除
+ * @param materialArrayStr
+ * @returns
+ */
+function formatErrorOrDamageMaterials(materialArrayStr){
+	if(!isUndefinedOrNullOrEmpty(materialArrayStr)){
+		var materialArray = JSON.parse(materialArrayStr);
+		var materials = "";
+		for(var i = 0; i < materialArray.length;++i){
+			var amount = parseInt(materialArray[i].amount);
+			if(amount > 0){
+				materials += materialArray[i].materialName + "*" + materialArray[i].amount + ";";
+			}
+		}
+		return materials.length > 0?materials.substring(0,materials.length - 1):"";
+	}
+	return "";
+}
+/**
+ * 刷新丢失材料的显示,如果没有启用回收的丢失报废备注功能,或者没有丢失材料,那么隐藏整行
+ * @param row 行号
+ */
+function refreshErrorMaterialsView(row){
+	var hide = true;
+	if(sstsConfig.enableRecycleMaterialErrorDamageRemark){
+		var recyclingErrorJsonArrayStr = $('#recyclingError' + row).val();
+		var materials = formatErrorOrDamageMaterials(recyclingErrorJsonArrayStr);
+		if(!isUndefinedOrNullOrEmpty(materials)){
+			$('#errorMaterials' + row).text('丢失材料:' + materials);
+			hide = false;
+		}
+	}
+	if(hide){
+		$('#errorMaterialsTr' + row).hide();
+	}else{
+		$('#errorMaterialsTr' + row).show();
+	}
+}
+/**
+ * 刷新丢失备注的显示,如果没有启用回收的丢失报废备注功能,或者没有丢失备注,那么隐藏整行
+ * @param row 行号
+ */
 function refreshErrorRemarkView(row){
 	var hide = true;
 	if(sstsConfig.enableRecycleMaterialErrorDamageRemark){
@@ -1190,6 +1234,10 @@
 		$('#errorRemarkTr' + row).show();
 	}
 }
+/**
+ * 刷新报废备注的显示,如果没有启用回收的丢失报废备注功能,或者没有报废备注,那么隐藏整行
+ * @param row 行号
+ */
 function refreshDamageRemarkView(row){
 	var hide = true;
 	if(sstsConfig.enableRecycleMaterialErrorDamageRemark){
@@ -1205,6 +1253,26 @@
 		$('#damageRemarkTr' + row).show();
 	}
 }
+/**
+ * 刷新报废材料明细的显示,如果没有启用回收的丢失报废备注功能,或者没有报废材料,那么隐藏整行
+ * @param row 行号
+ */
+function refreshDamageMaterialsView(row){
+	var hide = true;
+	if(sstsConfig.enableRecycleMaterialErrorDamageRemark){
+		var recyclingDamageArrayStr = $('#recyclingDamage' + row).val();
+		var materials = formatErrorOrDamageMaterials(recyclingDamageArrayStr);
+		if(!isUndefinedOrNullOrEmpty(materials)){
+			$('#damageMaterials' + row).text('报废材料:' + materials);
+			hide = false;
+		}
+	}
+	if(hide){
+		$('#damageMaterialsTr' + row).hide();
+	}else{
+		$('#damageMaterialsTr' + row).show();
+	}
+}
 function getTousseItemRecyclingDamage(row){
 	return $('#recyclingDamage' + row).val();
 }
@@ -1215,6 +1283,7 @@
 		$('#hiddenDamageRemark' + row).val(damageRemark);
 	}
 	refreshDamageRemarkView(row);
+	refreshDamageMaterialsView(row);
 }
 
 function updateUrgentAmount(row,urgentAmount){
@@ -1744,8 +1813,10 @@
                    '<td><a href="javascript:void(0);" id="recyclingErrorButton'+row+'" class="btn-b" onclick="openRecyclingErrorPage('+row+');">丢失</a></td>'+
                    '<td><a href="javascript:void(0);" id="recyclingDamageButton'+row+'" class="btn-c" onclick="openRecyclingDamagePage('+row+',\''+encodeAll(tousseName)+'\',\''+tousseItemId+'\');">报废</a></td>'+
                    '<td><a href="javascript:void(0);" class="btn-d" onclick="deleteConfirm(\'是否要删除器械包【' + tousseName + '】？\',\'deleteTousse\','+row+',\'\',\'\',\'\');">删除</a></td></tr>';
-         trStr += '<tr id="errorRemarkTr'+row+'"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="errorRemark' + row +  '"></div></td></tr>';
-         trStr += '<tr id="damageRemarkTr'+row+'"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="damageRemark' + row +  '"></div></td></tr>';
+         trStr += '<tr id="errorMaterialsTr'+row+'" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="errorMaterials' + row +  '"></div></td></tr>';
+         trStr += '<tr id="errorRemarkTr'+row+'" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="errorRemark' + row +  '"></div></td></tr>';
+         trStr += '<tr id="damageMaterialsTr'+row+'" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="damageMaterials' + row +  '"></div></td></tr>';
+         trStr += '<tr id="damageRemarkTr'+row+'" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="damageRemark' + row +  '"></div></td></tr>';
          trStr += '</table></div></td></tr>';         
          var trElement = $(trStr)
          trElement.prependTo("#tousseItemTable");//在表格第一行追加行
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r18153 -r18210
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 18153)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 18210)
@@ -57,6 +57,9 @@
 	font-size:18px;
 	color:#2e6271;
 }
+.recycleRemarkTr{
+	display: none;
+}
 .data-table .tousseDetailTable td{ padding:0px;text-align:left;vertical-align:middle;}
 .data-table .tousseDetailTable .input-a{padding:0 2px;width:366px;}
 </style>