Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r31109 -r31118
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 31109)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 31118)
@@ -645,35 +645,31 @@
             width : 240,
             renderer: function(v,p,record,index){
                 if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
+                    if(record.data.partialSplitForeignTousse){
+                        p.css='tousseName_background'; 
+                    }
                     if(record.data.imageIdsArry || record.data.videoIdsArry || record.data.haveImageFileAmount){
                         var imageIdsArry = record.data.imageIdsArry || [];
                         var videoIdsArry = record.data.videoIdsArry || [];
                         if(imageIdsArry.length > 0 || videoIdsArry.length > 0 || record.data.haveImageFileAmount){
                             p.css='tousseName_background_1'; 
-                            return '<span style="white-space: break-spaces;">'+v+'</span>';
                         }
                     }
-                    if(record.data.partialSplitForeignTousse){
-                        p.css='tousseName_background'; 
-                        return '<span style="white-space: break-spaces;">'+v+'</span>';
-                    }
                 }else if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !sstsConfig.allowForeignToussePartSplitWhenPacking){
                     if(record.data.imageIdsArry && record.data.videoIdsArry || record.data.haveImageFileAmount){
                         var imageIdsArry = record.data.imageIdsArry || [];
                         var videoIdsArry = record.data.videoIdsArry || [];
                         if(imageIdsArry.length > 0 || videoIdsArry.length > 0 || record.data.haveImageFileAmount){
                             p.css='tousseName_background_1'; 
-                            return '<span style="white-space: break-spaces;">'+v+'</span>';
                         }
                     }
                 }else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
                     if(record.data.partialSplitForeignTousse){
                         p.css='tousseName_background'; 
-                        return '<span style="white-space: break-spaces;">'+v+'</span>';
                     }
-                }else {
-                    return '<span style="white-space: break-spaces;">'+v+'</span>';
                 }
+
+                return '<span style="white-space: break-spaces;">'+v+'</span>';
             }
 	    },{
 	        header : "拆分小包名称",
@@ -1344,22 +1340,29 @@
             if(!record.get("partialSplitForeignTousse")){
                 var imageIdsArry = record.data.imageIdsArry;
                 var videoIdsArry = record.data.videoIdsArry; 
+                var imageIds = '';
+                var videoIds = '';
                 if(imageIdsArry == undefined && videoIdsArry == undefined){
                     continue;
                 }
-                if(imageIdsArry == undefined){
-                    imageIdsArry = "";
-                }else{
-                    imageIdsArry = imageIdsArry.join(",");
+                if(typeof imageIdsArry == 'object'){
+                    if(imageIdsArry.length == 0){
+                        imageIds = '';
+                    }else {
+                        imageIds = imageIdsArry.join(',');
+                    }
                 }
-                
-                if(videoIdsArry == undefined){
-                    videoIdsArry = "";
-                }else{
-                    videoIdsArry = videoIdsArry.join(",");
-                }		
-                uploadTousseCameraPhoto(tousses[k].id,imageIdsArry,videoIdsArry);
-                k++;
+                if(typeof videoIdsArry == 'object'){
+                    if(videoIdsArry.length == 0){
+                        videoIds = '';
+                    }else {
+                        videoIds = videoIdsArry.join(',');
+                    }
+                }
+                if(imageIds !== '' || videoIds !== ''){
+                    uploadTousseCameraPhoto(tousses[k].id,imageIds,videoIds);
+                    k++;
+                }
             }
         }
         hideMessageBox4(true);
@@ -1491,11 +1494,11 @@
                     if(typeof imageIdsArry == 'object' && typeof videoIdsArry == 'object'){
                         if(imageIdsArry.length == 0 || videoIdsArry.length == 0){
                             isHasImgOrVideo = false;
-                            msg = tousseName+"还未上传照片，不能装配，请先上传照片!";
+                            msg = "还有拆分小包未上传图片，不能装配，请先上传照片！";
                         }
                     }else {
                         isHasImgOrVideo = false;
-                        msg = tousseName+"还未上传照片，不能装配，请先上传照片!";
+                        msg = "还有拆分小包未上传图片，不能装配，请先上传照片！";
                     }
                 }
             }
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 = [];