Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r24129 -r24174 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 24129) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 24174) @@ -1478,11 +1478,11 @@ //左边审核列表的包的灭菌方式 var sterilingModeFromLeftReviewGrid = getSterilingModeFromLeftReviewGrid(); //判断所选中的包里是否有灭菌方式不同的包,如果有则进行提示不能扫入,没有再判断是否有和左边审核列表中的包的灭菌方式不一致,如果有则进行提示不能扫入 - if((sterilingModeFromLeftReviewGrid || sterilingModeFromLeftReviewGrid === "") - && obj.sterilingMode != sterilingModeFromLeftReviewGrid){ - //showResult("【"+ obj.tousseName +"】属于【"+ obj["sterilingMode"] +"】物品与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致,不能入框审核"); - showResult(getDiffSterilingModeMessage(obj.tousseName , obj["sterilingMode"], sterilingModeFromLeftReviewGrid)); - return false; + if(sterilingModeFromLeftReviewGrid || sterilingModeFromLeftReviewGrid === "") { + if((obj["sterilingMode"] || sterilingModeFromLeftReviewGrid) && obj["sterilingMode"] != sterilingModeFromLeftReviewGrid){ + showResult(getDiffSterilingModeMessage(obj.tousseName , obj["sterilingMode"], sterilingModeFromLeftReviewGrid)); + return false; + } } var tousseInstance = new tousseInstanceRecord({