Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_blue_green_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_orange_red_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_purple_red_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_blue_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_red_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_yellow_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/unUrgentBg.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_orange_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_green_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp =================================================================== diff -u -r37504 -r37621 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp (.../setTousseUrgentAmount.jsp) (revision 37504) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp (.../setTousseUrgentAmount.jsp) (revision 37621) @@ -80,7 +80,7 @@ } } } - window.parent.updateUrgentAmount(row,urgentAmount,urgentLevel); + window.parent.updateUrgentAmount(row,urgentAmount,urgentLevel,ulObj.colorCode); } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_purple_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_orange_yellow_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_yellow_green_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/urgentLevelButton/urgent_blue_purple_color.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r37338 -r37621 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37338) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37621) @@ -137,6 +137,37 @@ }); } +//SSZXYY-19:加急按钮的背景色更改为跟随加急等级变化 +function getUrgentColorName(urgentColorVal){ + if (urgentColorVal == "#ff0000") { + return 'urgent_red_color'; + } else if (urgentColorVal == "#ff3300") { + return 'urgent_orange_red_color'; + } else if (urgentColorVal == "#ff6600") { + return 'urgent_orange_color'; + } else if (urgentColorVal == "#ff9900") { + return 'urgent_orange_yellow_color'; + } else if (urgentColorVal == "#ffff00") { + return 'urgent_yellow_color'; + } else if (urgentColorVal == "#99ff00") { + return 'urgent_yellow_green_color'; + } else if (urgentColorVal == "#00ff00") { + return 'urgent_green_color'; + } else if (urgentColorVal == "#00ffff") { + return 'urgent_blue_green_color'; + } else if (urgentColorVal == "#0000ff") { + return 'urgent_blue_color'; + } else if (urgentColorVal == "#6600ff") { + return 'urgent_blue_purple_color'; + } else if (urgentColorVal == "#ff00ff") { + return 'urgent_purple_color'; + } else if (urgentColorVal == "#ff0066") { + return 'urgent_purple_red_color'; + } else { + return 'unUrgentBg' + } +} + // 获取清洗装载状态的篮筐 function getWashLoadingStatusBaskets() { if (sstsConfig.loadWashLoadingStatusBasketsWhenRecycling) { @@ -2877,12 +2908,14 @@ } // 更新加急数量 -function updateUrgentAmount(row, urgentAmount, urgentLevel) { +function updateUrgentAmount(row, urgentAmount, urgentLevel, colorCode) { $('#urgentAmount' + row).val(urgentAmount); $('#urgentAmountDiv' + row).html(urgentAmount); $('#urgentLevel' + row).val(urgentLevel); if (urgentAmount > 0) { - $('#urgentAmountDiv' + row).css("background-image", "url(urgentBg.png)"); + var urgentColorVal = getUrgentColorName(colorCode); + var urgentBg = './1980/urgentLevelButton/'+urgentColorVal+'.png'; + $('#urgentAmountDiv' + row).css("background-image", "url("+urgentBg+")"); if (sstsConfig.enableUrgentFunction) { $('#urgentAmountDiv' + row).html(urgentLevel); } else { @@ -3980,6 +4013,7 @@ * @returns {Boolean} */ function addToussItem(toussItem, appendLast, isScanAddTouss, tid, isFixedBarcode) { + console.log(toussItem) var row = toussItem.row; var tousseItemId = toussItem.tousseItemId; var recyclingItemId = toussItem.recyclingItemId || ''; @@ -3999,6 +4033,8 @@ var packed = toussItem.packed || false; var tousseRemark = isUndefinedOrNullOrEmpty(toussItem.tousseRemark) ? '' : toussItem.tousseRemark; var urgentLevel = toussItem.urgentLevel ? toussItem.urgentLevel : ""; + var colorCode = toussItem.colorCode; + var urgentColorVal = getUrgentColorName(colorCode); var remarkOfApplyGoods = toussItem.remarkOfApplyGoods || ''; var errorDamageQmKey = toussItem.errorDamageQmKey ? toussItem.errorDamageQmKey : ""; //器械包实例或者标识牌实例条码 @@ -4113,7 +4149,8 @@ } } var arr = [row]; - urgentAmountElement += '
' + msg + '
'; + var urgentBg = './1980/urgentLevelButton/'+urgentColorVal+'.png'; + urgentAmountElement += '
' + msg + '
'; } else { //ZSWY-180 packed = false; @@ -6664,6 +6701,7 @@ if (application.applicationItems != null) { var row = 0; canTerminateTousseItemIds = []; + for (var i = 0; i < application.applicationItems.length; ++i) { //申请项 var item = application.applicationItems[i]; @@ -6710,6 +6748,7 @@ operationRoom: operationRoom, remarkOfApplyGoods: item.remarkOfApplyGoods, taskGroup: item.taskGroup, + colorCode: item.colorCode, packed: item.packed }; addToussItem(toussItem, false);