Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r16777 -r16940 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 16777) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 16940) @@ -1821,27 +1821,31 @@ }); //部分入筐提示 if(isPartIntheBasket){ - $("#dialogConfirm").dialog({ - resizable: false, - height:310, - width:600, - modal: true, - open: function() { - $("#confirmMsg").text("还有部分器械包未装入篮筐,是否继续保存?"); - }, - close: function() { - $("#confirmMsg").text(""); - }, - buttons: { - "是": function() { - submitFormFunction(confirmation,saveAndNew); - $( this ).dialog( "close" ); - }, - "否": function() { - $( this ).dialog( "close" ); - } - } - }); + if(sstsConfig.enablePartRecycle == true){ + $("#dialogConfirm").dialog({ + resizable: false, + height:310, + width:600, + modal: true, + open: function() { + $("#confirmMsg").text("还有部分器械包未装入篮筐,是否继续保存?"); + }, + close: function() { + $("#confirmMsg").text(""); + }, + buttons: { + "是": function() { + submitFormFunction(confirmation,saveAndNew); + $( this ).dialog( "close" ); + }, + "否": function() { + $( this ).dialog( "close" ); + } + } + }); + }else{ + alertDiv('还有部分器械包未装入容器,不能保存。'); + } }else{ submitFormFunction(confirmation,saveAndNew); } Index: ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js =================================================================== diff -u -r16873 -r16940 --- ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js (.../config.js) (revision 16873) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js (.../config.js) (revision 16940) @@ -89,5 +89,7 @@ //使用记录是否启用是否真正使用的功能。如果是否真正使用属性为否,则需要转换申请单 enableActualUsed:true, //借物单申请是否使用黑白名单过滤(目前只支持器械包) - borrowIsUseBwList : true + borrowIsUseBwList : true, + //允许部分回收 + enablePartRecycle : true } \ No newline at end of file