diff --git a/package.json b/package.json
index b0376bd..8a99205 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "global-highlights-hub",
"private": true,
- "version": "2.0.9",
+ "version": "2.0.10",
"type": "module",
"scripts": {
"dev": "vite",
diff --git a/src/components/SearchForm.jsx b/src/components/SearchForm.jsx
index f1f27a6..6cf8b6e 100644
--- a/src/components/SearchForm.jsx
+++ b/src/components/SearchForm.jsx
@@ -44,6 +44,7 @@ const SearchForm = ({ initialValue, onSubmit, onReset, onMounted, confirmText, f
{ key: "endtime", transform: arrVal => (arrVal ? arrVal[1].format(SMALL_DATETIME_FORMAT) : "") },
],
invoiceStatus: { key: "invoiceStatus", transform: value => value?.value || value?.key || "", default: "" },
+ invoiceCheckStatus: { key: "invoiceCheckStatus", transform: value => value?.value || value?.key || "", default: "" },
audit_state: { key: "audit_state", transform: value => value?.value || value?.key || "", default: "" },
agency: {
key: "agency",
@@ -222,6 +223,22 @@ function getFields(props) {
,
fieldProps?.invoiceStatus?.col || 3
),
+ item(
+ "invoiceCheckStatus", //账单审核状态
+ 99,
+
+
+ ,
+ fieldProps?.invoiceCheckStatus?.col || 3
+ ),
item(
"dates", //时间日期
99,
diff --git a/src/views/airticket/Invoice.jsx b/src/views/airticket/Invoice.jsx
index d601ba5..73680e3 100644
--- a/src/views/airticket/Invoice.jsx
+++ b/src/views/airticket/Invoice.jsx
@@ -1,5 +1,5 @@
import { useState, useEffect } from "react";
-import { Grid, Divider, Layout, Steps, Input, Col, Row, Space, Checkbox, Table, Button, App, Typography } from "antd";
+import { Grid, Divider, Layout, Steps, Statistic, Col, Row, Space, Checkbox, Table, Button, App, Typography } from "antd";
import { PhoneOutlined, CustomerServiceOutlined, FrownTwoTone, LikeTwoTone } from "@ant-design/icons";
import { useParams, useHref, useNavigate, NavLink } from "react-router-dom";
import { isEmpty, formatColonTime } from "@/utils/commons";
@@ -46,10 +46,16 @@ const Invoice = props => {
},
},
{
- title: "城市",
+ title: "出发",
key: "FromCity",
dataIndex: "FromCity",
- render: (text, record) => (record.CostType == "出票" ? `${record.FromCity} - ${record.ToCity}` : "-"),
+ render: (text, record) => (record.CostType == "出票" ? `${record.FromCity}` : "-"),
+ },
+ {
+ title: "抵达",
+ key: "ToCity",
+ dataIndex: "ToCity",
+ render: (text, record) => (record.CostType == "出票" ? `${record.ToCity}` : "-"),
},
{
title: "航班",
@@ -118,9 +124,8 @@ const Invoice = props => {
) : (
{
),
},
],
+
sorter: (a, b) => {
return b.CheckStatus - a.CheckStatus;
},
@@ -150,7 +156,7 @@ const Invoice = props => {
};
// 处理checkbox改变事件
const handleCheckboxChange = (event, data) => {
- const value = { CLC_SN: data.CLC_SN, WL: data.WL, OPI_SN: data.OPI_SN, OPI_Email: data.OPI_Email, GRI_SN: data.GRI_SN, GRI_Name: data.GRI_Name };
+ const value = { CLC_SN: data.CLC_SN, WL: data.WL, OPI_SN: data.OPI_SN, OPI_Email: data.OPI_Email, GRI_SN: data.GRI_SN, GRI_Name: data.GRI_Name, Cost: data.Cost, ServiceFee: data.ServiceFee };
if (event.target.checked) {
setSelectedValues([...selectedValues, value]); // 如果被选中,则添加到数组
} else {
@@ -185,7 +191,11 @@ const Invoice = props => {
if (isEmpty(vEIFlightBill)) return;
const allChecked = selectedValues.length === vEIFlightBill.filter(item => item.CheckStatus < 2).length;
setSelectedValues(
- allChecked ? [] : vEIFlightBill.filter(item => item.CheckStatus < 2).map(item => ({ CLC_SN: item.CLC_SN, WL: item.WL, OPI_SN: item.OPI_SN, OPI_Email: item.OPI_Email, GRI_SN: item.GRI_SN, GRI_Name: item.GRI_Name }))
+ allChecked
+ ? []
+ : vEIFlightBill
+ .filter(item => item.CheckStatus < 2)
+ .map(item => ({ CLC_SN: item.CLC_SN, WL: item.WL, OPI_SN: item.OPI_SN, OPI_Email: item.OPI_Email, GRI_SN: item.GRI_SN, GRI_Name: item.GRI_Name, Cost: item.Cost, ServiceFee: item.ServiceFee }))
); // 如果全选,则清空数组,否则添加所有项
};
@@ -200,14 +210,14 @@ const Invoice = props => {
dates: [dayjs().startOf("M"), dayjs().endOf("M")],
}}
fieldsConfig={{
- shows: ["referenceNo", "dates", "invoiceStatus"],
+ shows: ["referenceNo", "dates", "invoiceCheckStatus"],
fieldProps: {
referenceNo: { label: "搜索计划" },
dates: { label: "出发日期", col: 8 },
},
}}
onSubmit={(err, formVal, filedsVal) => {
- getVEIFlightBill(travelAgencyId, formVal.referenceNo, formVal.invoiceStatus, formVal.startdate, formVal.endtime);
+ getVEIFlightBill(travelAgencyId, formVal.referenceNo, formVal.invoiceCheckStatus, formVal.startdate, formVal.endtime);
}}
/>
@@ -219,14 +229,20 @@ const Invoice = props => {
+
-
-
+
+
+ acc + curr.Cost, 0)} />
+
+
+ acc + curr.ServiceFee, 0)} />
+