Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31607 -r31608
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31607)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31608)
@@ -273,12 +273,19 @@
 						}
 					}
 				}
+				if(n.get('errors') == ""){
+					Ext4.getCmp('remark').setValue('');
+					Ext4.getCmp('errorMaterialsTip').setValue('');
+					Ext4.getCmp('errorRemark').setValue('');
+				}else {
+					Ext4.getCmp('remark').setValue('');
+					Ext4.getCmp('damageMaterialsTip').setValue('');
+					Ext4.getCmp('damageRemark').setValue('');
+				}
 				return;
 			}
-		 });
+		});
 		Ext4.getCmp('waitPackingTreeGrid').getStore().reload();//下表格
-		//刷新篮筐物品
-		reloadBasketTreeGrid();
 	}
 	clearInputedIDCardInfo();
 }
@@ -2858,13 +2865,13 @@
 }
 function refreshErrorAndDamageRemark(record){
 	if(record){
-		var errorRemark  = record.get("errorRemark");
-		var damageRemark = record.get("damageRemark");
-		if(!errorRemark){
-			errorRemark = '';
+		var errorRemark  = '';
+		var damageRemark = '';
+		if(record.get("errorRemark") && record.data.errors.length > 0){
+			errorRemark = record.get("errorRemark");
 		}
-		if(!damageRemark){
-			damageRemark = '';
+		if(record.get("damageRemark") && record.data.damages.length > 0){
+			damageRemark = record.get("damageRemark");
 		}
 		Ext4.getCmp('errorRemark').setValue(errorRemark);
 		Ext4.getCmp('damageRemark').setValue(damageRemark);
@@ -2880,13 +2887,13 @@
 		if(record.childNodes.length > 0){
 			var children = record.childNodes;
 			for(var i=0;i<children.length;i++){
-				if(children[i].raw.errorDamageRemarkInfo !== ''){
+				if(children[i].raw.errorDamageRemarkInfo !== '' && (children[i].data.damages.length > 0 || children[i].data.errors.length > 0)){
 					errorDamageRemarkInfo = children[i].raw.errorDamageRemarkInfo;
 					errorDamageRemarkId = children[i].raw.errorDamageRemarkId;
 				}
 			}
 		}else {
-			if(record.raw.errorDamageRemarkInfo !== ''){
+			if(record.raw.errorDamageRemarkInfo !== '' && (record.data.damages.length > 0 || record.data.errors.length > 0)){
 				errorDamageRemarkInfo = record.raw.errorDamageRemarkInfo;
 				errorDamageRemarkId = record.raw.errorDamageRemarkId;
 			}