Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r27607 -r27612 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 27607) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 27612) @@ -2470,37 +2470,31 @@ } }else{ //未扫码的背景色 - //判断是否全是今天申请的;如果同一种物品,内含今天申请的和非今天申请的,则为黄色,不然为白色(无底色) - if(record.json.beforeToday == true){ - if(record.json.status == '加急'){ - rowColor = 'my_row_red'; - if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className - ){ - rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className; - } - }else if(record.json.status == '已灭菌'){ - rowColor = 'my_row_blue'; - if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor.className - ){ - rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor.className; - } - }else { - rowColor = 'my_row_yellow'; - if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor.className - ){ - rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor.className; - } + if(record.json.status == '加急'){ + rowColor = 'my_row_red'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className + ){ + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className; } + }else if(record.json.status == '已灭菌'){ + rowColor = 'my_row_blue'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor.className + ){ + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.SterilizedColor.className; + } + }else { + rowColor = 'my_row_yellow'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor.className + ){ + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.UnsterilizedColor.className; + } } - if(record.json.beforeToday == false){ - rowColor = 'my_row_white'; - } } return rowColor; }