diff --git a/src/views/toB/ToBOrder.jsx b/src/views/toB/ToBOrder.jsx
index 27fcaf4..ba08a63 100644
--- a/src/views/toB/ToBOrder.jsx
+++ b/src/views/toB/ToBOrder.jsx
@@ -15,13 +15,12 @@ import { stores_Context } from '../../config';
import { useShallow } from 'zustand/shallow';
import useToBOrderStore, { orderCountDataMapper, orderCountDataFieldMapper } from '../../zustand/ToBOrder';
-
const ToBOrder = observer(() => {
const { date_picker_store: searchFormStore } = useContext(stores_Context);
const [searchValues, setSearchValues] = useToBOrderStore(useShallow((state) => [state.searchValues, state.setSearchValues]));
const [activeTab, setActiveTab] = useToBOrderStore(useShallow((state) => [state.activeTab, state.setActiveTab]));
- const [loading, typeLoading, onTabChange] = useToBOrderStore(useShallow((state) => [state.loading, state.typeLoading,state.onTabChange]));
+ const [loading, typeLoading, onTabChange] = useToBOrderStore(useShallow((state) => [state.loading, state.typeLoading, state.onTabChange]));
const orderCountDataRaw = useToBOrderStore((state) => state.orderCountDataRaw);
const [orderCountDataLines, avgLineValue] = useToBOrderStore(useShallow((state) => [state.orderCountDataLines, state.avgLineValue]));
@@ -274,7 +273,7 @@ const ToBOrder = observer(() => {
...searchValues,
},
//
- shows: ['DateType', 'WebCode','IncludeTickets', 'DepartmentList', 'dates'],
+ shows: ['DateType', 'WebCode', 'IncludeTickets', 'DepartmentList', 'dates'],
fieldProps: {
DepartmentList: { show_all: false, mode: 'multiple' },
WebCode: { show_all: false, mode: 'multiple' },
@@ -347,17 +346,19 @@ const ToBOrder = observer(() => {
*/}
-
-
-
-
-
+
+
+
+
+
- {showDiff &&
-
-
- }
-
+ {showDiff && (
+
+
+
+
+ )}
+
>
diff --git a/src/views/toB/ToBOrderSub.jsx b/src/views/toB/ToBOrderSub.jsx
index 5a53590..82cbefa 100644
--- a/src/views/toB/ToBOrderSub.jsx
+++ b/src/views/toB/ToBOrderSub.jsx
@@ -38,16 +38,16 @@ const OrderDetailTable = ({ caption, dataSource, loading, ...props }) => {
render: (text, record) => {text == 1 ? '是' : '否'},
sorter: (a, b) => b.COLI_Success - a.COLI_Success,
},
- // {
- // title: "人数(成/童/婴)",
- // dataIndex: "COLI_PersonNum",
- // key: "COLI_PersonNum",
- // render: (text, record) => (
- //
- // {record.COLI_PersonNum}/{record.COLI_ChildNum}/{record.COLI_BabyNum}
- //
- // ),
- // },
+ {
+ title: '人数(成/童/婴)',
+ dataIndex: 'COLI_PersonNum',
+ key: 'COLI_PersonNum',
+ render: (text, record) => (
+
+ {record.COLI_PersonNum}/{record.COLI_ChildNum}/{record.COLI_BabyNum}
+
+ ),
+ },
{
title: '预计利润',
dataIndex: 'CGI_YJLY',