Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r17312 -r17351 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 17312) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 17351) @@ -288,6 +288,10 @@ return false; } } + + //灭菌程序为"无"的器械包能否一键审核,true为允许,false表示不允许,默认时为true + var tousseWithNullSterilingTypeCanNotBatchAddReview = sstsConfig.tousseWithNullSterilingTypeCanNotBatchAddReview; + var tempSM = null; var tempPS = null; var tempPF = null; @@ -296,23 +300,31 @@ for ( var i = 0;i添加"); + if(sType != '无'){ + //同步的ajax请求校验该灭菌程序能否进入审核列表,如果不能,则本次循环continue + var sterilingTypeCanAddToReview = true; + DWREngine.setAsync(false); + SterilisationTableManager.validateSterilingTypeCanAddToReview(sType , function(jsonResult){ + if(!jsonResult.success){ + if(jsonResult.message){ + showResult(jsonResult.message); + }else{ + showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加"); + } + sterilingTypeCanAddToReview = false; } - sterilingTypeCanAddToReview = false; + }); + DWREngine.setAsync(true); + if(sterilingTypeCanAddToReview == false){ + delete records[i]; + continue; } - }); - DWREngine.setAsync(true); - if(sterilingTypeCanAddToReview == false){ - delete records[i]; - continue; + }else{ + if(tousseWithNullSterilingTypeCanNotBatchAddReview){ + showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加"); + delete records[i]; + continue; + } } if(tempSM == null){