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) {