Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r26289 -r26303 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 26289) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 26303) @@ -2398,17 +2398,44 @@ var rowColor; if(record.data.errorAmount < 0){ rowColor = 'my_row_red'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className + ){ + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className; + } }else if(record.data.errorAmount > 0 && record.data.errorAmount < record.data.count){ - //已扫码但是未扫满的背景色 rowColor = 'my_row_blue'; + //已扫码但是未扫满的背景色 + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull.className + ){ + //由配置项自定义颜色 + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull.className; + } }else if(record.data.errorAmount == 0){ //扫码扫满的背景色 rowColor = 'my_row_green'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled.className + ){ + //由配置项自定义颜色 + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled.className; + } }else{ //未扫码的背景色 //判断是否全是今天申请的;如果同一种物品,内含今天申请的和非今天申请的,则为黄色,不然为白色(无底色) if(record.json.beforeToday == true){ rowColor = 'my_row_yellow'; + if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday + && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.className + ){ + //由配置项自定义颜色 + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.className; + } } if(record.json.beforeToday == false){ rowColor = 'my_row_white'; Index: ssts-web/src/main/webapp/common/common.css =================================================================== diff -u -r26008 -r26303 --- ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 26008) +++ ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 26303) @@ -1,27 +1,77 @@ +/*红*/ +.my_row_red div{ + background-color: #ff0000 !important; +} + +/*橙红*/ +.my_row_orangeRed div{ + background-color: #ff3300 !important; +} + +/*橙*/ +.my_row_orange div{ + background-color: #ff6600 !important; +} + +/*橙黄*/ +.my_row_orangeYellow div{ + background-color: #ff9900 !important; +} + +/*黄*/ .my_row_yellow div{ - background-color: yellow !important; + background-color: #ffff00 !important; } -.my_row_red div{ - background-color: red !important; +/*黄绿*/ +.my_row_yellowGreen div{ + background-color: #99ff00 !important; } +/*绿*/ .my_row_green div{ - background-color: green !important; + background-color: #00ff00 !important; } +/*蓝绿*/ +.my_row_greenBlue div{ + background-color: #00ffff !important; +} + +/*蓝*/ .my_row_blue div{ - background-color: #2584C0 !important; + background-color: #0000ff !important; } +/*蓝紫*/ +.my_row_bluePurple div{ + background-color: #6600ff !important; +} + +/*紫*/ +.my_row_purple div{ + background-color: #ff00ff !important; +} + +/*紫红*/ +.my_row_purpleRed div{ + background-color: #ff0066 !important; +} + +/*白*/ .my_row_white div{ - background-color: #FFFFFF !important; + background-color: #ffffff !important; } +/*黑*/ +.my_row_black div{ + background-color: #000000 !important; +} + .tousse_instance_background_yellow { background-color:yellow !important; } + .tousse_instance_background_red { background-color:#FF7575 !important; -} } \ No newline at end of file