Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r31113 -r31118
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31113)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 31118)
@@ -895,18 +895,18 @@
 				}
 				if(record.get('tousseType') == '外来器械包'){
 					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
-						if(record.get('packedPhotographed')){
-							p.css = 'tousseName_background_1';
-						}
-						if(record.get('partPacking')){
+						if(record.get('partPacking') && !record.get('isTimeout')){
 							p.css = 'tousseName_background';
 						}
+						if(record.get('packedPhotographed') && !record.get('isTimeout')){
+							p.css = 'tousseName_background_1';
+						}
 					}else if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !sstsConfig.allowForeignToussePartSplitWhenPacking){
 						if(record.get('packedPhotographed') && !record.get('isTimeout')){
 							p.css = 'tousseName_background_1';
 						}
 					}else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
-						if(record.get('partPacking')){
+						if(record.get('partPacking') && !record.get('isTimeout')){
 							p.css = 'tousseName_background';
 						}
 					}
@@ -3700,6 +3700,17 @@
 			 var noUserFormSterilizationInfo = true;
              //遍历器械包下的每条装配任务数据
 			 Ext4.each(selNodes,function(cNode){
+				if(cNode.childNodes.length > 0){
+					isChackAll = true;
+					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.data.tousseType == '外来器械包'){
+						for(var k=0;k<cNode.childNodes.length;k++){
+							if(cNode.childNodes[k].data.packedPhotographed == '' || cNode.childNodes[k].data.packedPhotographed == false){
+								packedPhotographed = false;
+								msg = cNode.childNodes[k].data.tousseName+'还未上传照片，不能装配，请先上传照片!';
+							}
+						}
+					}
+				}
 				if(cNode.get("tousseName") == pTousseName && cNode.childNodes.length == 0){
 					tousseName = cNode.get("tousseName");
 					status = cNode.get("status");
@@ -3770,21 +3781,6 @@
 
 					parentAmout += parseInt(amount);
 				}
-				if(cNode.childNodes.length > 0){
-					isChackAll = true;
-					if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.data.tousseType == '外来器械包'){
-						var arr = [];
-						for(var k=0;k<cNode.childNodes.length;k++){
-							if(cNode.childNodes[k].data.packedPhotographed == '' || cNode.childNodes[k].data.packedPhotographed == false){
-								packedPhotographed = false;
-								arr.push(cNode.childNodes[k].data.tousseName);
-							}
-						}
-						if(arr.length > 0){
-							msg = arr.join(',')+'还未上传照片，不能装配，请先上传照片!';
-						}
-					}
-				}
 			 });
 			 var taskIdMap = {};
 			 var taskIdDest = [];