Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r16132 -r16469 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 16132) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 16469) @@ -27,7 +27,7 @@ .blank20 {clear:both; height:20px; display:block; font-size:1px;overflow:hidden;} .blank40 {clear:both; height:40px; display:block; font-size:1px;overflow:hidden;} -.mbody{ background:url(body_bg.jpg) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative} +.mbody{ background:url(body_bg.jpg) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative;margin-top: -16px;} .add-form{ position:absolute; width:855px; height:151px; top:233px; left:175px} .add-form div{ position:absolute;} .add-form .input{ background:url(pic_bg.jpg) no-repeat 0 -135px; width:272px; height:42px; border:0px; font-size:26px; padding:10px 10px; line-height:40px;} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r16252 -r16469 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 16252) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 16469) @@ -1663,7 +1663,7 @@ alert("空白的回收单不能保存!"); return false; } - + var isEmptyFormSubmit = true; $('#tousseItemTable').children().first().children().each(function(index,element){ if($('#deleted'+index).val() == '0'){ isThereTousseItems = true; @@ -1677,10 +1677,15 @@ return false; } - if(recyclingAmount > loadedAmount){ + if(loadedAmount > 0 && recyclingAmount > loadedAmount){ isAllTousseInTheBasket = false; return false; } + + if(loadedAmount > 0){ + isEmptyFormSubmit = false; + } + //标识牌丢失验证 var isIDCard = $('#isThereIdentificationCard'+index).val(); if(isIDCard == '是'){ @@ -1709,9 +1714,14 @@ } if(!isAllTousseInTheBasket){ - alertDiv('还有部分器械包未装入容器,不能保存。'); + alertDiv('还有部分器械包未装入篮筐,不能保存。'); return false; } + + if(isEmptyFormSubmit){ + alertDiv("不能保存空的回收单!"); + return false; + } //验证清点人是否为空(前提为配置清点人强制不能为空,默认为允许为空) if(sstsConfig.recyclePageOperatorNotNull == true && $("#operator").val() == ''){