Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r13853 -r13884 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 13853) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 13884) @@ -669,7 +669,7 @@ if(parseInt($('#loadedAmount'+row).val(),10) == parseInt($('#recycleAmount'+row).val(),10)){ document.getElementById('showTousseName' + row).className = 'input-a-yellow'; }else{ - document.getElementById('showTousseName' + row).className = 'input-a-yellow3'; + document.getElementById('showTousseName' + row).className = 'input-a-yellow3'; } }else{ var param = "{tousseDefinitionID:" + tousseDefinitionID + ",tousseName:'" + tousseName + "'}"; @@ -820,7 +820,24 @@ alertDiv('回收数量不能为空。'); return false; } + + var submitCheckFaildMsg = ""; + $('#tousseItemTable').children().first().children().each(function(i,element){ + var recycleAmount = parseInt($('#recycleAmount'+i).val(),10); + var loadAmount = parseInt($('#loadedAmount'+i).val(),10); + if(loadAmount > 0 && recycleAmount > loadAmount){ + var depart = $('#depart'+i).val(); + var showTousseName = $('#showTousseName'+i).val(); + submitCheckFaildMsg = (depart+" 的 "+showTousseName+" 还有 "+(recycleAmount-loadAmount)+" 个未放入篮筐。"); + return false; + } + }); + if(submitCheckFaildMsg != ""){ + alertDiv(submitCheckFaildMsg); + return false; + } + var isBasketEmpty = false; $("#basketsUl").children().each(function(){ var id = null; @@ -985,26 +1002,11 @@ var tousseInstanceIds = document.getElementById('tousseInstanceIds').value; var recyclingErrors = ""; var recyclingDamage = ""; - var submitCheckFaildMsg = ""; - $('#tousseItemTable').children().first().children().each(function(i,element){ - var recycleAmount = parseInt($('#recycleAmount'+i).val(),10); - var loadAmount = parseInt($('#loadedAmount'+i).val(),10); - if(loadAmount > 0 && recycleAmount > loadAmount){ - var depart = $('#depart'+i).val(); - var showTousseName = $('#showTousseName'+i).val(); - submitCheckFaildMsg = (depart+" 的 "+showTousseName+" 还有 "+(recycleAmount-loadAmount)+" 个未放入篮筐。"); - return false; - } - }); - if(submitCheckFaildMsg != ""){ - alertDiv(submitCheckFaildMsg); - return false; - } - alertDiv("保存中,请稍候......", true); maxLen = array.length; + submintApplication(0); } }