Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r38671 -r38827 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 38671) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 38827) @@ -358,10 +358,48 @@ document.getElementById('saveApplicationTousseSplitByOrgUnit').addEventListener('click', function () { var k = 0; var splitTousseArray = []; + var sumAmountMap = {}; + var tousseArrayMap = {}; $('.saveTousseTable').find('.isSplit').each(function (item) { var isSplit = $(this).find('input:checked').val(); var tousseName = $(this).parent().find('td').eq(0).text(); var amount = parseInt($(this).parent().find('td').eq(1).text()); + if (isSplit == 'true') { + if(sumAmountMap[tousseName]){ + sumAmountMap[tousseName] += amount; + }else { + sumAmountMap[tousseName] = amount; + } + } + }) + for (var j = 0; j < tousseArray.length; j++) { + var tousseName = tousseArray[j].tousseName; + var amount = tousseArray[j].amount; + if(tousseArrayMap[tousseName]){ + tousseArrayMap[tousseName] += amount; + }else { + tousseArrayMap[tousseName] = amount; + } + } + var isAlert = false; + var showTousseName = ''; + for(var item in sumAmountMap){ + var amount = sumAmountMap[item]; + if(tousseArrayMap[item] && tousseArrayMap[item] < amount){ + showTousseName = item; + isAlert = true; + continue + } + } + if(isAlert){ + layer.closeAll(); + alertDiv(showTousseName + '拆分数量不能大于回收数量'); + return + } + $('.saveTousseTable').find('.isSplit').each(function (item) { + var isSplit = $(this).find('input:checked').val(); + var tousseName = $(this).parent().find('td').eq(0).text(); + var amount = parseInt($(this).parent().find('td').eq(1).text()); var depart = $(this).parent().find('td').eq(2).text(); if (isSplit == 'true') { splitTousseArray[k] = {