Haina
/
GHHub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:hainatravel/GHHub

Browse Source
release
YCC 2 years ago
parent 7fe02588cd 910ffc3f69
commit c75dd11a3d
5 changed files with 91 additions and 75 deletions
Show Stats Download Patch File Download Diff File

6
src/stores/Auth.js
Unescape Escape View File

@ -7,7 +7,11 @@ class Auth {
this.root = root;
}
loginUser = 'LiaoYijun(IT)';
login = {
userId: 1,
username: 'Giffigan(Discova)',
travelAgencyId: 628
}
}
export default Auth;

115
src/stores/Reservation.js
Unescape Escape View File

@ -1,5 +1,5 @@
import { makeAutoObservable, runInAction } from "mobx";
import * as req from '@/utils/request';
import { fetchJSON } from '@/utils/request';
import { HT_HOST } from "@/config";
import { prepareUrl } from '@/utils/commons';
@ -10,10 +10,9 @@ class Reservation {
this.root = root;
}
fetchReservation(referenceNo, fromDate, thruDate) {
fetchReservationList(referenceNo, fromDate, thruDate) {
const fetchUrl = prepareUrl(HT_HOST + '/service-tourdesign/GetPlanSearchList')
.append('VEISn', 628)
.append('VEISn', this.root.authStore.login.travelAgencyId)
.append('GroupNo', referenceNo)
.append('DateStart', fromDate)
.append('DataEnd', thruDate)
@ -22,70 +21,58 @@ class Reservation {
.append('PageNum', 0)
.append('PageIndex', 1)
.build();
req.fetchJSON(fetchUrl)
.then(json => {
runInAction(() => {
this.reservationList = json.data.map((data, index) => {
return {
key: data.vas_gri_sn,
id: data.vas_gri_sn,
referenceNumber: data.GriName,
arrivalDate: data.GetGDate,
pax: data.PersonNum,
status: data.GState,
reservationDate: data.GetGDate,
guide: data.Guide,
return fetchJSON(fetchUrl)
.then(json => {
runInAction(() => {
if (json.errcode == 0) {
this.reservationList = json.Result.map((data, index) => {
return {
key: data.vas_gri_sn,
id: data.vas_gri_sn,
referenceNumber: data.GriName,
arrivalDate: data.GetGDate,
pax: data.PersonNum,
status: data.GState,
reservationDate: data.GetGDate,
guide: data.Guide,
}
});
} else {
throw new Error(json.errmsg + ': ' + json.errcode);
}
});
});
})
.then(() => {
});
}
fetchReservation(reservationId) {
const fetchUrl = prepareUrl(HT_HOST + '/service-tourdesign/GetPlanInfo')
.append('VEI_SN', this.root.authStore.login.travelAgencyId)
.append('GRI_SN', reservationId)
.build();
// runInAction(() => {
// this.reservationList = [
// {
// key: '1',
// id: '1',
// referenceNumber: '111029-N111025076',
// arrivalDate: '2023-04-08',
// pax: '5AD 1CH',
// status: 'Confirm',
// reservationDate: '2023-04-08 19:31',
// guide: 'Bill',
// },
// {
// key: '2',
// id: '3',
// referenceNumber: '111029-N111025076',
// arrivalDate: '2023-04-08',
// pax: '5AD 1CH',
// status: 'Confirm',
// reservationDate: '2023-04-08 19:31',
// guide: 'Jim',
// },
// {
// key: '3',
// id: '3',
// referenceNumber: '111029-N111025076',
// arrivalDate: '2023-05-08',
// pax: '3AD',
// status: 'Confirm',
// reservationDate: '2023-01-08 19:31',
// guide: 'Giffigan',
// },
// {
// key: '3',
// id: '3',
// referenceNumber: '111029-N111025076',
// arrivalDate: '2023-05-08',
// pax: '3AD',
// status: 'Confirm',
// reservationDate: '2023-01-08 19:31',
// guide: 'Laurie Notaro',
// },
// ];
// });
return fetchJSON(fetchUrl)
.then(json => {
runInAction(() => {
if (json.errcode == 0) {
console.info(json);
// this.reservationList = json.Result.map((data, index) => {
// return {
// key: data.vas_gri_sn,
// id: data.vas_gri_sn,
// referenceNumber: data.GriName,
// arrivalDate: data.GetGDate,
// pax: data.PersonNum,
// status: data.GState,
// reservationDate: data.GetGDate,
// guide: data.Guide,
// }
// });
} else {
throw new Error(json.errmsg + ': ' + json.errcode);
}
});
});
}
reservationList = [];

6
src/views/App.jsx
Unescape Escape View File

@ -1,7 +1,7 @@
import { Outlet, Link, useHref, useLocation } from "react-router-dom";
import { useEffect } from 'react';
import { observer } from "mobx-react";
import { Layout, Menu, ConfigProvider, theme, Dropdown, Space, Row, Col } from 'antd';
import { Layout, Menu, ConfigProvider, theme, Dropdown, Space, Row, Col, App as AntApp } from 'antd';
import {
DownOutlined
} from '@ant-design/icons';
@ -64,6 +64,7 @@ function App() {
algorithm: theme.defaultAlgorithm,
}}
>
<AntApp>
<Layout
style={{
minHeight: "100vh",
@ -88,7 +89,7 @@ function App() {
>
<a onClick={(e) => e.preventDefault()}>
<Space>
{authStore.loginUser}
{authStore.login.username}
<DownOutlined />
</Space>
</a>
@ -108,6 +109,7 @@ function App() {
<Footer>
</Footer>
</Layout>
</AntApp>
</ConfigProvider>
);
}

12
src/views/reservation/Detail.jsx
Unescape Escape View File

@ -3,7 +3,7 @@ import { useEffect } from 'react';
import { observer } from "mobx-react";
import { toJS } from "mobx";
import moment from "moment";
import { Row, Col, Space, Button, Table, Input, Typography, List } from 'antd';
import { Row, Col, Space, Button, Table, Input, Typography, List, App } from 'antd';
import { useStore } from '../../stores/StoreContext.js';
const { Title } = Typography;
@ -39,12 +39,22 @@ const itineraryListColumns = [
function Detail() {
const navigate = useNavigate();
const { notification } = App.useApp();
const { reservationId } = useParams();
const { reservationStore } = useStore();
const { itineraryList, customerList } = reservationStore;
useEffect(() => {
console.info('Detail.useEffect: ' + reservationId);
reservationStore.fetchReservation(reservationId)
.catch(ex => {
notification.error({
message: `Notification`,
description: ex.message,
placement: 'top',
duration: 4,
});
});
}, [reservationId]);
return (

21
src/views/reservation/Newest.jsx
Unescape Escape View File

@ -2,7 +2,7 @@ import { NavLink } from "react-router-dom";
import { useEffect, useState } from 'react';
import { observer } from "mobx-react";
import { toJS } from "mobx";
import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal } from 'antd';
import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal, App } from 'antd';
import { useStore } from '@/stores/StoreContext.js';
const { Title } = Typography;
@ -64,6 +64,8 @@ function Newest() {
const [isModalOpen, setIsModalOpen] = useState(false);
const [selectedDateRange, onDateRangeChange] = useState([]);
const [referenceNo, onNumberChange] = useState('');
const [tableLoading, setTableLoading] = useState(false);
const { notification } = App.useApp();
const showModal = () => {
setIsModalOpen(true);
@ -80,9 +82,19 @@ function Newest() {
}, []);
const onSearchClick = () => {
console.info(selectedDateRange);
console.info(referenceNo);
reservationStore.fetchReservation(referenceNo, selectedDateRange[0], selectedDateRange[1]);
setTableLoading(true);
reservationStore.fetchReservationList(referenceNo, selectedDateRange[0], selectedDateRange[1])
.catch(ex => {
notification.error({
message: `Notification`,
description: ex.message,
placement: 'top',
duration: 4,
});
})
.finally(() => {
setTableLoading(false);
});
}
return (
@ -196,6 +208,7 @@ function Newest() {
<Table
title={() => 'Reservations without the tour guide information will be highlighted in red if the arrival date is within 3 days.'}
bordered
loading={tableLoading}
pagination={{
position: ['bottomCenter'],
current: 1,

Write Preview
Loading…
Cancel
Save