Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r36421 -r36466 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 36421) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 36466) @@ -984,16 +984,18 @@ function reviewTousse(basketName,basketBarcode){ // var basketName = Ext.getCmp('basketName').getValue(); // 如果是一级供应室用户,并且需要入筐;或者是二级供应室用户,并且需要入筐 - if ((sstsConfig.mustScanBasketForTousseReview && isFirstRoomPeople) || (sstsConfig.mustScanBasketForTousseReviewOf2ndSupplyRoom && !isFirstRoomPeople)){ - if (isObjEmpty(basketName)) { - //判断所扫器械包是否已全部加入至虚拟篮筐,如存在有未加入虚拟篮筐的器械包则进行提示,否则通过 - var tousseInstanceRecordCount = Ext.getCmp('forReviewGrid').getStore().getCount(); - var alreadyJoinVirtualBasket = true;//是否加入虚拟篮筐 - for(var i = 0;i < tousseInstanceRecordCount;i++){ - var virtualBasketSeqNum = Ext.getCmp('forReviewGrid').getStore().getAt(i).get('virtualBasketSeqNum'); - if(!virtualBasketSeqNum || virtualBasketSeqNum == ''){ - showResult('请先扫描灭菌篮筐' , null , sstsConfig.messagePauseTimeOnReviewPage); - return; + if(!sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){ + if ((sstsConfig.mustScanBasketForTousseReview && isFirstRoomPeople) || (sstsConfig.mustScanBasketForTousseReviewOf2ndSupplyRoom && !isFirstRoomPeople)){ + if (isObjEmpty(basketName)) { + //判断所扫器械包是否已全部加入至虚拟篮筐,如存在有未加入虚拟篮筐的器械包则进行提示,否则通过 + var tousseInstanceRecordCount = Ext.getCmp('forReviewGrid').getStore().getCount(); + var alreadyJoinVirtualBasket = true;//是否加入虚拟篮筐 + for(var i = 0;i < tousseInstanceRecordCount;i++){ + var virtualBasketSeqNum = Ext.getCmp('forReviewGrid').getStore().getAt(i).get('virtualBasketSeqNum'); + if(!virtualBasketSeqNum || virtualBasketSeqNum == ''){ + showResult('请先扫描灭菌篮筐' , null , sstsConfig.messagePauseTimeOnReviewPage); + return; + } } } }