Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r30836 -r30838 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 30836) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 30838) @@ -4492,6 +4492,7 @@ var recyclingTousses = []; var isPartIntheBasket = false; var tousseTypeisForeignTousseDefinition = false; + var tousseTypeName = ''; $('#tousseItemTable').children().first().children().each(function(index,element){ if($('#deleted'+index).val() == '0'){ var tousseName = $('#tousseName'+index).val(); @@ -4504,7 +4505,8 @@ } if(recyclingAmount > loadedAmount){ isPartIntheBasket = true; - if(tousseType == '外来器械包' && !sstsConfig.enableForeignToussePartRecycle){ + tousseTypeName = tousseType; + if(tousseType == '外来器械包' && sstsConfig.enableForeignToussePartRecycle){ tousseTypeisForeignTousseDefinition = true; } return false; @@ -4513,7 +4515,7 @@ }); //部分入筐提示 if(isPartIntheBasket){ - if(sstsConfig.enablePartRecycle == true && !tousseTypeisForeignTousseDefinition){ + if(sstsConfig.enablePartRecycle == true && tousseTypeName !== "外来器械包"){ dialogConfirm("还有部分器械包未装入篮筐,是否继续保存?",function(){ if(sstsConfig.showRecyclingDetail && recyclingTousses.length > 0){ showRecyclingDetail(recyclingTousses,function(){ @@ -4523,6 +4525,16 @@ checkAutoReturnBorrowing(confirmation,saveAndNew,print,recyclingAmountConfirm); } }); + }else if(tousseTypeisForeignTousseDefinition == true){ + dialogConfirm("还有部分器械包未装入篮筐,是否继续保存?",function(){ + if(sstsConfig.showRecyclingDetail && recyclingTousses.length > 0){ + showRecyclingDetail(recyclingTousses,function(){ + checkAutoReturnBorrowing(confirmation,saveAndNew,print,recyclingAmountConfirm); + }); + }else{ + checkAutoReturnBorrowing(confirmation,saveAndNew,print,recyclingAmountConfirm); + } + }); }else{ alertDiv('还有部分器械包未装入容器,不能保存。'); } Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js =================================================================== diff -u -r27199 -r30838 --- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 27199) +++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js (.../config.js) (revision 30838) @@ -116,6 +116,10 @@ packingPageReviewerDefaultLastReviewer: true, //基数管理开始查询的日期 startDateOfDepartmentStock:'2030-07-11 00:00:00', + //允许外来器械包部分回收 + enableForeignToussePartRecycle:true, + //允许部分回收 + enablePartRecycle:true, //禁用基数限制 disableCardinalNumLimit: true } \ No newline at end of file