Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r30836 -r30868 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 30836) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 30868) @@ -906,14 +906,13 @@ idArray = new IdArray(); } var len = (msg.length > pageSize)?pageSize:msg.length; - for(var i = 0;i < len ;i++){ var color = "#fff"; - if(msg[i].type == '申请还物单' || msg[i].recyclingStatus == '部分回收'){ + if((msg[i].type == '申请还物单' && msg[i].isPrepareRecycled == 0) || msg[i].recyclingStatus == '部分回收'){ color = 'yellow'; }else if(msg[i].isPrepareRecycled == 1){//预回收,有配置项 color = '#A5D56F'; - } + } var departName = msg[i].depart; if (sstsConfig.showSettleAccountsDepartInRecycling){ departName = msg[i].settleAccountsDepart;