Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32419 -r32421
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32419)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32421)
@@ -2887,7 +2887,7 @@
 onErrorDamageBtnClick = errorDamageBtnClick;
 
 
-function showPackButton(isPrint,isReview,tousseType){
+function showPackButton(isPrint,isReview,tousseType,showOrHidePrintBtn){
 	var packButton = Ext4.getCmp('save_print');
 	packButton.show();
 	
@@ -2902,6 +2902,10 @@
 	else{
 		packButton.setText('<span style="font-weight: bold;">装配不追溯' + tousseType + '</span>');
 	}
+
+	if(showOrHidePrintBtn == '是'){
+		packButton.setText('<span style="font-weight: bold;">装配打印标签和材料清单</span>');
+	}
 	
 	// 如果该器械包需要审核
 	if (isReview == '是'){
@@ -5034,7 +5038,7 @@
 }
 
 //SSTS-377：是否显示打印标签的按钮
-function showOrHidePrintBtn(){
+function showOrHidePrintBtn(showOrHidePrintBtn){
 	var basketTreeId = Ext4.getCmp('basketTreeGrid');
 	var basketTreeList = basketTreeId.getView().getChecked();
 	var waitPackingTreeId = Ext4.getCmp('waitPackingTreeGrid');
@@ -5043,7 +5047,7 @@
 		var isPrint = basketTreeList[0].get('isPrint');
 		var isReview = basketTreeList[0].get('isReview');
 		var tousseType = basketTreeList[0].get('tousseType');
-		showPackButton(isPrint,isReview,tousseType);
+		showPackButton(isPrint,isReview,tousseType,showOrHidePrintBtn);
 	}else {
 		if(waitPackingTreeList.length > 0){
 			var isPrint;
@@ -5058,7 +5062,7 @@
 				}
 			}
 			if(isPrint){
-				showPackButton(isPrint, isReview, tousseType);
+				showPackButton(isPrint, isReview, tousseType,showOrHidePrintBtn);
 			}else {
 				Ext4.getCmp('save_print').hide();
 				Ext4.getCmp('packingLableBtn').hide();
@@ -5182,22 +5186,18 @@
 			itemClickFunction(record,'basketTreeGrid',index);
 			setTimeout(function(){
 				updatePackageType('basketTreeGrid');
-				showOrHidePrintBtn();
-				if(sstsConfig.enablePackingMaterialsCheckFunction){
-					getPackingMaterialsForCheckFun(record);
-				}
+				var printBOMwhenPrintLabel = '否';
 				if(sstsConfig.printBOMwhenPrintLabel){
-					var printBOMwhenPrintLabel = '否';
 					if(record.childNodes.length > 0){
 						printBOMwhenPrintLabel = record.childNodes[0].raw.printBOMwhenPrintLabel || '否';
 					}else {
 						printBOMwhenPrintLabel = record.raw.printBOMwhenPrintLabel || '否';
 					}
-					var packButton = Ext4.getCmp('save_print');
-					if(printBOMwhenPrintLabel == '是'){
-						packButton.setText('<span style="font-weight: bold;">装配打印标签和材料清单</span>');
-					}
 				}
+				showOrHidePrintBtn(printBOMwhenPrintLabel);
+				if(sstsConfig.enablePackingMaterialsCheckFunction){
+					getPackingMaterialsForCheckFun(record);
+				}
 			}, 200);
 	   },
 	   load: {
@@ -5403,22 +5403,18 @@
 			itemClickFunction(record,'waitPackingTreeGrid',index);
 			setTimeout(function(){
 				updatePackageType('waitPackingTreeGrid');
-				showOrHidePrintBtn();
-				if(sstsConfig.enablePackingMaterialsCheckFunction){
-					if(record.data.tousseType == '敷料包' || record.data.taskType == 3){
-						getPackingMaterialsForCheckFun(record);
-					}
-				}
+				var printBOMwhenPrintLabel = '否';
 				if(sstsConfig.printBOMwhenPrintLabel){
-					var printBOMwhenPrintLabel = '否';
 					if(record.childNodes.length > 0){
 						printBOMwhenPrintLabel = record.childNodes[0].raw.printBOMwhenPrintLabel || '否';
 					}else {
 						printBOMwhenPrintLabel = record.raw.printBOMwhenPrintLabel || '否';
 					}
-					var packButton = Ext4.getCmp('save_print');
-					if(printBOMwhenPrintLabel == '是'){
-						packButton.setText('<span style="font-weight: bold;">装配打印标签和材料清单</span>');
+				}
+				showOrHidePrintBtn(printBOMwhenPrintLabel);
+				if(sstsConfig.enablePackingMaterialsCheckFunction){
+					if(record.data.tousseType == '敷料包' || record.data.taskType == 3){
+						getPackingMaterialsForCheckFun(record);
 					}
 				}
 			}, 200);