Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r33943 -r33974 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33943) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33974) @@ -173,14 +173,15 @@ var recycleAmountNeedConfirm = result.data[i].recycleAmountNeedConfirm; var departName = result.data[i].depart; var confirmRecyclingAmount = getSystemSetConfig('confirmRecyclingAmount', false); + var specialInfection = result.data[i].specialInfection || ''; var recyclingTimes = result.data[i].recyclingTimes; var haveUnRecycling = result.data[i].haveUnRecycling; //根据状态修改背景颜色 var trColor = ''; if (status == '未确认') { trColor = 'bgcolor="#FF8C69"'; } - + if (confirmRecyclingAmount && recycleAmountNeedConfirm == '是' || result.data[i].recyclingStatus == '部分回收' || (haveUnRecycling && sstsConfig.enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount)) { trColor = 'bgcolor="yellow"'; } @@ -200,7 +201,6 @@ if (sstsConfig.enablePackingSerialNum) { tbodyHtml += '