Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r27772 -r27792 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27772) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27792) @@ -454,6 +454,15 @@ amount: amountLeft } deleteTousseItemArray.push(tousse); + //如果主绑物品被删除了,那么也删除对应的次绑物品 + if(unrecycleTousseItemArray.length > 0){ + for(var k = 0; k < unrecycleTousseItemArray.length; k++){ + if(unrecycleTousseItemArray[k].mainBindGoodId == tousseDefinitionID){ + unrecycleTousseItemArray.splice(k,1); + } + } + } + //移除篮筐内物品 $("#basketsUl li").each(function(){ var jsonObj = null; @@ -2504,12 +2513,16 @@ var record = result.data[i]; if(record.isRecycling != '是' || (record.tousseType != PACKAGE_TYPE_INSIDE && record.tousseType != PACKAGE_TYPE_DISINFECTION)){ //不回收的器械包、消毒物品、敷料包,放到不回收器械包集合中,传到后台再添加申请(或者修改申请数量) - var existItem = findBindGoodsItem(record.id); - if(existItem){ - existItem.count = record.count; - }else{ - unrecycleTousseItemArray.push(record); - } + var existItem = findBindGoodsItem(record.id); + if(existItem){ + existItem.count = record.count; + record.mainBindGoodId = params.goodId; + unrecycleTousseItemArray.push(record); + }else{ + record.mainBindGoodId = params.goodId; + unrecycleTousseItemArray.push(record); + } + }else{ var row = tousseItemExists(record.id,record.name,record.tousseType); if(row == -1){