From a3285eeaec33bbeef07ec0cd3e3052a7a7635456 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Sun, 10 Mar 2024 03:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BD=93=E9=AA=8C:=20?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE:=20?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B7=9F=E8=B8=AA-=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/FormStore.js   | 8 ++++----
 src/views/OrderFollow.jsx | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/stores/FormStore.js b/src/stores/FormStore.js
index 35e476b..68ef9ef 100644
--- a/src/stores/FormStore.js
+++ b/src/stores/FormStore.js
@@ -12,10 +12,10 @@ export const useFormStore = create(
     // 订单跟踪页面
     orderFollowForm: {
       type: 'today',
-      orderStatus: '新状态',
-      orderNumber: '订单号',
-      orderLabel: '订单标签',
-      startDate: '走团时间',
+      // orderStatus: '新状态',
+      // orderNumber: '订单号',
+      // orderLabel: '订单标签',
+      // startDate: '走团时间',
     },
     setOrderFollowForm: (orderFollowForm) => set({ orderFollowForm }),
     orderFollowAdvanceChecked: false,
diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx
index 3e88b13..755c7b3 100644
--- a/src/views/OrderFollow.jsx
+++ b/src/views/OrderFollow.jsx
@@ -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>