diff --git a/src/stores/Trainticket.js b/src/stores/Trainticket.js index f4089c9..1082e34 100644 --- a/src/stores/Trainticket.js +++ b/src/stores/Trainticket.js @@ -28,7 +28,6 @@ const trainTicketStore = create((set, get) => ({ const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetTrainPlan`, searchParams); const _result = errcode !== 0 ? [] : result; - console.log("result", result); setPlanList(_result); setLoading(false); }, @@ -39,7 +38,7 @@ const trainTicketStore = create((set, get) => ({ vei_sn: vei_sn, gri_sn: gri_sn, }; - const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetFlightPlanDetail`, searchParams); + const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetTrainPlanDetail`, searchParams); const _result = errcode !== 0 ? [] : result; setPlanDetail(_result); //return _result.filter(item => isNotEmpty(item.GRI_No)); @@ -189,38 +188,24 @@ const trainTicketStore = create((set, get) => ({ setAirPortList(_result); }, - airLineList: [ - { label: "CA-国航", value: "国航" }, - { label: "MU-东方航空", value: "东方航空" }, - { label: "FM-上海航空", value: "上海航空" }, - { label: "CZ-南方航空", value: "南方航空" }, - { label: "HO-吉祥航空", value: "吉祥航空" }, - { label: "HU-海南航空", value: "海南航空" }, - { label: "ZH-深圳航空", value: "深圳航空" }, - { label: "MF-厦门航空", value: "厦门航空" }, - { label: "3U-四川航空", value: "四川航空" }, - { label: "SC-山东航空", value: "山东航空" }, - { label: "JD-首都航空", value: "首都航空" }, - { label: "BK-奥凯航空", value: "奥凯航空" }, - { label: "GS-天津航空", value: "天津航空" }, - { label: "CN-大新华", value: "大新华" }, - { label: "KN-中联航", value: "中联航" }, - { label: "TV-西藏航空", value: "西藏航空" }, - { label: "8L-祥鹏航空", value: "祥鹏航空" }, - { label: "KY-昆明航空", value: "昆明航空" }, - { label: "EU-成都航空", value: "成都航空" }, - { label: "G5-华夏航空", value: "华夏航空" }, - { label: "NS-河北航空", value: "河北航空" }, - { label: "QW-青岛航空", value: "青岛航空" }, - { label: "Y8-扬子江", value: "扬子江" }, - { label: "PN-西部航空", value: "西部航空" }, - { label: "DZ-东海航空", value: "东海航空" }, - { label: "GT-桂林航空", value: "桂林航空" }, - { label: "9H-长安航空", value: "长安航空" }, - { label: "GY-多彩航空", value: "多彩航空" }, - { label: "DR-瑞丽航空", value: "瑞丽航空" }, - { label: "GJ-长龙航空", value: "长龙航空" }, - { label: "GX-广西北部", value: "广西北部" }, + // 定义座位表对象 + seatTable: [ + { code: "9", name: "商务座", enName: "Business Class Seat" }, + { code: "P", name: "特等座", enName: "Superior Seat" }, + { code: "M", name: "一等座", enName: "First Class Seat" }, + { code: "O", name: "二等座", enName: "Second Class Seat" }, + { code: "6", name: "高级软卧", enName: "Superior Soft Sleeper" }, + { code: "5", name: "包厢硬卧", enName: "Hard Sleeper in Private Compartment" }, + { code: "4", name: "软卧", enName: "Soft Sleeper" }, + { code: "F", name: "动卧", enName: "High - Speed Train Sleeper" }, + { code: "3", name: "硬卧", enName: "Hard Sleeper" }, + { code: "2", name: "软座", enName: "Soft Seat" }, + { code: "1", name: "硬座", enName: "Hard Seat" }, + { code: "Q", name: "观光座", enName: "Sightseeing Seat" }, + { code: "H", name: "其它", enName: "Other" }, + { code: "WZ", name: "无座", enName: "Standing - room Only" }, + { code: "YDW", name: "一等卧", enName: "First - Class Sleeper" }, + { code: "EDW", name: "二等卧", enName: "Second - Class Sleeper" }, ], })); diff --git a/src/views/trainticket/index.jsx b/src/views/trainticket/index.jsx index 523b862..01f3cff 100644 --- a/src/views/trainticket/index.jsx +++ b/src/views/trainticket/index.jsx @@ -42,11 +42,6 @@ const planListColumns = [ key: "FlightNo", dataIndex: "FlightNo", }, - { - title: "座位类型", - key: "FlightCabin", - dataIndex: "FlightCabin", - }, { title: "出发日期", key: "StartDate", diff --git a/src/views/trainticket/plan.jsx b/src/views/trainticket/plan.jsx index ee87d93..cc29a27 100644 --- a/src/views/trainticket/plan.jsx +++ b/src/views/trainticket/plan.jsx @@ -5,11 +5,11 @@ import { useParams, useHref, useNavigate, NavLink } from "react-router-dom"; import { isEmpty, formatColonTime } from "@/utils/commons"; import { OFFICEWEBVIEWERURL } from "@/config"; import dayjs from "dayjs"; -import airTicketStore from "@/stores/Airticket"; +import trainTicketStore from "@/stores/Trainticket"; import { usingStorage } from "@/hooks/usingStorage"; import BackBtn from "@/components/BackBtn"; -const AirticketPlan = props => { +const TrainticketPlan = props => { const { coli_sn, gri_sn } = useParams(); const { travelAgencyId, loginToken, userId } = usingStorage(); const [ @@ -26,10 +26,8 @@ const AirticketPlan = props => { postVeiFlightPlanConfirm, ticketIssuedNotifications, delete_flight_info, - getAirPortList, - airPortList, - airLineList, - ] = airTicketStore(state => [ + seatTable, + ] = trainTicketStore(state => [ state.getPlanDetail, state.planDetail, state.getGuestList, @@ -43,15 +41,12 @@ const AirticketPlan = props => { state.postVeiFlightPlanConfirm, state.ticketIssuedNotifications, state.delete_flight_info, - state.getAirPortList, - state.airPortList, - state.airLineList, + state.seatTable, ]); const reservationUrl = `https://p9axztuwd7x8a7.mycht.cn/Service_BaseInfoWeb/FlightPlanDocx?GRI_SN=${gri_sn}&VEI_SN=${travelAgencyId}&token=${loginToken}`; const reservationPreviewUrl = OFFICEWEBVIEWERURL + encodeURIComponent(reservationUrl); const [form] = Form.useForm(); const { notification } = App.useApp(); - //console.log(reservationPreviewUrl); //乘客下拉列表 const guestList_select = () => { @@ -66,12 +61,12 @@ const AirticketPlan = props => { const guestList_OnChange = e => { ticket_form.setFieldsValue({ Memo: `${e.target.value}` }); }; - //机场下拉列表 - const airPortList_select = () => { + //座位类型下拉列表 + const seatTableList_select = () => { return ( - airPortList && - airPortList.map(item => { - return { label: `${item.AirPort_Code} - ${item.AirPort_Name}`, value: item.AirPort_Name }; + seatTable && + seatTable.map(item => { + return { label: `${item.name}-${item.code}`, value: `${item.name}-${item.code}` }; }) ); }; @@ -84,31 +79,31 @@ const AirticketPlan = props => { dataIndex: "Memo", }, { - title: "状态", + title: "费用类型", key: "CostType", dataIndex: "CostType", }, { - title: "票号", - key: "TicketNo", - dataIndex: "TicketNo", + title: "车厢", + key: "Cabin", + dataIndex: "Cabin", render: (text, record) => (record.CostType == "出票" ? text : "-"), }, { - title: "PNR", - key: "PNR", - dataIndex: "PNR", + title: "座位号", + key: "SeatNo", + dataIndex: "SeatNo", render: (text, record) => (record.CostType == "出票" ? text : "-"), }, { - title: "机票类型", - key: "FlightType", - dataIndex: "FlightType", + title: "座位类型", + key: "SeatClass", + dataIndex: "SeatClass", render: (text, record) => (record.CostType == "出票" ? text : "-"), }, { - title: "机票价格", + title: "车票价格", key: "Cost", dataIndex: "Cost", render: (text, record) => (record.CostType == "出票" ? text : "-"), @@ -118,13 +113,6 @@ const AirticketPlan = props => { key: "ServiceFee", dataIndex: "ServiceFee", }, - { - title: "折扣", - key: "Discount", - dataIndex: "Discount", - render: (text, record) => (record.CostType == "出票" ? text : "-"), - }, - { title: "编辑", key: "CLC_SN", @@ -145,27 +133,27 @@ const AirticketPlan = props => { }, ]; - const Airticket_form = props => { - const airInfo = props.airInfo; - const [airinfo_form] = Form.useForm(); + const Trainticket_form = props => { + const trainInfo = props.airInfo; + const [traininfo_form] = Form.useForm(); return ( <>