Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r32104 -r32881 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 32104) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 32881) @@ -185,8 +185,23 @@ }else{ //加急 if(record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode !== ''){ - rowClassName = 'my_row_red'; - rowClassName = getClassNameForColor(record.json.maxUrgentLevel.colorCode,'_info'); + if(record.json.status == '已灭菌'){ + rowClassName = 'my_row_blue'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor + ){ + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className || ''; + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.color || ''; + } + }else { + rowClassName = 'my_row_yellow'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor + ){ + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className || ''; + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.color || ''; + } + } return { rowClassName:rowClassName, rowColor:rowColor @@ -239,11 +254,17 @@ var content = ''; if(name == '紧急程度'){ if(sstsConfig.enableUrgentFunction && record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode != undefined){ + rowColor = record.json.maxUrgentLevel.colorCode; content = record.json.maxUrgentLevel.name; }else { content = ''; } }else if(name == '加急' || name == '误差' || name == '库存'){ + if(name == '加急'){ + if(sstsConfig.enableUrgentFunction && record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode != undefined){ + rowColor = record.json.maxUrgentLevel.colorCode; + } + } if (v == null || v.length <= 0){ content = (name == '库存')?'':0 }else{