Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r41367 -r41374 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 41367) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 41374) @@ -2315,9 +2315,9 @@ width1 = 75; width2 = 40; } else { - width0 = 195; - width1 = 70; - width2 = 50; + width0 = 180; + width1 = 80; + width2 = 60; } var recyclingapplicationCm = new Ext.grid.ColumnModel([ @@ -2422,15 +2422,15 @@ } } }, - { header: "物品名称", align: 'center', dataIndex: 'showTousseName', width: windowW < 1280 ? 195 : 320, menuDisabled: true }, + { header: "物品名称", align: 'center', dataIndex: 'showTousseName', width: windowW < 1280 ? 180 : 310, menuDisabled: true }, { header: "name", dataIndex: 'name', hidden: true, menuDisabled: true }, - { header: "批次/灭菌日期", align: 'center', dataIndex: 'batchNumber', width: 90, menuDisabled: true }, + { header: "批次/灭菌日期", align: 'center', dataIndex: 'batchNumber', width: 110, menuDisabled: true }, { header: "灭菌炉名称", dataIndex: 'sterilizerName', width: 150, menuDisabled: true, hidden: true }, - { header: "炉次", dataIndex: 'frequency', width: 55, menuDisabled: true, hidden: true }, + { header: "炉次", dataIndex: 'frequency', width: 60, menuDisabled: true, hidden: true }, { id: 'diposable', header: "是否一次性材料", dataIndex: 'diposable', hidden: true, width: 150 }, - { header: "单价", dataIndex: 'fluctuationPrice', width: 50, align: 'right', menuDisabled: true }, + { header: "单价", dataIndex: 'fluctuationPrice', width: 60, align: 'right', menuDisabled: true }, { - header: "数量", dataIndex: 'count', width: 50, align: 'right', menuDisabled: true, + header: "数量", dataIndex: 'count', width: 60, align: 'right', menuDisabled: true, editor: new Ext.form.NumberField({ allowBlank: false, allowNegative: false, Index: ssts-web/src/main/webapp/common/common.css =================================================================== diff -u -r31837 -r41374 --- ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 31837) +++ ssts-web/src/main/webapp/common/common.css (.../common.css) (revision 41374) @@ -1,11 +1,13 @@ /*红*/ .my_row_red div{ background-color: #ff0000 !important; + color: #fff; } /*橙红*/ .my_row_orangeRed div{ background-color: #ff3300 !important; + color: #fff; } /*橙*/ @@ -31,6 +33,7 @@ /*绿*/ .my_row_green div{ background-color: #009900 !important; + color: #fff; } /*蓝绿*/ @@ -41,6 +44,7 @@ /*蓝*/ .my_row_blue div{ background-color: #3399cc !important; + color: #fff; } /*蓝紫*/