Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r37043 -r37161 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 37043) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 37161) @@ -454,11 +454,15 @@ } return null; } - function buildToolTip(tousses) { + function buildToolTip(tousses,isHistoryRecord) { if (tousses && tousses.length) { var len = tousses.length; + var tableBackgroundColor = '#F0F7EF'; + if(isHistoryRecord){ + tableBackgroundColor = 'rgb(183, 217, 165)'; + } var toolTip = "
物品名称 | 数量 | "; if (sstsConfig.enableUrgentFunction) {//加急等级及数量 toolTip += "加急数量 | 加急等级 | "; @@ -470,7 +474,13 @@ } toolTip += "
" + tousses[i].name + " | " + tousses[i].amount + " | "; + var backgroundColor = '#F0F7EF'; + if(tousses[i].recyclingStatus == '已回收' && !isHistoryRecord){ + backgroundColor = 'rgb(183, 217, 165)'; + }else if(isHistoryRecord){ + backgroundColor = 'rgb(183, 217, 165)'; + } + toolTip += "||
" + tousses[i].name + " | " + tousses[i].amount + " | "; if (sstsConfig.enableUrgentFunction) {//加急等级及数量 toolTip += "" + tousses[i].urgentAmount + " | "; if (tousses[i].urgentLevel == undefined || tousses[i].urgentLevel == null || tousses[i].urgentLevel == "") { @@ -541,7 +551,7 @@ editIdDetails.length = 0; for (var i = 0; i < appLength; ++i) { - var toolTip = buildToolTip(jsonArray[i].tousses); + var toolTip = buildToolTip(jsonArray[i].tousses,isHistoryRecord); if (toolTip) { var obj = new Object(); obj.id = jsonArray[i].id;