Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r24092 -r24124 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 24092) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 24124) @@ -320,13 +320,15 @@ //判断所选中的包里是否有灭菌方式不同的包,如果有则进行提示不能扫入,没有再判断是否有和左边审核列表中的包的灭菌方式不一致,如果有则进行提示不能扫入 if((sterilingModeFromLeftReviewGrid || sterilingModeFromLeftReviewGrid === "") && firstSterilingMode != sterilingModeFromLeftReviewGrid){ - showResult("【"+ selectedRecords[0].data["tousseDefinition.name"] +"】属于【"+ selectedRecords[0].data["sterilingMode"] +"】物品与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致,不能入框审核"); + var currentSterilingMode = selectedRecords[0].data["sterilingMode"]; + showResult("【"+ selectedRecords[0].data["tousseDefinition.name"] +"】"+ (currentSterilingMode ? ("属于【"+ (currentSterilingMode ? : ) +"】物品") : "") +"与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致,不能入框审核"); return false; } if(selectedRecords.length > 1){ for(var i = 1;i < selectedRecords.length;i++){ if(firstSterilingMode != selectedRecords[i].data["sterilingMode"]){ - showResult("【"+ selectedRecords[i].data["tousseDefinition.name"] +"】属于【"+ selectedRecords[i].data["sterilingMode"] +"】物品与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致,不能入框审核"); + var currentSterilingMode = selectedRecords[i].data["sterilingMode"]; + showResult("【"+ selectedRecords[i].data["tousseDefinition.name"] +"】"+ (currentSterilingMode ? ("属于【"+ (currentSterilingMode ? : ) +"】物品") : "") +"与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致,不能入框审核"); return false; } }