Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r31193 -r31240 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 31193) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 31240) @@ -365,14 +365,20 @@ rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className; } var remark = record.get('remark'); - if (sstsConfig.colorChangeRuleOfInvoicPlanToSendGoodsList == '2' && (remark.indexOf("借物单") != -1 || record.get('status') == '已灭菌')){ + if (sstsConfig.colorChangeRuleOfInvoicPlanToSendGoodsList == '2' && record.get('status') == '已灭菌'){ var result = ""; result += "
"; result += "" + v + ""; result += "
"; - }else { + }else if (sstsConfig.colorChangeRuleOfInvoicPlanToSendGoodsList !== '2' && remark.indexOf("借物单") != -1){ + var colorClassName = 'BorrowColor'; var result = ""; + result += "
"; result += "" + v + ""; + result += "
"; + }else{ + var result = ""; + result += "" + v + ""; } return result; } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp =================================================================== diff -u -r31187 -r31240 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 31187) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 31240) @@ -17,7 +17,7 @@ 发货计划单管理