|
|
|
@ -178,7 +178,7 @@ function OrderList({ formValues }) {
|
|
|
|
|
{
|
|
|
|
|
title: '订单状态',
|
|
|
|
|
dataIndex: 'COLI_State',
|
|
|
|
|
width: 120,
|
|
|
|
|
width: 150,
|
|
|
|
|
render: (text, record) => {
|
|
|
|
|
let extra = ''
|
|
|
|
|
if (record.RemindState === 1) extra = '(一催)'
|
|
|
|
@ -260,16 +260,37 @@ function OrderList({ formValues }) {
|
|
|
|
|
})
|
|
|
|
|
}, [formValues])
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<Table key='Order Table' loading={loading} dataSource={orderData}
|
|
|
|
|
columns={orderColumns}
|
|
|
|
|
pagination={{
|
|
|
|
|
showQuickJumper: true,
|
|
|
|
|
showLessItems: true,
|
|
|
|
|
showSizeChanger: true,
|
|
|
|
|
showTotal: (total) => { return `总数:${total}` }
|
|
|
|
|
}} />
|
|
|
|
|
)
|
|
|
|
|
const paginationProps = {
|
|
|
|
|
showQuickJumper: true,
|
|
|
|
|
showLessItems: true,
|
|
|
|
|
showSizeChanger: true,
|
|
|
|
|
showTotal: (total) => { return `总数:${total}` }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<Collapse defaultActiveKey={['1', '2', '3']} items={[
|
|
|
|
|
{
|
|
|
|
|
key: '1',
|
|
|
|
|
label: 'AH 订单:25',
|
|
|
|
|
children: <Table key='AH Order Table' loading={loading} dataSource={orderData}
|
|
|
|
|
columns={orderColumns}
|
|
|
|
|
pagination={paginationProps} />
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
key: '2',
|
|
|
|
|
label: 'CH 订单:25',
|
|
|
|
|
children: <Table key='CH Order Table' loading={loading} dataSource={orderData}
|
|
|
|
|
columns={orderColumns}
|
|
|
|
|
pagination={paginationProps} />
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
key: '3',
|
|
|
|
|
label: 'GH 订单:25',
|
|
|
|
|
children: <Table key='GH Order Table' loading={loading} dataSource={orderData}
|
|
|
|
|
columns={orderColumns}
|
|
|
|
|
pagination={paginationProps} />
|
|
|
|
|
}]}
|
|
|
|
|
/>)
|
|
|
|
|
}
|
|
|
|
|
function OrderFollow() {
|
|
|
|
|
|
|
|
|
@ -316,26 +337,8 @@ function OrderFollow() {
|
|
|
|
|
</Flex>
|
|
|
|
|
<Conditional condition={advanceChecked} whenTrue={<AdvanceSearchForm onSubmit={handleSubmit} />}
|
|
|
|
|
/>
|
|
|
|
|
<OrderList formValues={formValues} />
|
|
|
|
|
</Space>
|
|
|
|
|
<Divider plain orientation='left'></Divider>
|
|
|
|
|
<Collapse defaultActiveKey={['1', '2', '3']} items={[
|
|
|
|
|
{
|
|
|
|
|
key: '1',
|
|
|
|
|
label: 'AH 订单:25',
|
|
|
|
|
children: <OrderList formValues={formValues} />
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
key: '2',
|
|
|
|
|
label: 'CH 订单:25',
|
|
|
|
|
children: <OrderList formValues={formValues} />
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
key: '3',
|
|
|
|
|
label: 'GH 订单:25',
|
|
|
|
|
children: <OrderList formValues={formValues} />
|
|
|
|
|
},
|
|
|
|
|
]}
|
|
|
|
|
/>
|
|
|
|
|
</>
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|