Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r14573 -r14577 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14573) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14577) @@ -2877,16 +2877,14 @@ color = "yellow"; }else if(statusArr[1] == status){ //部分发货 粉红色 color = "#F5A7FA"; - }/*else if(statusArr[3] == status){//待回收 - color = "orange"; - }*/ + } return "

" + v + "

"; } function renderColor2(v, p, record){ var status = record.data['recyclingStatus']; var color = ""; - if(statusArr[3] == status){//待回收 + if(recyclingStatusArr[3] == status){//待回收 color = "orange"; } return "

" + v + "

"; Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r14490 -r14577 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 14490) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 14577) @@ -207,18 +207,21 @@ SSTS_ReturnEditRecyclingApplication = false; +//回收状态数组 var recyclingStatusArr = new Array(); recyclingStatusArr.push('<%=InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE%>'); recyclingStatusArr.push('<%=InvoicePlan.RECYCLINGSTATUS_RECYCLED%>'); recyclingStatusArr.push('<%=InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE%>'); recyclingStatusArr.push('<%=InvoicePlan.STATUS_END%>'); +//发货状态数组 var statusArr = new Array(); statusArr.push('<%=InvoicePlan.DELIVERSTATUS_AWAITDELIVER%>'); statusArr.push('<%=InvoicePlan.DELIVERSTATUS_PARTDELIVERED%>'); statusArr.push('<%=InvoicePlan.DELIVERSTATUS_DELIVERED%>'); statusArr.push('<%=InvoicePlan.STATUS_END%>'); +//归还状态数组 var returnStatusArr = new Array(); returnStatusArr.push('<%=InvoicePlan.RETURN_STATUS_UNRETURNED%>'); returnStatusArr.push('<%=InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED%>');