Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37380 -r37584
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37380)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37584)
@@ -1521,7 +1521,7 @@
 					} else {
 						resultName = showName;
 					}
-					if (record.get('tousseType') == '外来器械包') {
+					if (record.get('tousseType') == '外来器械包' && sstsConfig.showCameraPhoto) {
 						if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking) {
 							if (record.get('partPacking') && !record.get('isTimeout')) {
 								p.css = 'tousseName_background';
@@ -4906,7 +4906,7 @@
 										msg1Array.push(cNode.childNodes[k].data.tousseName);
 									}
 								}
-								if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !cNode.childNodes[k].data.packedPhotographed) {
+								if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.showCameraPhoto && !cNode.childNodes[k].data.packedPhotographed) {
 									packedPhotographed2 = false;
 									if (msg2Array.indexOf(cNode.childNodes[k].data.tousseName) == -1) {
 										msg2Array.push(cNode.childNodes[k].data.tousseName);
@@ -4944,7 +4944,7 @@
 								}
 							}
 						}
-						if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && cNode.get("tousseType") == '外来器械包') {
+						if (sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.showCameraPhoto && cNode.get("tousseType") == '外来器械包') {
 							if (cNode.get("packedPhotographed") == '' || cNode.get("packedPhotographed") == false) {
 								packedPhotographed2 = false;
 								if (msg2Array.indexOf(cNode.get("tousseName")) == -1) {
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js
===================================================================
diff -u -r35411 -r37584
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js	(.../interfereForeignTousseApplicationForm.js)	(revision 35411)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js	(.../interfereForeignTousseApplicationForm.js)	(revision 37584)
@@ -745,7 +745,7 @@
                     return false;
                 }
 
-                if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse){
+                if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.showCameraPhoto){
                     var isHasImgOrVideo = true;
                     var msg = '';
                     var childPackageStore = top.Ext.getCmp("splitMaterialGrid").getStore();
@@ -1004,29 +1004,31 @@
         width : 160,
         menuDisabled: true,
         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'; 
+            if(sstsConfig.showCameraPhoto){
+                if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
+                    if(record.data.partialSplitForeignTousse){
+                        p.css='tousseName_background'; 
                     }
-                }
-            }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'; 
+                    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'; 
+                        }
                     }
+                }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'; 
+                        }
+                    }
+                }else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
+                    if(record.data.partialSplitForeignTousse){
+                        p.css='tousseName_background'; 
+                    }
                 }
-            }else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
-                if(record.data.partialSplitForeignTousse){
-                    p.css='tousseName_background'; 
-                }
             }
 
             return '<span style="white-space: break-spaces;">'+v+'</span>';
Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r36454 -r37584
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 36454)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 37584)
@@ -656,29 +656,31 @@
 	        dataIndex : 'tousseName',
             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'; 
+                if(sstsConfig.showCameraPhoto){
+                    if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
+                        if(record.data.partialSplitForeignTousse){
+                            p.css='tousseName_background'; 
                         }
-                    }
-                }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'; 
+                        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'; 
+                            }
                         }
+                    }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'; 
+                            }
+                        }
+                    }else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
+                        if(record.data.partialSplitForeignTousse){
+                            p.css='tousseName_background'; 
+                        }
                     }
-                }else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
-                    if(record.data.partialSplitForeignTousse){
-                        p.css='tousseName_background'; 
-                    }
                 }
 
                 return '<span style="white-space: break-spaces;">'+v+'</span>';
@@ -1562,7 +1564,7 @@
             return false;
         }
 
-        if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse){
+        if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.showCameraPhoto){
             var isHasImgOrVideo = true;
             var msg = '';
             for ( var i = 0; i < splitedTousseStore.getCount(); i++) {