Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r27618 -r27644 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 27618) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 27644) @@ -2470,27 +2470,32 @@ } }else{ //未扫码的背景色 - if(record.json.status == '加急'){ + //加急 + if(record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode !== ''){ rowColor = 'my_row_red'; rowColor = getClassNameForColor(record.json.maxUrgentLevel.colorCode,'_info'); - }else if(record.json.status == '已灭菌'){ + return rowColor; + } + + if(record.json.status == '已灭菌'){ rowColor = 'my_row_blue'; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor.className + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className ){ - rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor.className; + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className; } }else { rowColor = 'my_row_yellow'; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor.className + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className ){ - rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor.className; + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className; } } } + return rowColor; } },