|
|
|
@ -141,7 +141,7 @@ const AdvanceSearchForm = memo(function ({ onSubmit }) {
|
|
|
|
|
)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
function OrderCollapseTable({ formValues }) {
|
|
|
|
|
function OrderGroupTable({ formValues }) {
|
|
|
|
|
|
|
|
|
|
const orderColumns = [
|
|
|
|
|
{
|
|
|
|
@ -275,7 +275,7 @@ function OrderCollapseTable({ formValues }) {
|
|
|
|
|
collapseItems.push(
|
|
|
|
|
{
|
|
|
|
|
key: index,
|
|
|
|
|
label: deptMap.get(deptNo) + '订单',
|
|
|
|
|
label: deptMap.get(deptNo),
|
|
|
|
|
children: <Table key={'Order Table' + deptNo} loading={loading} dataSource={deptOrderList}
|
|
|
|
|
columns={orderColumns}
|
|
|
|
|
pagination={deptOrderList.length <= 10 ? false : paginationProps} />
|
|
|
|
@ -332,7 +332,7 @@ function OrderFollow() {
|
|
|
|
|
</Flex>
|
|
|
|
|
<Conditional condition={advanceChecked} whenTrue={<AdvanceSearchForm onSubmit={handleSubmit} />}
|
|
|
|
|
/>
|
|
|
|
|
<OrderCollapseTable formValues={formValues} />
|
|
|
|
|
<OrderGroupTable formValues={formValues} />
|
|
|
|
|
</Space>
|
|
|
|
|
</>
|
|
|
|
|
)
|
|
|
|
|