Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r18137 -r18138
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 18137)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 18138)
@@ -29,6 +29,7 @@
 	var tousseCount = '${param.tousseCount}';
 	var isEditIDCardError = '${param.isEditIDCardError}';
 	var errorRemark = '${param.errorRemark}';
+	var params_recordType = '${param.recordType}';
 	//动态加载JS和CSS
 	document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 
@@ -248,6 +249,9 @@
 			}
 		});
 		$('#errorRemark').val(errorRemark);
+		if(params_recordType == 'history'){
+			 $("#errorRemark").attr({ readonly: 'true' });
+		}
 		if(!sstsConfig.enableRecycleMaterialErrorDamageRemark){
 			$('#errorRemarkBox').hide();
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r18137 -r18138
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18137)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18138)
@@ -1106,6 +1106,7 @@
         title : ['材料丢失',true],
         iframe : {src : 'recyclingErrors.jsp?resolution='+resolution+'&isEditIDCardError='+isEditIDCardError+'&width='+width+'&height='+height
         	+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+encodeAll(tousseName)
+        	+'&recordType=' + params_recordType
         	+'&tousseCount='+($('#recycleAmount'+row).val()==''?0:$('#recycleAmount'+row).val()) + '&errorRemark=' + errorRemark},
         area : [ width + 'px' , height +heightExtra + 'px'],
         border : [5, 0.3, '#fff', true],
@@ -1265,6 +1266,7 @@
         iframe : {src : 'recyclingDamage.jsp?resolution='+resolution+'&width='+width+'&height='+height
         	+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+tousseName
         	+'&tousseItemId='+tousseItemId+'&tousseCount='+$('#recycleAmount'+row).attr('value')
+        	+'&recordType=' + params_recordType
         	+'&depart='+depart+'&departCode='+departCode+ '&damageRemark=' + damageRemark},
         area : [ width + 'px' , height +heightExtra + 'px'],
         border : [5, 0.3, '#fff', true],
@@ -2714,6 +2716,8 @@
       						isThereIdentificationCard: tousseItem.isThereIdentificationCard,
       						isApplyEntireTousse: tousseItem.isApplyEntireTousse,
       						urgentAmount : tousseItem.urgentAmount,
+      						errorRemark : tousseItem.errorRemark,
+      						damageRemark : tousseItem.damageRemark,
       						tousseRemark : tousseItem.remark
       				};
                    var successAdd = addToussItem(toussItem);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
===================================================================
diff -u -r18137 -r18138
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 18137)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 18138)
@@ -32,6 +32,7 @@
 var tousseCount = '${param.tousseCount}';
 var tousseItemId = '${param.tousseItemId}';
 var damageRemark = '${param.damageRemark}';
+var params_recordType = '${param.recordType}';
 var dep = '${param.depart}';//$('depart').val();
 $('depart').val(dep);
 var departCoding = '${param.departCode}';//$('departCoding').val();
@@ -193,6 +194,9 @@
         }
     });
 	$('#damageRemark').val(damageRemark);
+	if(params_recordType == 'history'){
+		 $("#damageRemark").attr({ readonly: 'true' });
+	}
 	if(!sstsConfig.enableRecycleMaterialErrorDamageRemark){
 		$('#damageRemarkBox').hide();
 	}