添加杂项账单

release
YCC 2 years ago
parent 1359ade8c1
commit f2463a049f

@ -1,6 +1,7 @@
import React from "react"; import React from "react";
import dayjs from "dayjs"; 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_FORMAT = "YYYY-MM-DD";
export const DATE_PRESETS = [ export const DATE_PRESETS = [
{ {
@ -35,4 +36,3 @@ export const DATE_PRESETS = [
// 今年: [dayjs().startOf("year"), moment().endOf("year")], // 今年: [dayjs().startOf("year"), moment().endOf("year")],
// 去年: [dayjs().subtract(1, "year").startOf("year"), moment().subtract(1, "year").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";

@ -168,7 +168,7 @@ function Detail() {
<Form.Item> <Form.Item>
<Upload <Upload
name="ghhfile" name="ghhfile"
accept="image/*" // accept="image/*"
multiple={true} multiple={true}
action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GRI_SN}&VEI_SN=${authStore.login.travelAgencyId}&token=${authStore.login.token}`} action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GRI_SN}&VEI_SN=${authStore.login.travelAgencyId}&token=${authStore.login.token}`}
fileList={fileList} fileList={fileList}

@ -96,10 +96,10 @@ function Index() {
</Row> </Row>
<Title level={3}></Title> <Title level={3}></Title>
<Row> <Row>
<Col md={24} lg={24} xxl={12}> <Col md={24} lg={24} xxl={24}>
<Table bordered={true} columns={feedbackListColumns} dataSource={toJS(feedbackList)} pagination={{ defaultPageSize: 20, showTotal: showTotal }} /> <Table bordered={true} columns={feedbackListColumns} dataSource={toJS(feedbackList)} pagination={{ defaultPageSize: 20, showTotal: showTotal }} />
</Col> </Col>
<Col md={24} lg={24} xxl={12}></Col> <Col md={24} lg={24} xxl={24}></Col>
</Row> </Row>
</Space> </Space>
); );

@ -192,7 +192,7 @@ function Detail() {
<Descriptions.Item span={4}> <Descriptions.Item span={4}>
<Upload <Upload
name="ghhfile" name="ghhfile"
accept="image/*" // accept="image/*"
multiple={true} multiple={true}
action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice&token=${authStore.login.token}`} action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice&token=${authStore.login.token}`}
fileList={invoicePicList[index]} fileList={invoicePicList[index]}
@ -220,7 +220,6 @@ function Detail() {
<Form.Item> <Form.Item>
<Upload <Upload
name="ghhfile" name="ghhfile"
accept="image/*"
multiple={true} multiple={true}
action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice&token=${authStore.login.token}`} action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice&token=${authStore.login.token}`}
fileList={fileList} fileList={fileList}
@ -276,10 +275,6 @@ function Detail() {
Submit Submit
</Button> </Button>
</Form.Item> </Form.Item>
<p>
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.
</p>
</Form> </Form>
</Col> </Col>
<Col span={4}></Col> <Col span={4}></Col>

@ -1,4 +1,4 @@
import { NavLink } from "react-router-dom"; import { NavLink, useNavigate } from "react-router-dom";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { toJS } from "mobx"; import { toJS } from "mobx";
@ -14,6 +14,7 @@ function Index() {
const { authStore, invoiceStore } = useStore(); const { authStore, invoiceStore } = useStore();
const { invoiceList, search_date_start, search_date_end } = invoiceStore; const { invoiceList, search_date_start, search_date_end } = invoiceStore;
const [groupNo, onGroupNoChange] = useState(""); const [groupNo, onGroupNoChange] = useState("");
const navigate = useNavigate();
const { notification } = App.useApp(); const { notification } = App.useApp();
const showTotal = total => `Total ${invoiceList.length} items`; const showTotal = total => `Total ${invoiceList.length} items`;
@ -97,10 +98,15 @@ function Index() {
Search Search
</Button> </Button>
</Col> </Col>
<Col md={24} lg={4} xxl={4}>
<Button icon={<AuditOutlined />} onClick={() => navigate(`/invoice/detail/0/338787`)}>
Misc. Invoice
</Button>
</Col>
</Row> </Row>
<Title level={3}></Title> <Title level={3}></Title>
<Row> <Row>
<Col md={24} lg={24} xxl={12}> <Col md={24} lg={24} xxl={24}>
<Table bordered pagination={{ defaultPageSize: 20, showTotal: showTotal }} columns={invoiceListColumns} dataSource={toJS(invoiceList)} /> <Table bordered pagination={{ defaultPageSize: 20, showTotal: showTotal }} columns={invoiceListColumns} dataSource={toJS(invoiceList)} />
</Col> </Col>
</Row> </Row>

@ -5,6 +5,7 @@ import { toJS } from "mobx";
import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal, App, Select } from 'antd'; import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal, App, Select } from 'antd';
import { useStore } from '@/stores/StoreContext.js'; import { useStore } from '@/stores/StoreContext.js';
import { DATE_PRESETS } from "@/config"; import { DATE_PRESETS } from "@/config";
import { formatDate, isNotEmpty } from "@/utils/commons";
const { Title } = Typography; const { Title } = Typography;
@ -34,7 +35,8 @@ function Newest() {
{ {
title: 'Res. sending date', title: 'Res. sending date',
key: 'Reservation date', key: 'Reservation date',
dataIndex: 'reservationDate' dataIndex: 'reservationDate',
render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ""),
}, },
{ {
title: 'Guide', title: 'Guide',

Loading…
Cancel
Save