车票信息编辑

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: "国航" },
+	seatTable: [
-		{ label: "MU-东方航空", value: "东方航空" },
+		{ code: "9", name: "商务座", enName: "Business Class Seat" },
-		{ label: "FM-上海航空", value: "上海航空" },
+		{ code: "P", name: "特等座", enName: "Superior Seat" },
-		{ label: "CZ-南方航空", value: "南方航空" },
+		{ code: "M", name: "一等座", enName: "First Class Seat" },
-		{ label: "HO-吉祥航空", value: "吉祥航空" },
+		{ code: "O", name: "二等座", enName: "Second Class Seat" },
-		{ label: "HU-海南航空", value: "海南航空" },
+		{ code: "6", name: "高级软卧", enName: "Superior Soft Sleeper" },
-		{ label: "ZH-深圳航空", value: "深圳航空" },
+		{ code: "5", name: "包厢硬卧", enName: "Hard Sleeper in Private Compartment" },
-		{ label: "MF-厦门航空", value: "厦门航空" },
+		{ code: "4", name: "软卧", enName: "Soft Sleeper" },
-		{ label: "3U-四川航空", value: "四川航空" },
+		{ code: "F", name: "动卧", enName: "High - Speed Train Sleeper" },
-		{ label: "SC-山东航空", value: "山东航空" },
+		{ code: "3", name: "硬卧", enName: "Hard Sleeper" },
-		{ label: "JD-首都航空", value: "首都航空" },
+		{ code: "2", name: "软座", enName: "Soft Seat" },
-		{ label: "BK-奥凯航空", value: "奥凯航空" },
+		{ code: "1", name: "硬座", enName: "Hard Seat" },
-		{ label: "GS-天津航空", value: "天津航空" },
+		{ code: "Q", name: "观光座", enName: "Sightseeing Seat" },
-		{ label: "CN-大新华", value: "大新华" },
+		{ code: "H", name: "其它", enName: "Other" },
-		{ label: "KN-中联航", value: "中联航" },
+		{ code: "WZ", name: "无座", enName: "Standing - room Only" },
-		{ label: "TV-西藏航空", value: "西藏航空" },
+		{ code: "YDW", name: "一等卧", enName: "First - Class Sleeper" },
-		{ label: "8L-祥鹏航空", value: "祥鹏航空" },
+		{ code: "EDW", name: "二等卧", enName: "Second - Class Sleeper" },
-		{ 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: "广西北部" },
 	],
 }));
 

src/views/trainticket/index.jsx

@@ -42,11 +42,6 @@ const planListColumns = [
 		key: "FlightNo",
 		dataIndex: "FlightNo",
 	},
-	{
-		title: "座位类型",
-		key: "FlightCabin",
-		dataIndex: "FlightCabin",
-	},
 	{
 		title: "出发日期",
 		key: "StartDate",

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,
+		seatTable,
-		airPortList,
+	] = trainTicketStore(state => [
-		airLineList,
-	] = airTicketStore(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.seatTable,
-		state.airPortList,
-		state.airLineList,
 	]);
 	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 &&
+			seatTable &&
-			airPortList.map(item => {
+			seatTable.map(item => {
-				return { label: `${item.AirPort_Code} - ${item.AirPort_Name}`, value: item.AirPort_Name };
+				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: "票号",
+			title: "车厢",
-			key: "TicketNo",
+			key: "Cabin",
-			dataIndex: "TicketNo",
+			dataIndex: "Cabin",
 			render: (text, record) => (record.CostType == "出票" ? text : "-"),
 		},
 		{
-			title: "PNR",
+			title: "座位号",
-			key: "PNR",
+			key: "SeatNo",
-			dataIndex: "PNR",
+			dataIndex: "SeatNo",
 			render: (text, record) => (record.CostType == "出票" ? text : "-"),
 		},
 
 		{
-			title: "机票类型",
+			title: "座位类型",
-			key: "FlightType",
+			key: "SeatClass",
-			dataIndex: "FlightType",
+			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 Trainticket_form = props => {
-		const airInfo = props.airInfo;
+		const trainInfo = props.airInfo;
-		const [airinfo_form] = Form.useForm();
+		const [traininfo_form] = Form.useForm();
 		return (
 			<>
 				<Form
-					form={airinfo_form}
+					form={traininfo_form}
-					name={"ticket_form_" + airInfo.id}
+					name={"ticket_form_" + trainInfo.id}
 					labelCol={{
 						span: 6,
 					}}
 					wrapperCol={{
 						span: 16,
 					}}
-					initialValues={{ ...airInfo, StartDate: dayjs(airInfo.StartDate) }}
+					initialValues={{ ...trainInfo, StartDate: dayjs(trainInfo.StartDate) }}
 					onFinish={values => {
-						postFlightDetail(airInfo.CLF_SN, airInfo.GRI_SN, airInfo.VEI_SN, airInfo, values)
+						postFlightDetail(trainInfo.CLF_SN, trainInfo.GRI_SN, trainInfo.VEI_SN, trainInfo, values)
 							.then(() => {
 								notification.success({
 									message: `成功`,
-									description: "机票信息保存成功!",
+									description: "车票信息保存成功!",
 									placement: "top",
 									duration: 4,
 									icon: <LikeTwoTone />,
@@ -182,29 +170,37 @@ const AirticketPlan = props => {
 							});
 					}}
 					autoComplete="off">
-					<Divider orientation="left">航班信息</Divider>
+					<Divider orientation="left">火车信息</Divider>
 					<Row gutter={16}>
 						<Col md={24} lg={20} xxl={20}>
-							<Form.Item label="出发日期、航班、城市、时间" required>
+							<Form.Item label="出发日期、车次、取票号" required>
 								<Space>
 									<Form.Item name="StartDate" noStyle rules={[{ required: true, message: "请输入出发日期!" }]}>
 										<DatePicker
+											placeholder="出发日期"
 											style={{
 												minWidth: 160,
 											}}
 										/>
 									</Form.Item>
-									<Form.Item name="FlightNo" noStyle rules={[{ required: true, message: "请输入航班号!" }]}>
+									<Form.Item name="FlightNo" noStyle rules={[{ required: true, message: "请输入车次!" }]}>
-										<Input placeholder="航班号" />
+										<Input placeholder="车次" />
+									</Form.Item>
+									<Form.Item name="TicketNo" noStyle rules={[{ required: true, message: "请输入取票号!" }]}>
+										<Input placeholder="取票号" />
+									</Form.Item>
+								</Space>
 							</Form.Item>
-									<Form.Item name="FromCity" noStyle rules={[{ required: true, message: "请输入出发城市!" }]}>
+							<Form.Item label="出发站、抵达站" required>
+								<Space>
+									<Form.Item name="FromAirport" noStyle rules={[{ required: true, message: "请输入出发站!" }]}>
 										<Input placeholder="出发" />
 									</Form.Item>
 									<Form.Item name="FlightStart" noStyle rules={[{ required: true, message: "请输入出发时间!" }]}>
 										<Input placeholder="出发时间" />
 									</Form.Item>
 									-
-									<Form.Item name="ToCity" noStyle rules={[{ required: true, message: "请输入抵达城市!" }]}>
+									<Form.Item name="ToAirport" noStyle rules={[{ required: true, message: "请输入抵达站!" }]}>
 										<Input placeholder="抵达" />
 									</Form.Item>
 									<Form.Item name="FlightEnd" noStyle rules={[{ required: true, message: "请输入抵达时间!" }]}>
@@ -212,44 +208,7 @@ const AirticketPlan = props => {
 									</Form.Item>
 								</Space>
 							</Form.Item>
-							<Form.Item label="机场、航站楼、仓位、行李重量" required>
+							<Form.Item name="ServiceType" hidden initialValue="2">	
-								<Space>
-									<Form.Item name="FromAirport" noStyle rules={[{ required: true, message: "请输入出发机场!" }]}>
-										<Select
-											showSearch
-											placeholder="出发机场"
-											style={{
-												minWidth: 160,
-											}}
-											filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
-											options={airPortList_select()}
-										/>
-									</Form.Item>
-									<Form.Item name="FromTerminal" noStyle rules={[{ required: true, message: "请输入出发航站楼!" }]}>
-										<Input placeholder="航站楼" />
-									</Form.Item>
-									-
-									<Form.Item name="ToAirport" noStyle rules={[{ required: true, message: "请输入抵达机场!" }]}>
-										<Select
-											showSearch
-											placeholder="抵达机场"
-											style={{
-												minWidth: 160,
-											}}
-											filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
-											options={airPortList_select()}
-										/>
-									</Form.Item>
-									<Form.Item name="ToTerminal" noStyle rules={[{ required: true, message: "请输入抵达航站楼!" }]}>
-										<Input placeholder="航站楼" />
-									</Form.Item>
-									<Form.Item name="FlightCabin" noStyle rules={[{ required: true, message: "请输入仓位!" }]}>
-										<Input placeholder="仓位" />
-									</Form.Item>
-									<Form.Item name="Baggage" noStyle>
-										<Input placeholder="行李说明 20KG" />
-									</Form.Item>
-								</Space>
 							</Form.Item>
 						</Col>
 						<Col md={24} lg={4} xxl={4}>
@@ -258,7 +217,7 @@ const AirticketPlan = props => {
 									<Switch checkedChildren="已处理" unCheckedChildren="未处理" />
 								</Form.Item>
 								<Button type="primary" htmlType="submit">
-									1. 保存机票信息
+									1. 保存车票信息
 								</Button>
 							</Space>
 						</Col>
@@ -267,11 +226,11 @@ const AirticketPlan = props => {
 					<Divider orientation="left">出票信息</Divider>
 					<Row gutter={16}>
 						<Col md={24} lg={20} xxl={20}>
-							<Table bordered={true} rowKey="CLC_SN" columns={costListColumns} dataSource={airInfo.Flightcost_AsJOSN} loading={loading} pagination={false} />
+							<Table bordered={true} rowKey="CLC_SN" columns={costListColumns} dataSource={trainInfo.Flightcost_AsJOSN} loading={loading} pagination={false} />
 						</Col>
 						<Col md={24} lg={4} xxl={4}>
 							<Space direction="vertical">
-								<Button type="primary" onClick={() => showModal(airInfo)}>
+								<Button type="primary" onClick={() => showModal(trainInfo)}>
 									2. 添加出票信息
 								</Button>
 							</Space>
@@ -280,7 +239,7 @@ const AirticketPlan = props => {
 					<Divider orientation="left"></Divider>
 					<Row gutter={16}>
 						<Col md={24} lg={20} xxl={20}>
-							<Form.Item label="提醒信息" name="FlightMemo_messages">
+							<Form.Item label="上下站提醒信息" name="FlightMemo_messages">
 								<Input placeholder="没有提醒请留空,信息会抄送给上下站地接" />
 							</Form.Item>
 							<Form.Item label="已发提醒" name="FlightMemo">
@@ -291,7 +250,7 @@ const AirticketPlan = props => {
 							<Button
 								type="primary"
 								onClick={() => {
-									ticketIssuedNotifications(userId,airInfo.CLF_SN, airInfo.OPI_SN,airinfo_form.getFieldValue('FlightMemo_messages'))
+									ticketIssuedNotifications(userId, trainInfo.CLF_SN, trainInfo.OPI_SN, traininfo_form.getFieldValue("FlightMemo_messages"))
 										.then(() => {
 											notification.success({
 												message: `成功`,
@@ -300,7 +259,7 @@ const AirticketPlan = props => {
 												duration: 4,
 												icon: <LikeTwoTone />,
 											});
-											airinfo_form.setFieldValue('FlightMemo_messages','')
+											traininfo_form.setFieldValue("FlightMemo_messages", "");
 										})
 										.catch(() => {
 											notification.error({
@@ -329,7 +288,7 @@ const AirticketPlan = props => {
 						label: `${item.StartDate} ${item.FlightNo}(${item.FromAirport}${item.FlightStart}-${item.ToAirport}${item.FlightEnd})(${item.FlightCabin})`,
 						extra: (
 							<Popconfirm
-								title="请确认要删除航班记录"
+								title="请确认要删除车票记录"
 								description=""
 								onConfirm={() => {
 									delete_flight_info(item.CLF_SN); //删除记录
@@ -342,13 +301,13 @@ const AirticketPlan = props => {
 								</Button>
 							</Popconfirm>
 						),
-						children: <Airticket_form airInfo={item} />,
+						children: <Trainticket_form airInfo={item} />,
 					};
 			  })
 			: [];
 	};
 
-	// 机票信息编辑表单 begin
+	// 车票信息编辑表单 begin
 
 	const [isModalOpen, setIsModalOpen] = useState(false);
 	const [isModalOpen_confirmInfo, setisModalOpen_confirmInfo] = useState(false);
@@ -372,7 +331,6 @@ const AirticketPlan = props => {
 			.validateFields()
 			.then(values => {
 				// 在这里处理表单提交逻辑，例如发送数据到服务器
-				console.log("Received values of form: ", values);
 				postFlightCost(values)
 					.then(() => {
 						notification.success({
@@ -479,13 +437,12 @@ const AirticketPlan = props => {
 			});
 	};
 
-	// 机票信息编辑表单 end
+	// 车票信息编辑表单 end
 
 	useEffect(() => {
 		getPlanDetail(travelAgencyId, gri_sn); //计划详情，含费用列表
 		getGuestList(coli_sn); //客人列表
 		getVeiPlanChange(travelAgencyId, gri_sn); //计划变更信息
-		getAirPortList(); //获取机场信息
 	}, []);
 
 	return (
@@ -493,7 +450,7 @@ const AirticketPlan = props => {
 			<Row>
 				<Col md={20} lg={20} xxl={20}></Col>
 				<Col md={4} lg={4} xxl={4}>
-					<BackBtn to={"/airticket"} />
+					<BackBtn to={"/trainticket"} />
 				</Col>
 			</Row>
 
@@ -516,7 +473,7 @@ const AirticketPlan = props => {
 					<br />
 					<p style={{ textAlign: "right" }}>
 						<Popconfirm
-							title="请确认要增加航班记录"
+							title="请确认要增加车票记录"
 							description=""
 							onConfirm={() => {
 								postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1 }, []); //新增加一条记录
@@ -525,7 +482,7 @@ const AirticketPlan = props => {
 							okText="是"
 							cancelText="否">
 							<Button type="dashed" icon={<PlusOutlined />}>
-								新增航班记录
+								新增车票记录
 							</Button>
 						</Popconfirm>
 					</p>
@@ -592,7 +549,7 @@ const AirticketPlan = props => {
 					labelCol={{
 						span: 5,
 					}}>
-					<Form.Item label="状态" name="CostType">
+					<Form.Item label="费用类型" name="CostType">
 						<Select
 							style={{
 								width: 160,
@@ -617,40 +574,30 @@ const AirticketPlan = props => {
 
 					{isTicketType && (
 						<>
-							<Form.Item label="PNR" name="PNR" rules={[{ required: true }]}>
+							<Form.Item label="车厢" name="Cabin" rules={[{ required: true }]}>
-								<Input />
+								<Input
+									style={{
+										width: 160,
+									}}
+								/>
 							</Form.Item>
-							<Form.Item label="票号" name="TicketNo" rules={[{ required: true }]}>
+							<Form.Item label="座位号" name="SeatNo" rules={[{ required: true }]}>
 								<Input
 									style={{
 										width: 160,
 									}}
 								/>
 							</Form.Item>
-							<Form.Item label="机票类型" name="FlightType" rules={[{ required: true }]}>
+							<Form.Item label="座位类型" name="SeatClass" rules={[{ required: true }]}>
 								<Select
 									style={{
 										width: 160,
 									}}
-									options={[
+									options={seatTableList_select()}
-										{
-											value: "成人",
-											label: "成人",
-										},
-										{
-											value: "儿童",
-											label: "儿童",
-										},
-										{
-											value: "婴儿",
-											label: "婴儿",
-										},
-									]}
 								/>
 							</Form.Item>
-							<Form.Item label="机票价格" name="Cost" rules={[{ required: true }]}>
+							<Form.Item label="车票价格" name="Cost" rules={[{ required: true }]}>
 								<Input
-									placeholder="含基建和税"
 									prefix="￥"
 									style={{
 										width: 160,
@@ -669,14 +616,6 @@ const AirticketPlan = props => {
 					</Form.Item>
 					{isTicketType && (
 						<>
-							<Form.Item label="折扣" name="Discount" rules={[{ required: true }]}>
-								<Input
-									style={{
-										width: 160,
-									}}
-									placeholder="如 0.9"
-								/>
-							</Form.Item>
 							<Form.Item label="选择客人" name="MEI_Name66">
 								<Radio.Group
 									onChange={e => guestList_OnChange(e)}
@@ -719,4 +658,4 @@ const AirticketPlan = props => {
 	);
 };
 
-export default AirticketPlan;
+export default TrainticketPlan;