行程打印取消分页显示

release
Jimmy Liow 2 years ago
parent 09444a114e
commit 0e248a3bdf

@ -47,14 +47,14 @@ function Newest() {
if (reservation.guide === '') { if (reservation.guide === '') {
return ( return (
<Space size="middle"> <Space size="middle">
<Button type="link" onClick={() => showModal(reservation)}>Fill in</Button> <Button type="link" onClick={() => showCityGuideModal(reservation)}>Fill in</Button>
</Space> </Space>
); );
} else { } else {
return ( return (
<Space size="middle"> <Space size="middle">
<span>{reservation.guide}</span> <span>{reservation.guide}</span>
<Button type="link" onClick={() => showModal(reservation)}>Modify</Button> <Button type="link" onClick={() => showCityGuideModal(reservation)}>Modify</Button>
</Space> </Space>
); );
} }
@ -103,7 +103,8 @@ function Newest() {
const [dataLoading, setDataLoading] = useState(false); const [dataLoading, setDataLoading] = useState(false);
const { notification } = App.useApp(); const { notification } = App.useApp();
const showModal = (reservation) => { const showCityGuideModal = (reservation) => {
setDataLoading(true);
setIsModalOpen(true); setIsModalOpen(true);
reservationStore.fetchCityList(reservation.referenceId) reservationStore.fetchCityList(reservation.referenceId)
.catch(ex => { .catch(ex => {
@ -152,6 +153,7 @@ function Newest() {
<Col span={24}> <Col span={24}>
<Table <Table
bordered bordered
loading={dataLoading}
pagination={false} pagination={false}
columns={[ columns={[
{ {

@ -103,9 +103,7 @@ function Print() {
<Row> <Row>
<Col span={24}> <Col span={24}>
<Table <Table
pagination={{ pagination={false}
hideOnSinglePage: true
}}
dataSource={toJS(itineraryList)} columns={itineraryListColumns} dataSource={toJS(itineraryList)} columns={itineraryListColumns}
/> />
</Col> </Col>

Loading…
Cancel
Save