Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37331 -r37350
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37331)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37350)
@@ -591,16 +591,15 @@
 				count = 0
 			}
 			if (pNode.childNodes && pNode.childNodes.length > 0) {
-				setTimeout(function() {
-					Ext4.each(pNode.childNodes, function (lastNode) {
-						lastNode.set('checked', checked)
-					});
-				}, 1000);
+				Ext4.each(pNode.childNodes, function (lastNode) {
+					lastNode.set('checked', checked)
+				});
 			}
 		});
 		if (count <= 1) {
 			Ext4.getCmp('sterilingType').enable();
 			Ext4.getCmp('packageType').enable();
+			Ext4.getCmp('remark').enable();
 		} else {
 			Ext4.getCmp('sterilingType').disable();
 			Ext4.getCmp('packageType').disable();
@@ -5445,7 +5444,8 @@
 			params.errorDamageRemarkId = errorDamageRemarkId;
 		}
 
-		if(sstsConfig.enablePackingMultipleGoodsWithRemarks && params.packageCount > 1){
+		var taskIdsArr = params.taskIds.split(';');
+		if(sstsConfig.enablePackingMultipleGoodsWithRemarks && taskIdsArr.length > 1){
 			var remarkOfApplyGoods = params.remarkOfApplyGoods;
 			var errorDamageRemarkInfo = params.errorDamageRemarkInfo;
 			var remark = '';
@@ -6528,17 +6528,10 @@
 					}
 					var remarkOfApplyGoods = ai.get('remarkOfApplyGoods') || '';
 					var errorDamageRemarkInfo = ai.get('errorDamageRemarkInfo') || '';
-					var remark = '';
-					if(errorDamageRemarkInfo !== ''){
-						remark += errorDamageRemarkInfo;
-					}
-					if(remarkOfApplyGoods !== ''){
-						remark += remarkOfApplyGoods;
-					}
-					if(remark !== ''){
+					if(errorDamageRemarkInfo !== '' || remarkOfApplyGoods !== '' || ai.data.errors.length > 0 || ai.data.damages.length > 0){
 						remarkLength++;
 					}
-					count++
+					count++;
 				}
 			});
 			if (dest.length == 1) {
@@ -6554,12 +6547,14 @@
 					sterilizerTypeStore.reload();
 				}
 				if(sstsConfig.enablePackingMultipleGoodsWithRemarks){
-					if(count > 2 && remarkLength == 0){
+					if(count == 1){
 						Ext4.getCmp('remark').enable();
-					}else if(count == 1){
-						Ext4.getCmp('remark').enable();
 					}else {
-						Ext4.getCmp('remark').disable();
+						if(remarkLength > 0){
+							Ext4.getCmp('remark').disable();
+						}else {
+							Ext4.getCmp('remark').enable();
+						}
 					}
 				}
 			} else {
@@ -6568,10 +6563,22 @@
 				if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){
 					Ext4.getCmp('updateSterilingTypeButton').disable();
 				}
-				if(sstsConfig.enablePackingMultipleGoodsWithRemarks && remarkLength > 0){
-					Ext4.getCmp('remark').disable();
+				if(sstsConfig.enablePackingMultipleGoodsWithRemarks){
+					if(count == 1){
+						Ext4.getCmp('remark').disable();
+					}else {
+						if(remarkLength > 0){
+							Ext4.getCmp('remark').disable();
+						}else {
+							Ext4.getCmp('remark').enable();
+						}
+					}
 				}
 			}
+		}else {
+			Ext4.getCmp('sterilingType').enable();
+			Ext4.getCmp('packageType').enable();
+			Ext4.getCmp('remark').enable();
 		}
 	}
 
@@ -6840,7 +6847,7 @@
 							setTimeout(function () {
 								updatePackageType('basketTreeGrid');
 								if (sstsConfig.enablePackingMaterialsCheckFunction) {
-									getPackingMaterialsForCheckFun(record);
+									getPackingMaterialsForCheckFun(rootNode.childNodes[0]);
 								}
 							}, 200);
 						}