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

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";

src/views/feedback/Detail.jsx

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

src/views/feedback/Index.jsx

@@ -96,10 +96,10 @@ function Index() {
 			</Row>
 			<Title level={3}></Title>
 			<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 }} />
 				</Col>
-				<Col md={24} lg={24} xxl={12}></Col>
+				<Col md={24} lg={24} xxl={24}></Col>
 			</Row>
 		</Space>
 	);

src/views/invoice/Detail.jsx

@@ -35,6 +35,8 @@ function Detail() {
 			.fetchInvoiceDetail(GMDSN, GSN)
 			.then(json => {
 				let ZDDetail = json.ZDDetail;
+
+				if (isNotEmpty(ZDDetail)){
 					let arrLen = ZDDetail.length;
 					const formData = ZDDetail.map((data, index) => {
 						if (data.GMD_Dealed == false && arrLen == index + 1) {
@@ -73,6 +75,7 @@ function Detail() {
 						return picList;
 					});
 					setInvoicePicList(arrPicList);
+				}
 			})
 			.catch(ex => {
 				notification.error({
@@ -181,6 +184,7 @@ function Detail() {
 
 	//循环生成多次报账信息
 	function bindSubmitForm() {
+		if (isNotEmpty(invoiceZDDetail)){
 			let	submitForm = invoiceZDDetail.map((data, index) => {
 				if (data.GMD_Dealed) {
 					//已审核的直接显示信息即可，无需表单
@@ -192,7 +196,7 @@ function Detail() {
 									<Descriptions.Item span={4}>
 										<Upload
 											name="ghhfile"
-										accept="image/*"
+											// accept="image/*" 不限制类型
 											multiple={true}
 											action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice&token=${authStore.login.token}`}
 											fileList={invoicePicList[index]}
@@ -220,7 +224,6 @@ function Detail() {
 									<Form.Item>
 										<Upload
 											name="ghhfile"
-										accept="image/*"
 											multiple={true}
 											action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice&token=${authStore.login.token}`}
 											fileList={fileList}
@@ -276,10 +279,6 @@ function Detail() {
 											Submit
 										</Button>
 									</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>
 							</Col>
 							<Col span={4}></Col>
@@ -288,6 +287,19 @@ function Detail() {
 				}
 			});
 			return submitForm;
+		}else{
+				return(
+					<Row gutter={16} style={{ backgroundColor: "#f6f7f9", width: "100%", padding: "20px 40px" }}>
+						<Col span={4}></Col>
+							<Col span={18}>
+								{addButton(1==1)}
+							</Col>
+							<Col span={4}></Col>
+					</Row>
+				);				
+			
+		}
+		
 	}
 
 	return (

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
 					</Button>
 				</Col>
+				<Col md={24} lg={4} xxl={4}>
+					<Button icon={<AuditOutlined />} onClick={() => navigate(`/invoice/detail/0/338787`)}>
+						Misc. Invoice
+					</Button>
+				</Col>
 			</Row>
 			<Title level={3}></Title>
 			<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)} />
 				</Col>
 			</Row>

src/views/reservation/Newest.jsx

@@ -5,8 +5,8 @@ import { toJS } from "mobx";
 import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal, App, Select } from 'antd';
 import dayjs from "dayjs";
 import { useStore } from '@/stores/StoreContext.js';
-import { formatDate, isEmpty } from "@/utils/commons";
 import { DATE_PRESETS } from "@/config";
+import { formatDate, isEmpty } from "@/utils/commons";
 
 const { Title } = Typography;