Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r27137 -r27179 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 27137) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 27179) @@ -1899,7 +1899,10 @@ if(basketName != null && Ext.getCmp('basketBarcode').getValue() != null){ //左边审核列表的包的灭菌方式 var sterilingModeFromLeftReviewGrid = getSterilingModeFromLeftReviewGrid(); - var firstSterilingMode = tousseInstanceArray[0].data["sterilingMode"]; + var firstSterilingMode = tousseInstanceArray[0]["sterilingMode"]; + if(firstSterilingMode == undefined){ + firstSterilingMode = ""; + } //判断所选中的包里是否有灭菌方式不同的包,如果有则进行提示不能扫入,没有再判断是否有和左边审核列表中的包的灭菌方式不一致,如果有则进行提示不能扫入 if((sterilingModeFromLeftReviewGrid || sterilingModeFromLeftReviewGrid === "") && firstSterilingMode != sterilingModeFromLeftReviewGrid){ @@ -1910,7 +1913,11 @@ } if(tousseInstanceArray.length > 1){ for(var i = 1;i < tousseInstanceArray.length;i++){ - if(firstSterilingMode != tousseInstanceArray[i]["sterilingMode"]){ + var sterilingModeOfItem = tousseInstanceArray[i]["sterilingMode"]; + if(sterilingModeOfItem == undefined){ + sterilingModeOfItem = ""; + } + if(firstSterilingMode != sterilingModeOfItem){ //showResult("【"+ tousseInstanceArray[i]["tousseName"] +"】属于【"+ tousseInstanceArray[i]["sterilingMode"] +"】物品与原有"+ (sterilingModeFromLeftReviewGrid ? ("【"+ sterilingModeFromLeftReviewGrid +"】物品") : "物品灭菌方式") +"不一致,不能入框审核"); noticeDiffSterilingMessage(top.Ext , getDiffSterilingModeMessage(tousseInstanceArray[i]["tousseName"] , tousseInstanceArray[i]["sterilingMode"], sterilingModeFromLeftReviewGrid , "审核") , afterNoticeMessageBoxClosed); Ext.getCmp('barcode').focus(false, 100);