Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31273 -r31274
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31273)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31274)
@@ -3654,8 +3654,6 @@
 		}
 		var params = [];
 		var packedPhotographed = true;
-		var msg1 = true;
-		var msg2 = true;
 		var msg = '';
 		for(var i=0;i<dest.length;i++){
 			var pNode = dest[i];
@@ -3706,15 +3704,13 @@
 					isChackAll = true;
 					if(cNode.data.tousseType == '外来器械包'){
 						for(var k=0;k<cNode.childNodes.length;k++){
-							if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.childNodes[k].data.partPacking && msg1 == true){
+							if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.childNodes[k].data.partPacking){
 								packedPhotographed = false;
 								msg = cNode.childNodes[k].data.tousseName+'已经做了拆包，请点击拆包进入完成操作!';
-								msg1 = false;
 							}
-							if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !cNode.childNodes[k].data.packedPhotographed && msg2 == true){
+							if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !cNode.childNodes[k].data.packedPhotographed){
 								packedPhotographed = false;
 								msg = cNode.childNodes[k].data.tousseName+'还未上传照片，不能装配，请先上传照片!';
-								msg2 = false;
 							}
 						}
 					}
@@ -3737,17 +3733,15 @@
 					damages = cNode.get("damages");
 					errors = cNode.get("errors");
 					department = cNode.get("department");
-					if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包' && msg1 == true){
+					if(sstsConfig.allowForeignToussePartSplitWhenPacking && cNode.get("tousseType") == '外来器械包'){
 						if(cNode.get("partPacking")){
 							msg = cNode.get("tousseName") +'已经做了拆包，请点击拆包进入完成操作!';
 							packedPhotographed = false;
-							msg1 = false;
 						}
 					}
-					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包' && msg2 == true){
+					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包'){
 						if(cNode.get("packedPhotographed") == '' || cNode.get("packedPhotographed") == false){
 							msg = cNode.get("tousseName") +'还未上传照片，不能装配，请先上传照片!';
-							msg2 = false;
 							packedPhotographed = false;
 						}
 					}
@@ -3834,7 +3828,6 @@
 		if(!packedPhotographed){
 			hidePackingTousseBtnClick_mask();
 			Ext4.getCmp('save_print').enable();
-			showResult(msg);
 			return;
 		}
 		isConfirmRequestPackingTousse(params,0,true);