Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r29194 -r29195 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 29194) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 29195) @@ -595,13 +595,15 @@ function refreshBasketTotalNum(liElement){ if(liElement){ var total = 0; + var sumCount = parseInt(liElement.find('span.hiddenSumCountValue').text() || 0); liElement.find('dd.num').each(function(){ var num = parseInt($(this).html()); if(num){ total += num; } }); - liElement.find('font.totalnum').html(total); + liElement.find('.totalnum').html(total); + liElement.find('.sumCount').html(sumCount+parseInt(total)); } } /** @@ -791,6 +793,7 @@ basketElement += ''+basketItem.containerName+''+''+imageButton+''; if(basketItem.sumCount) { basketElement += '0/'+basketItem.sumCount+''; + basketElement += ' '; }else { basketElement += '' + 0 + ''; } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r29192 -r29195 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 29192) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 29195) @@ -633,7 +633,7 @@ if(recycleAmount == parseInt($('#loadedAmount'+row).val(),10) && recycleAmount >= applicationAmount){ deleteTousseItem(row); } - inputSuccess = true; + inputSuccess = true; } }else{ alertDiv('请先扫描篮筐条码。'); @@ -1123,13 +1123,15 @@ function refreshBasketTotalNum(liElement){ if(liElement){ var total = 0; + var sumCount = parseInt(liElement.find('span.hiddenSumCountValue').text() || 0); liElement.find('dd.materialNum').each(function(){ var num = parseInt($(this).html()); if(num){ total += num; } }); - liElement.find('font.totalnum').html(total); + liElement.find('.totalnum').html(total); + liElement.find('.sumCount').html(sumCount+parseInt(total)); } } /** @@ -1279,8 +1281,13 @@ basketElement += '删除'; basketElement += ''; basketElement += ''; - basketElement += '