From a2b920b313ff4b7a8b17d22a6fc8e240113a7cab Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 14 Jan 2026 10:44:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20RenderVSDataCell=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biz/BizOrder.jsx             | 33 ++++++++++----------------
 src/views/biz/reports/TrainsUpsell.jsx | 21 ++++++----------
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/views/biz/BizOrder.jsx b/src/views/biz/BizOrder.jsx
index 9db0a6e..adfcf95 100644
--- a/src/views/biz/BizOrder.jsx
+++ b/src/views/biz/BizOrder.jsx
@@ -7,7 +7,7 @@ import * as comm from '@haina/utils-commons';
 import DateGroupRadio from '../../components/DateGroupRadio';
 import SearchForm from '../../components/search/SearchForm';
 import { TableExportBtn } from '../../components/Data';
-import { VSDataTag, } from './../../components/Data';
+import { RenderVSDataCell } from './../../components/Data';
 
 import { observer } from 'mobx-react';
 import { toJS } from 'mobx';
@@ -15,13 +15,6 @@ import { stores_Context } from '../../config';
 import { useShallow } from 'zustand/shallow';
 import useBizOrderStore, { orderCountDataMapper, orderCountDataFieldMapper } from '../../zustand/BizOrder';
 
-const DataRenderCell = ({ data1, data2, dataSuffix = '', showDiffData, ...props }) => {
-  if (showDiffData) {
-    return <VSDataTag data1={data1} data2={data2} dataSuffix={dataSuffix} {...props} />;
-  }
-  return <div>{data1}{dataSuffix}</div>;
-};
-
 const BizOrder = observer(() => {
   const { date_picker_store: searchFormStore } = useContext(stores_Context);
 
@@ -151,7 +144,7 @@ const BizOrder = observer(() => {
         children: [
           {
             title: (
-              <DataRenderCell
+              <RenderVSDataCell
                 showDiffData={showDiff}
                 data1={result.ordercountTotal1?.OrderCount}
                 data2={result.ordercountTotal2?.OrderCount}
@@ -161,7 +154,7 @@ const BizOrder = observer(() => {
             ),
             titleX: [result.ordercountTotal1?.OrderCount, result.ordercountTotal2?.OrderCount].join(' vs '),
             dataIndex: 'OrderCount',
-            render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.OrderCount} diffPercent={r.OrderCount_vs} diffData={r.OrderCount_diff} />,
+            render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.OrderCount} diffPercent={r.OrderCount_vs} diffData={r.OrderCount_diff} />,
           },
         ],
       },
@@ -170,7 +163,7 @@ const BizOrder = observer(() => {
         children: [
           {
             title: (
-              <DataRenderCell
+              <RenderVSDataCell
                 showDiffData={showDiff}
                 data1={result.ordercountTotal1?.CJCount}
                 data2={result.ordercountTotal2?.CJCount}
@@ -180,7 +173,7 @@ const BizOrder = observer(() => {
             ),
             titleX: [result.ordercountTotal1?.CJCount, result.ordercountTotal2?.CJCount].join(' vs '),
             dataIndex: 'CJCount',
-            render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.CJCount} diffPercent={r.CJCount_vs} diffData={r.CJCount_diff} />,
+            render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJCount} diffPercent={r.CJCount_vs} diffData={r.CJCount_diff} />,
           },
         ],
       },
@@ -189,7 +182,7 @@ const BizOrder = observer(() => {
         children: [
           {
             title: (
-              <DataRenderCell
+              <RenderVSDataCell
                 showDiffData={showDiff}
                 data1={result.ordercountTotal1?.CJPersonNum}
                 data2={result.ordercountTotal2?.CJPersonNum}
@@ -199,7 +192,7 @@ const BizOrder = observer(() => {
             ),
             titleX: [result.ordercountTotal1?.CJPersonNum, result.ordercountTotal2?.CJPersonNum].join(' vs '),
             dataIndex: 'CJPersonNum',
-            render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.CJPersonNum} diffPercent={r.CJPersonNum_vs} diffData={r.CJPersonNum_diff} />,
+            render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJPersonNum} diffPercent={r.CJPersonNum_vs} diffData={r.CJPersonNum_diff} />,
           },
         ],
       },
@@ -208,7 +201,7 @@ const BizOrder = observer(() => {
         children: [
           {
             title: (
-              <DataRenderCell
+              <RenderVSDataCell
                 showDiffData={showDiff}
                 data1={result.ordercountTotal1?.CJrate}
                 data2={result.ordercountTotal2?.CJrate}
@@ -218,7 +211,7 @@ const BizOrder = observer(() => {
             ),
             titleX: [result.ordercountTotal1?.CJrate, result.ordercountTotal2?.CJrate].join(' vs '),
             dataIndex: 'CJrate',
-            render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.CJrate} diffPercent={r.CJrate_vs} diffData={r.CJrate_diff} />,
+            render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJrate} diffPercent={r.CJrate_vs} diffData={r.CJrate_diff} />,
           },
         ],
       },
@@ -227,7 +220,7 @@ const BizOrder = observer(() => {
         children: [
           {
             title: (
-              <DataRenderCell
+              <RenderVSDataCell
                 showDiffData={showDiff}
                 data1={result.ordercountTotal1?.YJLY}
                 data2={result.ordercountTotal2?.YJLY}
@@ -237,7 +230,7 @@ const BizOrder = observer(() => {
             ),
             titleX: [result.ordercountTotal1?.YJLY, result.ordercountTotal2?.YJLY].join(' vs '),
             dataIndex: 'YJLY',
-            render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.YJLY} diffPercent={r.YJLY_vs} diffData={r.YJLY_diff} />,
+            render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.YJLY} diffPercent={r.YJLY_vs} diffData={r.YJLY_diff} />,
           },
         ],
       },
@@ -247,7 +240,7 @@ const BizOrder = observer(() => {
         children: [
           {
             title: (
-              <DataRenderCell
+              <RenderVSDataCell
                 showDiffData={showDiff}
                 data1={result.ordercountTotal1?.Ordervalue}
                 data2={result.ordercountTotal2?.Ordervalue}
@@ -257,7 +250,7 @@ const BizOrder = observer(() => {
             ),
             titleX: [result.ordercountTotal1?.Ordervalue, result.ordercountTotal2?.Ordervalue].join(' vs '),
             dataIndex: 'Ordervalue',
-            render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.Ordervalue} diffPercent={r.Ordervalue_vs} diffData={r.Ordervalue_diff} />,
+            render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.Ordervalue} diffPercent={r.Ordervalue_vs} diffData={r.Ordervalue_diff} />,
           },
         ],
       },
diff --git a/src/views/biz/reports/TrainsUpsell.jsx b/src/views/biz/reports/TrainsUpsell.jsx
index 75d3fc5..235a2a9 100644
--- a/src/views/biz/reports/TrainsUpsell.jsx
+++ b/src/views/biz/reports/TrainsUpsell.jsx
@@ -4,7 +4,7 @@ import { Funnel, Pie, Sunburst } from '@ant-design/charts';
 
 import { isEmpty } from '@haina/utils-commons';
 import SearchForm from '../../../components/search/SearchForm';
-import { VSDataTag, } from './../../../components/Data';
+import { RenderVSDataCell } from './../../../components/Data';
 
 import { observer } from 'mobx-react';
 import { toJS } from 'mobx';
@@ -63,13 +63,6 @@ const buildPieData = (data1, data2) => {
   return data01.concat(data02);
 };
 
-const DataRenderCell = ({ data1, data2, dataSuffix = '', showDiffData, ...props }) => {
-  if (showDiffData) {
-    return <VSDataTag data1={data1} data2={data2} dataSuffix={dataSuffix} {...props} />;
-  }
-  return <div>{data1}{dataSuffix}</div>;
-};
-
 const TrainsUpsell = observer(({ ...props }) => {
   const { date_picker_store: searchFormStore } = useContext(stores_Context);
   const [searchValues, setSearchValues] = useTrainsStore(useShallow((state) => [state.searchValues, state.setSearchValues]));
@@ -175,33 +168,33 @@ const TrainsUpsell = observer(({ ...props }) => {
     {
       title: '数量',
       dataIndex: 'OrderCount',
-      render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.OrderCount} diffPercent={r.OrderCount_vs} diffData={r.OrderCount_diff} />,
+      render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.OrderCount} diffPercent={r.OrderCount_vs} diffData={r.OrderCount_diff} />,
     },
     {
       title: '成交数',
       dataIndex: 'CJCount',
-      render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.CJCount} diffPercent={r.CJCount_vs} diffData={r.CJCount_diff} />,
+      render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJCount} diffPercent={r.CJCount_vs} diffData={r.CJCount_diff} />,
     },
     {
       title: '成交人数',
       dataIndex: 'CJPersonNum',
-      render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.CJPersonNum} diffPercent={r.CJPersonNum_vs} diffData={r.CJPersonNum_diff} />,
+      render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJPersonNum} diffPercent={r.CJPersonNum_vs} diffData={r.CJPersonNum_diff} />,
     },
     {
       title: '成交率',
       dataIndex: 'CJrate',
-      render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.CJrate} diffPercent={r.CJrate_vs} diffData={r.CJrate_diff} />,
+      render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.CJrate} diffPercent={r.CJrate_vs} diffData={r.CJrate_diff} />,
     },
     {
       title: '成交毛利（预计）',
       dataIndex: 'YJLY',
-      render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.YJLY} diffPercent={r.YJLY_vs} diffData={r.YJLY_diff} />,
+      render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.YJLY} diffPercent={r.YJLY_vs} diffData={r.YJLY_diff} />,
     },
 
     {
       title: '单个订单价值',
       dataIndex: 'Ordervalue',
-      render: (text, r) => <DataRenderCell showDiffData={showDiff} data1={text} data2={r.diff?.Ordervalue} diffPercent={r.Ordervalue_vs} diffData={r.Ordervalue_diff} />,
+      render: (text, r) => <RenderVSDataCell showDiffData={showDiff} data1={text} data2={r.diff?.Ordervalue} diffPercent={r.Ordervalue_vs} diffData={r.Ordervalue_diff} />,
     },
   ];
   return (