|
|
|
@ -52,7 +52,7 @@ const AdvanceSearchForm = memo(function ({ initialValues, onSubmit }) {
|
|
|
|
|
layout={'vertical'}
|
|
|
|
|
form={form}
|
|
|
|
|
initialValues={{
|
|
|
|
|
orderLabel: '', orderStatus: '', remindState: ''
|
|
|
|
|
orderLabel: '', orderStatus: '', remindState: '', ...initialValues
|
|
|
|
|
}}
|
|
|
|
|
onFinish={handleSubmit}
|
|
|
|
|
>
|
|
|
|
@ -167,7 +167,7 @@ function OrderGroupTable({ formValues }) {
|
|
|
|
|
if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
|
|
|
|
|
return (
|
|
|
|
|
<Space>
|
|
|
|
|
<Link to={`/order/chat/${record.COLI_SN}`} state={record}>{text + regularText}</Link>
|
|
|
|
|
<Link to={`/order/chat/${record.COLI_SN}`} state={record} title={record.coli_guest_WhatsApp}>{text + regularText}</Link>
|
|
|
|
|
<Badge
|
|
|
|
|
count={record.unread_msg}
|
|
|
|
|
style={{
|
|
|
|
@ -357,7 +357,7 @@ function OrderFollow() {
|
|
|
|
|
defaultChecked={false}
|
|
|
|
|
onChange={() => { toggleAdvance(!advanceChecked) }} />
|
|
|
|
|
</Flex>
|
|
|
|
|
<Conditional condition={advanceChecked} whenTrue={<AdvanceSearchForm onSubmit={handleSubmit} />}
|
|
|
|
|
<Conditional condition={advanceChecked} whenTrue={<AdvanceSearchForm onSubmit={handleSubmit} initialValues={formValues} />}
|
|
|
|
|
/>
|
|
|
|
|
<OrderGroupTable formValues={formValues} />
|
|
|
|
|
</Space>
|
|
|
|
|