From 9edfa0c5b84f8d93d8c06f5e8efc1d9e2afddd8c Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 9 Apr 2026 10:48:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B8=82=E5=9C=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA,=20=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Orders.jsx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 {
                   </div> : null}
                 </span>
               ),
-              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) => <NavLink to={`/orders_sub/${orders_store.active_tab_key}/${record.OrderTypeSN}/${encodeURIComponent(record.OrderType)}`}>{text}</NavLink>,
@@ -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) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.OrderCount} diffPercent={r.OrderCount_vs} diffData={r.OrderCount_diff} />,
             },
@@ -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) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJCount} diffPercent={r.CJCount_vs} diffData={r.CJCount_diff} />,
             },
@@ -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) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJPersonNum} diffPercent={r.CJPersonNum_vs} diffData={r.CJPersonNum_diff} />,
             },
@@ -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) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJrate} diffPercent={r.CJrate_vs} diffData={r.CJrate_diff} />,
             },
@@ -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) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.YJLY} diffPercent={r.YJLY_vs} diffData={r.YJLY_diff} />,
             },
@@ -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) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.Ordervalue} diffPercent={r.Ordervalue_vs} diffData={r.Ordervalue_diff} />,
             },