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 ;
- }
- return
{data1}{dataSuffix}
;
-};
-
const BizOrder = observer(() => {
const { date_picker_store: searchFormStore } = useContext(stores_Context);
@@ -151,7 +144,7 @@ const BizOrder = observer(() => {
children: [
{
title: (
- {
),
titleX: [result.ordercountTotal1?.OrderCount, result.ordercountTotal2?.OrderCount].join(' vs '),
dataIndex: 'OrderCount',
- render: (text, r) => ,
+ render: (text, r) => ,
},
],
},
@@ -170,7 +163,7 @@ const BizOrder = observer(() => {
children: [
{
title: (
- {
),
titleX: [result.ordercountTotal1?.CJCount, result.ordercountTotal2?.CJCount].join(' vs '),
dataIndex: 'CJCount',
- render: (text, r) => ,
+ render: (text, r) => ,
},
],
},
@@ -189,7 +182,7 @@ const BizOrder = observer(() => {
children: [
{
title: (
- {
),
titleX: [result.ordercountTotal1?.CJPersonNum, result.ordercountTotal2?.CJPersonNum].join(' vs '),
dataIndex: 'CJPersonNum',
- render: (text, r) => ,
+ render: (text, r) => ,
},
],
},
@@ -208,7 +201,7 @@ const BizOrder = observer(() => {
children: [
{
title: (
- {
),
titleX: [result.ordercountTotal1?.CJrate, result.ordercountTotal2?.CJrate].join(' vs '),
dataIndex: 'CJrate',
- render: (text, r) => ,
+ render: (text, r) => ,
},
],
},
@@ -227,7 +220,7 @@ const BizOrder = observer(() => {
children: [
{
title: (
- {
),
titleX: [result.ordercountTotal1?.YJLY, result.ordercountTotal2?.YJLY].join(' vs '),
dataIndex: 'YJLY',
- render: (text, r) => ,
+ render: (text, r) => ,
},
],
},
@@ -247,7 +240,7 @@ const BizOrder = observer(() => {
children: [
{
title: (
- {
),
titleX: [result.ordercountTotal1?.Ordervalue, result.ordercountTotal2?.Ordervalue].join(' vs '),
dataIndex: 'Ordervalue',
- render: (text, r) => ,
+ render: (text, r) => ,
},
],
},
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 ;
- }
- return {data1}{dataSuffix}
;
-};
-
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) => ,
+ render: (text, r) => ,
},
{
title: '成交数',
dataIndex: 'CJCount',
- render: (text, r) => ,
+ render: (text, r) => ,
},
{
title: '成交人数',
dataIndex: 'CJPersonNum',
- render: (text, r) => ,
+ render: (text, r) => ,
},
{
title: '成交率',
dataIndex: 'CJrate',
- render: (text, r) => ,
+ render: (text, r) => ,
},
{
title: '成交毛利(预计)',
dataIndex: 'YJLY',
- render: (text, r) => ,
+ render: (text, r) => ,
},
{
title: '单个订单价值',
dataIndex: 'Ordervalue',
- render: (text, r) => ,
+ render: (text, r) => ,
},
];
return (