Skip to content

J
jinfa-platform
Commit 1a75dfdf authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

Merge branch 'dev' into test

parents 07efb896 7b008fe8
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 40 deletions
src/pages/transaction/components/orderDeleveRecord/index.tsx
View file @ 1a75dfdf
...@@ -258,26 +258,35 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => { ...@@ -258,26 +258,35 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
} }
return ( return (
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'> <>
<Tabs defaultActiveKey="2"> {
<Tabs.TabPane tab='订单收货统计' key="1"> (orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
<Table <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
columns={outOrderCols} <Tabs defaultActiveKey="2">
dataSource={orderReceivingStatisticsResponses} {
pagination={false} orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单收货统计' key="1">
rowKey="productId" <Table
/> columns={outOrderCols}
</Tabs.TabPane> dataSource={orderReceivingStatisticsResponses}
<Tabs.TabPane tab='订单收货明细' key="2"> pagination={false}
<NestTable rowKey="productId"
NestColumns={[sideOrderCols, sideChildrenCols]} />
rowKey='id' </Tabs.TabPane>
childrenDataKey='orderDeliveryProducts' }
dataSource={orderDeliveryDetailsResponses} {
/> orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单收货明细' key="2">
</Tabs.TabPane> <NestTable
</Tabs> NestColumns={[sideOrderCols, sideChildrenCols]}
</MellowCard> rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
}
</Tabs>
</MellowCard>
}
</>
) )
} }
......
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @ 1a75dfdf
...@@ -255,26 +255,35 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => { ...@@ -255,26 +255,35 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
} }
} }
return ( return (
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'> <>
<Tabs defaultActiveKey="2" animated={false}> {
<Tabs.TabPane tab='订单发货统计' key="1"> (orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
<Table <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
columns={outOrderCols} <Tabs defaultActiveKey="2" animated={false}>
dataSource={orderReceivingStatisticsResponses} {
pagination={false} orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单发货统计' key="1">
rowKey="id" <Table
/> columns={outOrderCols}
</Tabs.TabPane> dataSource={orderReceivingStatisticsResponses}
<Tabs.TabPane tab='订单发货明细' key="2"> pagination={false}
<NestTable rowKey="id"
NestColumns={[sideOrderCols, sideChildrenCols]} />
rowKey='id' </Tabs.TabPane>
childrenDataKey='orderDeliveryProducts' }
dataSource={orderDeliveryDetailsResponses} {
/> orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单发货明细' key="2">
</Tabs.TabPane> <NestTable
</Tabs> NestColumns={[sideOrderCols, sideChildrenCols]}
</MellowCard> rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
}
</Tabs>
</MellowCard>
}
</>
) )
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment