Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r38827 -r38857 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 38827) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 38857) @@ -853,12 +853,11 @@ "是": function () { var delInfo = []; if (actionFunction == 'deleteTousse') { - var tousseDefinitionID = parseInt($('#tousseDefinitionID' + row).val(), 10); - var tdIds = tousseDefinitionID || ''; - tdIds = [tdIds]; + var tousseDefinitionID = parseInt($('#tousseDefinitionID' + row).val(), 10) || ''; + var idCardInstanceBarcodes = $('#idCardInstanceBarcodes' + row).val() || ''; delInfo = [{ classifyBasketId: '', - tdIds: tdIds + tousseArr: [{"tdId":tousseDefinitionID,"idCardInstanceBarcode":idCardInstanceBarcodes}] }]; } else if (actionFunction == 'deleteBasketItem') { var hideElement = $(deleteButton).parent().prev().prev().prev().prev(); @@ -869,34 +868,35 @@ var item = hideElement.val() ? JSON.parse(hideElement.val()) : {}; var classifiedItemId = item.classifiedItemId; var classifyBasketId = basket.classifyBasketId || ''; - var tdIds = item.tousseDefinitionID || ''; - tdIds = [tdIds]; + var tousseDefinitionID = item.tousseDefinitionID || ''; + var idCardBarcode = item.idCardBarcode || ''; if (classifiedItemId == '') { delInfo = []; } else { delInfo = [{ classifyBasketId: classifyBasketId, - tdIds: tdIds + tousseArr: [{"tdId":tousseDefinitionID,"idCardInstanceBarcode":idCardBarcode}] }]; } } else { - var tdIds = []; + var tousseArr = []; var ids = []; - var key = 0; - var k = 0; $(deleteButton).parent().parent().find('dl').find('input').each(function () { var item = $(this).val() ? JSON.parse($(this).val()) : {}; + var tousseDefinitionID = item.tousseDefinitionID || ''; + var idCardBarcode = item.idCardBarcode || ''; if (item.classifiedItemId !== '') { - ids[k] = item.classifiedItemId; - k++; + ids.push(item.classifiedItemId) } - tdIds[key] = item.tousseDefinitionID; - key++ + tousseArr.push({ + tdId:tousseDefinitionID, + idCardInstanceBarcode:idCardBarcode + }) }); if (ids.length > 0) { delInfo = [{ classifyBasketId: basketId, - tdIds: tdIds + tousseArr: tousseArr }]; } else { delInfo = [];