Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r34365 -r34366 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 34365) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 34366) @@ -187,36 +187,32 @@ if (result.data[i].recyclingStatus == '部分回收' || (haveUnRecycling && sstsConfig.enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount)) { trColor = 'bgcolor="yellow"'; } - - if(confirmRecyclingAmount){ - if(recycleAmountNeedConfirm == '是' && status !== '已确认'){ - if(sstsConfig.backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount){ - var config = sstsConfig.backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount; - if(haveUnRecycling && greaterThan){ - if(config.greaterAndLessThanColor){ - trColor = 'bgcolor="'+config.greaterAndLessThanColor+'"'; - }else { - trColor = 'bgcolor="#yellow"'; - } - }else if(haveUnRecycling){ - if(config.lessThanColor){ - trColor = 'bgcolor="'+config.lessThanColor+'"'; - }else { - trColor = 'bgcolor="#yellow"'; - } - }else if(greaterThan){ - if(config.greaterThanColor){ - trColor = 'bgcolor="'+config.greaterThanColor+'"'; - }else { - trColor = 'bgcolor="#yellow"'; - } + + if(confirmRecyclingAmount && recycleAmountNeedConfirm == '是' && status !== '已确认'){ + if(sstsConfig.backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount){ + var config = sstsConfig.backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount; + if(haveUnRecycling && greaterThan){ + if(config.greaterAndLessThanColor){ + trColor = 'bgcolor="'+config.greaterAndLessThanColor+'"'; + }else { + trColor = 'bgcolor="yellow"'; } + }else if(haveUnRecycling){ + if(config.lessThanColor){ + trColor = 'bgcolor="'+config.lessThanColor+'"'; + }else { + trColor = 'bgcolor="yellow"'; + } + }else if(greaterThan){ + if(config.greaterThanColor){ + trColor = 'bgcolor="'+config.greaterThanColor+'"'; + }else { + trColor = 'bgcolor="yellow"'; + } } } }else { - if(haveUnRecycling || greaterThan){ - trColor = 'bgcolor="#FF8C69"'; - } + trColor = 'bgcolor="#FF8C69"'; } if (result.data[i].recyclingApplicationType == '外来器械包申请单' && result.data[i].recyclingStatus == '部分接收') {