diff --git a/src/stores/Trainticket.js b/src/stores/Trainticket.js index 1082e34..8f0a1bf 100644 --- a/src/stores/Trainticket.js +++ b/src/stores/Trainticket.js @@ -12,7 +12,6 @@ const trainTicketStore = create((set, get) => ({ setGuestList: guestList => set({ guestList }), setVEIFlightBill: vEIFlightBill => set({ vEIFlightBill }), setVeiPlanChangeTxt: veiPlanChangeTxt => set({ veiPlanChangeTxt }), - setAirPortList: airPortList => set({ airPortList }), async getPlanList(vei_sn, GRI_Name, TimeStart, TimeEnd, plan_state, airticket_state) { const { setLoading, setPlanList } = get(); @@ -68,7 +67,7 @@ const trainTicketStore = create((set, get) => ({ } }); }, - //删除航班信息 + //删除火车信息 async delete_flight_info(CLF_SN) { const searchParams = { CLF_SN: CLF_SN, @@ -97,6 +96,7 @@ const trainTicketStore = create((set, get) => ({ CheckStatus: CheckStatus, FlightDate1: FlightDate1, FlightDate2: FlightDate2, + ServiceType: 2, }; const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetVEIFlightBill`, searchParams); const _result = errcode !== 0 ? [] : result; @@ -144,6 +144,7 @@ const trainTicketStore = create((set, get) => ({ formData.append("VEI_SN", VEI_SN); formData.append("GRI_SN", GRI_SN); formData.append("LMI_SN", LMI_SN); + formData.append("ServiceType", 2); formData.append("ConfirmInfo", ConfirmInfo); const postUrl = HT_HOST + "/Service_BaseInfoWeb/VeiFlightPlanConfirm"; return postForm(postUrl, formData).then(json => { @@ -158,6 +159,7 @@ const trainTicketStore = create((set, get) => ({ async postVEIFlightBillSubmit(VEI_SN, values) { const formData = new FormData(); formData.append("vei_sn", VEI_SN); + formData.append("ServiceType", 2); formData.append("billdata", JSON.stringify(values)); const postUrl = HT_HOST + "/Service_BaseInfoWeb/VEIFlightBillSubmit"; return postForm(postUrl, formData).then(json => { @@ -168,25 +170,20 @@ const trainTicketStore = create((set, get) => ({ } }); }, - //通知顾问查看机票信息 + //通知顾问查看车票信息 async ticketIssuedNotifications(LMI_SN, CLF_SN, OPI_SN, FlightMemo_messages) { const searchParams = { CLF_SN: CLF_SN, OPI_SN: OPI_SN, LMI_SN: LMI_SN, + ServiceType: 2, FlightMemo_messages: FlightMemo_messages, }; const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/TicketIssuedNotifications`, searchParams); const _result = errcode !== 0 ? [] : result; return _result; }, - //获取机场列表 - async getAirPortList() { - const { setAirPortList } = get(); - const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetAirPortInfo`); - const _result = errcode !== 0 ? [] : result; - setAirPortList(_result); - }, + // 定义座位表对象 seatTable: [ diff --git a/src/views/trainticket/invoice.jsx b/src/views/trainticket/invoice.jsx index 73680e3..0aefc75 100644 --- a/src/views/trainticket/invoice.jsx +++ b/src/views/trainticket/invoice.jsx @@ -8,14 +8,14 @@ import SearchForm from "@/components/SearchForm"; import BackBtn from "@/components/BackBtn"; import { TableExportBtn } from "@/components/Data"; -import airTicketStore from "@/stores/Airticket"; +import trainTicketStore from "@/stores/Trainticket"; import { usingStorage } from "@/hooks/usingStorage"; const Invoice = props => { const navigate = useNavigate(); const { notification } = App.useApp(); const { travelAgencyId } = usingStorage(); - const [getVEIFlightBill, vEIFlightBill, loading, postVEIFlightBillSubmit] = airTicketStore(state => [state.getVEIFlightBill, state.vEIFlightBill, state.loading, state.postVEIFlightBillSubmit]); + const [getVEIFlightBill, vEIFlightBill, loading, postVEIFlightBillSubmit] = trainTicketStore(state => [state.getVEIFlightBill, state.vEIFlightBill, state.loading, state.postVEIFlightBillSubmit]); const showTotal = total => `合计 ${total} `; const [selectedValues, setSelectedValues] = useState([]); @@ -222,7 +222,7 @@ const Invoice = props => { /> - + diff --git a/src/views/trainticket/invoicePaid.jsx b/src/views/trainticket/invoicePaid.jsx index 0a9dcd9..a85e84a 100644 --- a/src/views/trainticket/invoicePaid.jsx +++ b/src/views/trainticket/invoicePaid.jsx @@ -11,7 +11,6 @@ import { TableExportBtn } from "@/components/Data"; import useInvoiceStore from "@/stores/Invoice"; import { fetchInvoicePaidDetail } from "@/stores/Invoice"; -import airTicketStore from "@/stores/Airticket"; import { usingStorage } from "@/hooks/usingStorage"; const InvoicePaid = props => { @@ -112,7 +111,7 @@ const InvoicePaid = props => { /> - + diff --git a/src/views/trainticket/plan.jsx b/src/views/trainticket/plan.jsx index cc29a27..97148cf 100644 --- a/src/views/trainticket/plan.jsx +++ b/src/views/trainticket/plan.jsx @@ -476,7 +476,7 @@ const TrainticketPlan = props => { title="请确认要增加车票记录" description="" onConfirm={() => { - postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1 }, []); //新增加一条记录 + postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1 ,ServiceType:2}, []); //新增加一条记录 getPlanDetail(travelAgencyId, gri_sn); //计划详情,含费用列表 }} okText="是"