Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r29001 -r29108 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29001) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29108) @@ -4052,25 +4052,29 @@ //回收物品清单 var recyclingTousses = []; var isPartIntheBasket = false; + var tousseTypeisForeignTousseDefinition = false; $('#tousseItemTable').children().first().children().each(function(index,element){ if($('#deleted'+index).val() == '0'){ var tousseName = $('#tousseName'+index).val(); var recyclingAmount = parseInt($('#recycleAmount'+index).val(),10); - var loadedAmount = parseInt($('#loadedAmount'+index).val(),10); + var loadedAmount = parseInt($('#loadedAmount'+index).val(),10); + var tousseType = $('#tousseType'+index).val(); if(recyclingAmount > 0){ //有回收,那加入回收物品清单 recyclingTousses.push({tousseName:tousseName,recyclingAmount:recyclingAmount}); } if(recyclingAmount > loadedAmount){ - isPartIntheBasket = true; + isPartIntheBasket = true; + if(tousseType == '外来器械包'){ + tousseTypeisForeignTousseDefinition = true; + } return false; } } }); - //部分入筐提示 if(isPartIntheBasket){ - if(sstsConfig.enablePartRecycle == true){ + if(sstsConfig.enablePartRecycle == true && !tousseTypeisForeignTousseDefinition){ dialogConfirm("还有部分器械包未装入篮筐,是否继续保存?",function(){ if(sstsConfig.showRecyclingDetail && recyclingTousses.length > 0){ showRecyclingDetail(recyclingTousses,function(){ @@ -4092,6 +4096,7 @@ checkAutoReturnBorrowing(confirmation,saveAndNew,print,recyclingAmountConfirm); } } + return; } }