Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r31260 -r31264 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 31260) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 31264) @@ -158,31 +158,28 @@ rowClassName = 'my_row_red'; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className ){ - rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className; + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.className || ''; rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.overFulled.color || ''; } }else if(record.data.errorAmount > 0 && record.data.errorAmount < record.data.count){ rowClassName = 'my_row_blue'; //已扫码但是未扫满的背景色 if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull.className ){ //由配置项自定义颜色 - rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull.className; + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull.className || ''; rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanBeforeFull.color || ''; } }else if(record.data.errorAmount == 0){ //扫码扫满的背景色 rowClassName = 'my_row_green'; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled.className ){ //由配置项自定义颜色 - rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled.className; + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled.className || ''; rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.scanFulled.color || ''; } }else{ @@ -201,18 +198,16 @@ rowClassName = 'my_row_blue'; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className ){ - rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className; + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className || ''; rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.color || ''; } }else { rowClassName = 'my_row_yellow'; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className ){ - rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className; + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className || ''; rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.color || ''; } } @@ -222,10 +217,9 @@ rowClassName = 'my_row_yellow'; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.className ){ //由配置项自定义颜色 - rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.className; + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.className || ''; rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.color || ''; } } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r31261 -r31264 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 31261) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 31264) @@ -362,10 +362,9 @@ var rowColor = ''; if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor - && sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className ){ - rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className; - rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.color; + rowClassName = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className || ''; + rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.color || ''; } var remark = record.get('remark'); if (colorChangeRuleOfInvoicPlanToSendGoodsList == 2 && record.get('status') == '已灭菌'){ @@ -549,7 +548,7 @@ {header : "待发",dataIndex : 'count',width : 50, menuDisabled: true}, {header : '加急',id : 'urgentAmount',dataIndex : 'urgentAmount',width : 50,value : 0, menuDisabled: true, renderer : function(v, p, record){ return renderFunction(v, p, record, '加急'); - }}, + }} ]); var rightGrid = new Ext.grid.EditorGridPanel({