Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28638 -r28686 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28638) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28686) @@ -1701,11 +1701,8 @@ $('#departCode').val(msg.tousseInstance.location) } var tousseDepart = isUndefinedOrNullOrEmpty(msg.tousseInstance.locationForDisplay2)?msg.tousseInstance.locationForDisplay:msg.tousseInstance.locationForDisplay2; - // 对于已废弃的包,不检查其位置和所属科室的信息 - if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').attr('value') != tousseDepart && msg.tousseInstance.status != '已废弃'){ - alertDiv('该器械包不属于该科室。'); - }else{ - var ti = msg.tousseInstance; + // 对于已废弃的包,不检查其位置和所属科室的信息 + var ti = msg.tousseInstance; var td = ti.tousseDefinition; if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#useRecordId').val() != ''){ var existRow = tousseItemExists(td.id, td.name, td.tousseType); @@ -1774,7 +1771,6 @@ } }); } - } } checkLoadedAmount(); }else if(msg.user != null){