diff --git a/src/stores/Invoice.js b/src/stores/Invoice.js index 7ed600b..e599be0 100644 --- a/src/stores/Invoice.js +++ b/src/stores/Invoice.js @@ -177,6 +177,7 @@ class Invoice { removeFeedbackImages(fileurl) { let url = `/service-fileServer/FileDelete`; url += `?fileurl=${fileurl}`; + url += `&token=${this.root.authStore.login.token}`; return fetch(config.HT_HOST + url) .then(response => response.json()) .then(json => { diff --git a/src/views/invoice/Detail.jsx b/src/views/invoice/Detail.jsx index 7d9435f..be49724 100644 --- a/src/views/invoice/Detail.jsx +++ b/src/views/invoice/Detail.jsx @@ -2,7 +2,7 @@ import { useParams, useNavigate, NavLink } from "react-router-dom"; import { useEffect, useState, useRef } from "react"; import { observer } from "mobx-react"; import { toJS, runInAction } from "mobx"; -import { Row, Col, Space, Button, Typography, Card, Form, Upload, Input, Divider, DatePicker, Select, App, Modal } from "antd"; +import { Row, Col, Space, Button, Typography, Card, Form, Upload, Input, Divider, DatePicker, Select, App, Descriptions } from "antd"; import { useStore } from "@/stores/StoreContext.js"; import { PlusOutlined } from "@ant-design/icons"; import { isNotEmpty } from "@/utils/commons"; @@ -179,167 +179,133 @@ function Detail() { } } - //循环生成多次报账信息 - function bindSubmitForm() { - let submitForm = invoiceZDDetail.map((data, index) => { - if (data.GMD_Dealed) { //已审核的直接显示信息即可,无需表单 - return ( - - - - Invoice {index + 1} - -
- -
Click to Upload
-
-
- Details - - - - - - Currency: - - - - - - {addButton(index + 1 == invoiceZDDetail.length)} - - - -
- - ) - } else { - // 一个团只能有一个未审核的账单记录 - return ( - - - -
- Invoice {index + 1} - - -
- -
Click to Upload
-
-
-
- Details - - - - - - - - - - - - - - - - - - -

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.

-
- - -
- ) - } - - }) - return submitForm; - } - - - - return ( - <> - - - - - Reference Number: {invoiceGroupInfo.VGroupInfo} - - - - - - - {bindSubmitForm()} - - - ); - - + //循环生成多次报账信息 + function bindSubmitForm() { + let submitForm = invoiceZDDetail.map((data, index) => { + if (data.GMD_Dealed) { + //已审核的直接显示信息即可,无需表单 + return ( + + + + Invoice {index + 1} + + + {data.GMD_Cost} + {data.GMD_Currency} + {data.GMD_PayDate} + + {addButton(index + 1 == invoiceZDDetail.length)} + + + + ); + } else { + // 一个团只能有一个未审核的账单记录 + return ( + + + +
+ Invoice {index + 1} + + +
+ +
Click to Upload
+
+
+
+ Details + + + {" "} + + + + + + + + + + + + + + + + + + + +

+ 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. +

+
+ + +
+ ); + } + }); + return submitForm; + } + return ( + <> + + + + Reference Number: {invoiceGroupInfo.VGroupInfo} + + + + + + + {bindSubmitForm()} + + + ); } export default observer(Detail); diff --git a/src/views/invoice/Index.jsx b/src/views/invoice/Index.jsx index a5b4097..b4e14f6 100644 --- a/src/views/invoice/Index.jsx +++ b/src/views/invoice/Index.jsx @@ -100,7 +100,7 @@ function Index() { - +