From 0e248a3bdfb291ceb827e7c187127588d1ff1806 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 28 Apr 2023 16:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E6=89=93=E5=8D=B0=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=88=86=E9=A1=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reservation/Newest.jsx | 8 +++++---
 src/views/reservation/Print.jsx  | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx
index f8d6950..5e08de2 100644
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -47,14 +47,14 @@ function Newest() {
     if (reservation.guide === '') {
       return (
         <Space size="middle">
-          <Button type="link" onClick={() => showModal(reservation)}>Fill in</Button>
+          <Button type="link" onClick={() => showCityGuideModal(reservation)}>Fill in</Button>
         </Space>
       );
     } else {
       return (
         <Space size="middle">
           <span>{reservation.guide}</span>
-          <Button type="link" onClick={() => showModal(reservation)}>Modify</Button>
+          <Button type="link" onClick={() => showCityGuideModal(reservation)}>Modify</Button>
         </Space>
       );
     }
@@ -103,7 +103,8 @@ function Newest() {
   const [dataLoading, setDataLoading] = useState(false);
   const { notification } = App.useApp();
 
-  const showModal = (reservation) => {    
+  const showCityGuideModal = (reservation) => {  
+    setDataLoading(true);  
     setIsModalOpen(true);
     reservationStore.fetchCityList(reservation.referenceId)
       .catch(ex => {
@@ -152,6 +153,7 @@ function Newest() {
             <Col span={24}>
               <Table
                 bordered
+                loading={dataLoading}
                 pagination={false}
                 columns={[
                   {
diff --git a/src/views/reservation/Print.jsx b/src/views/reservation/Print.jsx
index 243c4bd..62a63e0 100644
--- a/src/views/reservation/Print.jsx
+++ b/src/views/reservation/Print.jsx
@@ -103,9 +103,7 @@ function Print() {
       <Row>
         <Col span={24}>
           <Table
-            pagination={{
-              hideOnSinglePage: true
-            }}
+            pagination={false}
             dataSource={toJS(itineraryList)} columns={itineraryListColumns}
           />
         </Col>