diff --git a/src/views/Orders.jsx b/src/views/Orders.jsx index ed84861..a023dc7 100644 --- a/src/views/Orders.jsx +++ b/src/views/Orders.jsx @@ -71,9 +71,11 @@ class Orders extends Component { : null} ), - titleX: showDiff ? `${date_picker_store.start_date.format(config.DATE_FORMAT)}~${date_picker_store.end_date.format(config.DATE_FORMAT)} vs ${date_picker_store.start_date_cp.format( - config.DATE_FORMAT - )}~${date_picker_store.end_date_cp.format(config.DATE_FORMAT)}` : `${date_picker_store.start_date.format(config.DATE_FORMAT)}~${date_picker_store.end_date.format(config.DATE_FORMAT)}`, + titleX: showDiff ? `${ + date_picker_store.start_date.format(config.DATE_FORMAT)}~${date_picker_store.end_date.format(config.DATE_FORMAT) + } vs ${ + date_picker_store.start_date_cp.format(config.DATE_FORMAT)}~${date_picker_store.end_date_cp.format(config.DATE_FORMAT) + }` : `${date_picker_store.start_date.format(config.DATE_FORMAT)}~${date_picker_store.end_date.format(config.DATE_FORMAT)}`, dataIndex: 'OrderType', fixed: 'left', render: (text, record) => {text}, @@ -93,7 +95,7 @@ class Orders extends Component { diffData={ordercountTotal1?.OrderCount_diff} /> ), - titleX: [ordercountTotal1.OrderCount, ordercountTotal2.OrderCount].join(' vs '), + titleX: [ordercountTotal1.OrderCount, ordercountTotal2.OrderCount].filter(s => s).filter(s => s).join(' vs '), dataIndex: 'OrderCount', render: (text, r) => , }, @@ -112,7 +114,7 @@ class Orders extends Component { diffData={ordercountTotal1?.CJCount_diff} /> ), - titleX: [ordercountTotal1.CJCount, ordercountTotal2.CJCount].join(' vs '), + titleX: [ordercountTotal1.CJCount, ordercountTotal2.CJCount].filter(s => s).join(' vs '), dataIndex: 'CJCount', render: (text, r) => , }, @@ -131,7 +133,7 @@ class Orders extends Component { diffData={ordercountTotal1?.CJPersonNum_diff} /> ), - titleX: [ordercountTotal1.CJPersonNum, ordercountTotal2.CJPersonNum].join(' vs '), + titleX: [ordercountTotal1.CJPersonNum, ordercountTotal2.CJPersonNum].filter(s => s).join(' vs '), dataIndex: 'CJPersonNum', render: (text, r) => , }, @@ -150,7 +152,7 @@ class Orders extends Component { diffData={ordercountTotal1?.CJrate_diff} /> ), - titleX: [ordercountTotal1.CJrate, ordercountTotal2.CJrate].join(' vs '), + titleX: [ordercountTotal1.CJrate, ordercountTotal2.CJrate].filter(s => s).join(' vs '), dataIndex: 'CJrate', render: (text, r) => , }, @@ -169,7 +171,7 @@ class Orders extends Component { diffData={ordercountTotal1?.YJLY_diff} /> ), - titleX: [ordercountTotal1.YJLY, ordercountTotal2.YJLY].join(' vs '), + titleX: [ordercountTotal1.YJLY, ordercountTotal2.YJLY].filter(s => s).join(' vs '), dataIndex: 'YJLY', render: (text, r) => , }, @@ -189,7 +191,7 @@ class Orders extends Component { diffData={ordercountTotal1?.Ordervalue_diff} /> ), - titleX: [ordercountTotal1.Ordervalue, ordercountTotal2.Ordervalue].join(' vs '), + titleX: [ordercountTotal1.Ordervalue, ordercountTotal2.Ordervalue].filter(s => s).join(' vs '), dataIndex: 'Ordervalue', render: (text, r) => , },