Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r31863 -r32174 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 31863) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 32174) @@ -3769,14 +3769,15 @@ var type = data.type; var recyclingStatus = data.recyclingStatus; var deliverStatus = data.deliverStatus; + var printed = data.printed; if ((type == comboApplicationForm || type == tousseApplicationForm || type == diposableGoodsApplicationForm || type == disinfectGoodsApplicationForm || type == reservateionApplicationForm) && deliverStatus != statusArr[2] && (record.data.committedStatus == true || record.data.committedStatus == 'true') - && (!recyclingStatus || recyclingStatus == recycled || (!recyclingStatus && deliverStatus == statusArr[1]))){ //发货状态!=已发货 &&(回收状态=已回收 || 发货状态=部分发货)--注意一次性物品的回收状态为空 + && (!recyclingStatus || (recyclingStatus == recycled || (recyclingStatus == awaitRecycling && printed == 2)) || (!recyclingStatus && deliverStatus == statusArr[1]))){ //发货状态!=已发货 &&(回收状态=已回收 || 发货状态=部分发货)--注意一次性物品的回收状态为空 return ""; } }},