diff --git a/src/config.js b/src/config.js index 8c7446c..0224ebf 100644 --- a/src/config.js +++ b/src/config.js @@ -1,6 +1,7 @@ import React from "react"; import dayjs from "dayjs"; +export const HT_HOST = process.env.NODE_ENV == "production" ? "https://p9axztuwd7x8a7.mycht.cn" : "http://202.103.68.100:890"; export const DATE_FORMAT = "YYYY-MM-DD"; export const DATE_PRESETS = [ { @@ -35,4 +36,3 @@ export const DATE_PRESETS = [ // 今年: [dayjs().startOf("year"), moment().endOf("year")], // 去年: [dayjs().subtract(1, "year").startOf("year"), moment().subtract(1, "year").endOf("year")], ]; -export const HT_HOST = process.env.NODE_ENV == "production" ? "https://p9axztuwd7x8a7.mycht.cn" : "http://202.103.68.100:890"; diff --git a/src/views/feedback/Detail.jsx b/src/views/feedback/Detail.jsx index 368cbf3..6fe5070 100644 --- a/src/views/feedback/Detail.jsx +++ b/src/views/feedback/Detail.jsx @@ -168,7 +168,7 @@ function Detail() { - + - + ); diff --git a/src/views/invoice/Detail.jsx b/src/views/invoice/Detail.jsx index e13fac9..b07ab0d 100644 --- a/src/views/invoice/Detail.jsx +++ b/src/views/invoice/Detail.jsx @@ -192,7 +192,7 @@ function Detail() { -

- Our Finance Dept makes payment during the last week in each month. So due date can only the last day of each month. If there's urgent payment, please contact the travel advisor and send invoice - separately. -

diff --git a/src/views/invoice/Index.jsx b/src/views/invoice/Index.jsx index b4e14f6..00e0238 100644 --- a/src/views/invoice/Index.jsx +++ b/src/views/invoice/Index.jsx @@ -1,4 +1,4 @@ -import { NavLink } from "react-router-dom"; +import { NavLink, useNavigate } from "react-router-dom"; import { useEffect, useState } from "react"; import { observer } from "mobx-react"; import { toJS } from "mobx"; @@ -14,6 +14,7 @@ function Index() { const { authStore, invoiceStore } = useStore(); const { invoiceList, search_date_start, search_date_end } = invoiceStore; const [groupNo, onGroupNoChange] = useState(""); + const navigate = useNavigate(); const { notification } = App.useApp(); const showTotal = total => `Total ${invoiceList.length} items`; @@ -97,10 +98,15 @@ function Index() { Search + + + - +
diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx index 06468fd..2ab4143 100644 --- a/src/views/reservation/Newest.jsx +++ b/src/views/reservation/Newest.jsx @@ -5,6 +5,7 @@ import { toJS } from "mobx"; import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal, App, Select } from 'antd'; import { useStore } from '@/stores/StoreContext.js'; import { DATE_PRESETS } from "@/config"; +import { formatDate, isNotEmpty } from "@/utils/commons"; const { Title } = Typography; @@ -34,7 +35,8 @@ function Newest() { { title: 'Res. sending date', key: 'Reservation date', - dataIndex: 'reservationDate' + dataIndex: 'reservationDate', + render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ""), }, { title: 'Guide',