diff --git a/src/views/airticket/Invoice.jsx b/src/views/airticket/Invoice.jsx index 178f457..d601ba5 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, Spin, Input, Col, Row, Space, Checkbox, Table, Button, App } from "antd"; +import { Grid, Divider, Layout, Steps, Input, 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"; @@ -24,7 +24,11 @@ const Invoice = props => { title: "团名", key: "GRI_No", dataIndex: "GRI_No", - render: (text, record) => `${record.GRI_No} ${record.WL}`, + render: (text, record) => ( + + {record.GRI_No} {record.WL} + + ), }, { title: "状态", @@ -97,11 +101,6 @@ const Invoice = props => { dataIndex: "Discount", render: (text, record) => (record.CostType == "出票" ? text : "-"), }, - { - title: "客人信息/备注", - key: "Memo", - dataIndex: "Memo", - }, { title: "审核状态", children: [ @@ -118,7 +117,25 @@ const Invoice = props => { 待提交 ) : ( - record.CheckStatusName + ), }, ], diff --git a/src/views/airticket/Plan.jsx b/src/views/airticket/Plan.jsx index 33d95d0..8c5254c 100644 --- a/src/views/airticket/Plan.jsx +++ b/src/views/airticket/Plan.jsx @@ -612,7 +612,7 @@ const AirticketPlan = props => { {isTicketType && ( <> - +