Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r32465 -r32472 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32465) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32472) @@ -4545,6 +4545,7 @@ return newArr; } + /** * 获取此次回收的数据. * @param confirmation @@ -4575,34 +4576,6 @@ openApplicationTousseSplitByOrgUnit(newTousseArray, tousseArray); return ''; } - // var map = {}, dest = [], arr = [], arr1 = []; - // for (var i = 0, k = 0, z = 0; i < tousseArray.length; i++) { - // var ai = tousseArray[i]; - // if (ai.itemType == '材料' && ai.tousseInstanceBarcode !== '') { - // if (!map[ai.tousseName]) { - // dest.push(tousseArray[i]); - // map[ai.tousseName] = ai; - // } else { - // for (var j = 0; j < dest.length; j++) { - // var dj = dest[j]; - // if (dj.tousseNameForMaterial == ai.tousseNameForMaterial && dj.basketGroupBarcodes == ai.basketGroupBarcodes && dj.basketBarcode == ai.basketBarcode && dj.tousseName == ai.tousseName) { - // dj.tousseAmountForMaterial = dj.tousseAmountForMaterial + dj.tousseAmountForMaterial; - // arr[k] = dj.tousseAmountForMaterial; - // k++; - // break; - // } - // } - // } - // } else if (ai.itemType == '材料' && ai.tousseInstanceBarcode == '') { - // arr1[z] = ai.tousseAmountForMaterial; - // } - // } - // if (arr.length > 0) { - // var len = parseInt(arr[0]) + parseInt(arr1[0] || 0); - // for (var i = 0; i < tousseArray.length; i++) { - // tousseArray[i].tousseAmountForMaterial = len; - // } - // } var paramJson = {}; paramJson.tousseJson = tousseArray; paramJson.splitTousseJson = newSplitTousseArray; @@ -5757,9 +5730,20 @@ $("#basketsUl").empty(); tousseArray = []; }else { - $("#basketsUl li").each(function () { - deleteAction(this); - $(this).remove(); + $('dl[class="sed clearfix"]').each(function () { + var basketEle = $(this).parent().find('input').eq(0).val(); + if (basketEle !== '') { + var basketJSON = eval('(' + basketEle + ')'); + $(this).children().each(function () { + if ($(this).attr('type') == 'hidden') { + var hideValue = $(this).val(); + if (!isUndefinedOrNullOrEmpty(hideValue)) { + var delButton = $(this).next().next().next().next().find('a'); + deleteMaterialItem(delButton, basketJSON.barcode, basketJSON.classifyBasketId); + } + } + }); + } }); } for (var j = 0; j < data.length; j++) {