Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r28506 -r28615 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 28506) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 28615) @@ -455,7 +455,7 @@ trColor = 'bgcolor="#FF8C69"'; } - if(confirmRecyclingAmount && recycleAmountNeedConfirm == '是' || result.data[i].recyclingApplication.recyclingStatus == '部分回收'){ + if(confirmRecyclingAmount && recycleAmountNeedConfirm == '是' || result.data[i].recyclingStatus == '部分回收'){ trColor = 'bgcolor="yellow"'; } @@ -474,7 +474,7 @@ +''; if(sstsConfig.showORRoomColumnInHistoryRecyclingRecordList){ - recyclingRecordStr+='
'+result.data[i].recyclingApplication.operationRoom + '
' + recyclingRecordStr+='
'+result.data[i].operationRoom + '
' } recyclingRecordStr+='
'+dateObjFormat(result.data[i].applySubmintDateTime) +'
'+ result.data[i].remark +'
'; @@ -483,7 +483,7 @@ $("#recyclingRecordTable").append(recyclingRecordElement); idArray.push(result.data[i].id); if(sstsConfig.enableUrgentFunction){ - if(result.data[i].recyclingApplication.urgentLevel.id != 0){//有背景色,白色图标加急等级 + if(result.data[i].includingUrgent){//有背景色,白色图标加急等级 //$(".urgent-red").show(); $("#img-urgent-red-"+i).show(); }