Merge branch 'main' of github.com:hainatravel/GHHub
YCC
2 years ago
commit
aa501c7f3a
@ -0,0 +1,20 @@
|
||||
import { Result } from 'antd'
|
||||
import useAuthStore from '@/stores/Auth'
|
||||
|
||||
export default function RequireAuth({ children, ...props }, ) {
|
||||
|
||||
const isPermitted = useAuthStore((state) => state.isPermitted)
|
||||
|
||||
if (isPermitted(props.subject)) {
|
||||
// if (props.subject === '/account/management') {
|
||||
return children
|
||||
} else if (props.result) {
|
||||
return (
|
||||
<Result
|
||||
status='403'
|
||||
title='403'
|
||||
subTitle={'抱歉，你没有权限使用该功能。'}
|
||||
/>
|
||||
)
|
||||
}
|
||||
}
|
||||
@ -1,69 +1,63 @@
|
||||
import { NavLink, useNavigate ,useParams} from "react-router-dom";
|
||||
import { useEffect, useState } from "react";
|
||||
import { observer } from "mobx-react";
|
||||
import { toJS } from "mobx";
|
||||
import { Row, Col, Space, Button, Table, Typography } from "antd";
|
||||
import { useStore } from "@/stores/StoreContext.js";
|
||||
import * as config from "@/config";
|
||||
import { formatDate, isNotEmpty } from "@/utils/commons";
|
||||
import useAuthStore from '@/stores/Auth';
|
||||
import { useNavigate, useParams } from 'react-router-dom';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Row, Col, Space, Table, Typography } from 'antd';
|
||||
import { formatDate, isNotEmpty } from '@/utils/commons';
|
||||
import BackBtn from '@/components/BackBtn';
|
||||
import { fetchInvoicePaidDetail } from '@/stores/Invoice';
|
||||
import { usingStorage } from '@/hooks/usingStorage';
|
||||
|
||||
const { Title } = Typography;
|
||||
|
||||
function PaidDetail(){
|
||||
const navigate = useNavigate();
|
||||
const { invoiceStore } = useStore();
|
||||
const { invoicePaidDetail } = invoiceStore;
|
||||
const [travelAgencyId] = useAuthStore((state) => [state.loginUser.travelAgencyId]);
|
||||
const { flid } = useParams();
|
||||
function PaidDetail() {
|
||||
const navigate = useNavigate();
|
||||
const {travelAgencyId, } = usingStorage();
|
||||
const { flid } = useParams();
|
||||
|
||||
useEffect(() => {
|
||||
invoiceStore.fetchInvoicePaidDetail(travelAgencyId,flid);
|
||||
const [invoicePaidDetail, setInvoicePaidDetail] = useState([]);
|
||||
useEffect(() => {
|
||||
fetchInvoicePaidDetail(travelAgencyId, flid).then(res => setInvoicePaidDetail(res));
|
||||
}, [flid]);
|
||||
|
||||
},[flid]);
|
||||
const invoicePaidColumns = [
|
||||
{
|
||||
title: 'Ref.NO',
|
||||
dataIndex: 'fl2_GroupName',
|
||||
key: 'fl2_GroupName',
|
||||
},
|
||||
{
|
||||
title: 'Arrival date',
|
||||
key: 'fl2_ArriveDate',
|
||||
dataIndex: 'fl2_ArriveDate',
|
||||
render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ''),
|
||||
},
|
||||
{
|
||||
title: 'Payment amount',
|
||||
key: 'fl2_price',
|
||||
dataIndex: 'fl2_price',
|
||||
},
|
||||
{
|
||||
title: 'Currency',
|
||||
key: 'fl2_memo',
|
||||
dataIndex: 'fl2_memo',
|
||||
},
|
||||
];
|
||||
|
||||
const invoicePaidColumns = [
|
||||
{
|
||||
title: "Ref.NO",
|
||||
dataIndex: "fl2_GroupName",
|
||||
key: "fl2_GroupName",
|
||||
},
|
||||
{
|
||||
title: "Arrival date",
|
||||
key: "fl2_ArriveDate",
|
||||
dataIndex: "fl2_ArriveDate",
|
||||
render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ""),
|
||||
},
|
||||
{
|
||||
title: "Payment amount",
|
||||
key: "fl2_price",
|
||||
dataIndex: "fl2_price",
|
||||
},
|
||||
{
|
||||
title: "Currency",
|
||||
key: "fl2_memo",
|
||||
dataIndex: "fl2_memo",
|
||||
},
|
||||
];
|
||||
|
||||
return (
|
||||
<Space direction="vertical" style={{ width: "100%" }}>
|
||||
<Row gutter={16}>
|
||||
<Col span={20}>
|
||||
</Col>
|
||||
<Col span={4}>
|
||||
<BackBtn />
|
||||
</Col>
|
||||
</Row>
|
||||
<Title level={3}></Title>
|
||||
<Row>
|
||||
<Col md={24} lg={24} xxl={24}>
|
||||
<Table bordered columns={invoicePaidColumns} dataSource={toJS(invoicePaidDetail)} />
|
||||
</Col>
|
||||
</Row>
|
||||
</Space>
|
||||
);
|
||||
return (
|
||||
<Space direction='vertical' style={{ width: '100%' }}>
|
||||
<Row gutter={16}>
|
||||
<Col span={20}></Col>
|
||||
<Col span={4}>
|
||||
<BackBtn />
|
||||
</Col>
|
||||
</Row>
|
||||
<Title level={3}></Title>
|
||||
<Row>
|
||||
<Col md={24} lg={24} xxl={24}>
|
||||
<Table bordered columns={invoicePaidColumns} dataSource={invoicePaidDetail} />
|
||||
</Col>
|
||||
</Row>
|
||||
</Space>
|
||||
);
|
||||
}
|
||||
|
||||
export default observer(PaidDetail);
|
||||
export default PaidDetail;
|
||||
|
||||
Loading…
Reference in New Issue