diff --git a/src/views/airticket/Plan.jsx b/src/views/airticket/Plan.jsx
index 549ff50..b218451 100644
--- a/src/views/airticket/Plan.jsx
+++ b/src/views/airticket/Plan.jsx
@@ -430,165 +430,6 @@ const AirticketPlan = props => {
 		}
 	};
 
-	const TicketModal = () => {
-		return (
-			<>
-				<Modal
-					title="费用信息"
-					open={isModalOpen}
-					onOk={handleOk}
-					onCancel={handleCancel}
-					okText="保存"
-					cancelText="关闭"
-					footer={(_, { OkBtn, CancelBtn }) => (
-						<>
-							<CancelBtn />
-							{isAddNew ? (
-								<>
-									<Button type="primary" onClick={() => handleOk(false)}>
-										添加并继续新增
-									</Button>{" "}
-									<Button type="primary" onClick={() => handleOk(true)}>
-										添加并关闭
-									</Button>
-								</>
-							) : (
-								<OkBtn />
-							)}
-						</>
-					)}>
-					<Form
-						form={ticket_form}
-						labelCol={{
-							span: 5,
-						}}>
-						<Form.Item label="状态" name="CostType">
-							<Select
-								style={{
-									width: 160,
-								}}
-								onChange={onChangeType}
-								options={[
-									{
-										value: "出票",
-										label: "出票",
-									},
-									{
-										value: "改签",
-										label: "改签",
-									},
-									{
-										value: "退票",
-										label: "退票",
-									},
-								]}
-							/>
-						</Form.Item>
-
-						{isTicketType && (
-							<>
-								<Form.Item label="PNR" name="PNR" rules={[{ required: true }]}>
-									<Input />
-								</Form.Item>
-								<Form.Item label="票号" name="TicketNo" rules={[{ required: true }]}>
-									<Input
-										style={{
-											width: 160,
-										}}
-									/>
-								</Form.Item>
-								<Form.Item label="机票类型" name="FlightType" rules={[{ required: true }]}>
-									<Select
-										style={{
-											width: 160,
-										}}
-										options={[
-											{
-												value: "成人",
-												label: "成人",
-											},
-											{
-												value: "儿童",
-												label: "儿童",
-											},
-											{
-												value: "婴儿",
-												label: "婴儿",
-											},
-										]}
-									/>
-								</Form.Item>
-								<Form.Item label="机票价格" name="Cost" rules={[{ required: true }]}>
-									<Input
-										placeholder="含基建和税"
-										prefix="￥"
-										style={{
-											width: 160,
-										}}
-									/>
-								</Form.Item>
-							</>
-						)}
-						<Form.Item label="服务费" name="ServiceFee" rules={[{ required: true }]}>
-							<Input
-								prefix="￥"
-								style={{
-									width: 160,
-								}}
-							/>
-						</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)}
-										style={{
-											minWidth: 320,
-										}}>
-										<List
-											bordered
-											dataSource={guestList_select()}
-											renderItem={item => (
-												<List.Item>
-													<Radio value={item.value}>{item.label}</Radio>
-												</List.Item>
-											)}></List>
-									</Radio.Group>
-									{/* <Select onChange={value => guestList_OnChange(value)} options={guestList_select()} placeholder="如果列表里面没有客人信息，请手动录到备注里" /> */}
-								</Form.Item>
-							</>
-						)}
-
-						<Form.Item label="客人信息/备注" name="Memo">
-							<Input.TextArea rows={4} disabled={isTicketType} />
-						</Form.Item>
-
-						<Form.Item name="CLF_SN" hidden>
-							<input />
-						</Form.Item>
-						<Form.Item name="GRI_SN" hidden>
-							<input />
-						</Form.Item>
-						<Form.Item name="VEI_SN" hidden>
-							<input />
-						</Form.Item>
-						<Form.Item name="CLC_SN" hidden>
-							<input />
-						</Form.Item>
-					</Form>
-				</Modal>
-			</>
-		);
-	};
-
 	//变更确认表单
 	const showModal_confirmInfo = ConfirmInfo => {
 		setisModalOpen_confirmInfo(true);
@@ -631,24 +472,6 @@ const AirticketPlan = props => {
 				console.log("Validate Failed:", info);
 			});
 	};
-	//确认变更的界面
-	const ConfirmInfoModal = () => {
-		return (
-			<>
-				<Modal title="变更" open={isModalOpen_confirmInfo} onOk={handleOk_confirmInfo} onCancel={handleCancel_confirmInfo}>
-					<Form
-						form={confirmInfo_form}
-						labelCol={{
-							span: 5,
-						}}>
-						<Form.Item label="确认信息" name="ConfirmInfo" rules={[{ required: true }]}>
-							<Input.TextArea rows={4} />
-						</Form.Item>
-					</Form>
-				</Modal>
-			</>
-		);
-	};
 
 	// 机票信息编辑表单 end
 
@@ -722,8 +545,170 @@ const AirticketPlan = props => {
 				</Col>
 			</Row>
 
-			<TicketModal />
-			<ConfirmInfoModal />
+			<Modal title="变更" open={isModalOpen_confirmInfo} onOk={handleOk_confirmInfo} onCancel={handleCancel_confirmInfo}>
+				<Form
+					form={confirmInfo_form}
+					labelCol={{
+						span: 5,
+					}}>
+					<Form.Item label="确认信息" name="ConfirmInfo" rules={[{ required: true }]}>
+						<Input.TextArea rows={4} />
+					</Form.Item>
+				</Form>
+			</Modal>
+
+			<Modal
+				title="费用信息"
+				open={isModalOpen}
+				onOk={handleOk}
+				onCancel={handleCancel}
+				okText="保存"
+				cancelText="关闭"
+				footer={(_, { OkBtn, CancelBtn }) => (
+					<>
+						<CancelBtn />
+						{isAddNew ? (
+							<>
+								<Button type="primary" onClick={() => handleOk(false)}>
+									添加并继续新增
+								</Button>{" "}
+								<Button type="primary" onClick={() => handleOk(true)}>
+									添加并关闭
+								</Button>
+							</>
+						) : (
+							<OkBtn />
+						)}
+					</>
+				)}>
+				<Form
+					form={ticket_form}
+					labelCol={{
+						span: 5,
+					}}>
+					<Form.Item label="状态" name="CostType">
+						<Select
+							style={{
+								width: 160,
+							}}
+							onChange={onChangeType}
+							options={[
+								{
+									value: "出票",
+									label: "出票",
+								},
+								{
+									value: "改签",
+									label: "改签",
+								},
+								{
+									value: "退票",
+									label: "退票",
+								},
+							]}
+						/>
+					</Form.Item>
+
+					{isTicketType && (
+						<>
+							<Form.Item label="PNR" name="PNR" rules={[{ required: true }]}>
+								<Input />
+							</Form.Item>
+							<Form.Item label="票号" name="TicketNo" rules={[{ required: true }]}>
+								<Input
+									style={{
+										width: 160,
+									}}
+								/>
+							</Form.Item>
+							<Form.Item label="机票类型" name="FlightType" rules={[{ required: true }]}>
+								<Select
+									style={{
+										width: 160,
+									}}
+									options={[
+										{
+											value: "成人",
+											label: "成人",
+										},
+										{
+											value: "儿童",
+											label: "儿童",
+										},
+										{
+											value: "婴儿",
+											label: "婴儿",
+										},
+									]}
+								/>
+							</Form.Item>
+							<Form.Item label="机票价格" name="Cost" rules={[{ required: true }]}>
+								<Input
+									placeholder="含基建和税"
+									prefix="￥"
+									style={{
+										width: 160,
+									}}
+								/>
+							</Form.Item>
+						</>
+					)}
+					<Form.Item label="服务费" name="ServiceFee" rules={[{ required: true }]}>
+						<Input
+							prefix="￥"
+							style={{
+								width: 160,
+							}}
+						/>
+					</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)}
+									style={{
+										minWidth: 320,
+									}}>
+									<List
+										bordered
+										dataSource={guestList_select()}
+										renderItem={item => (
+											<List.Item>
+												<Radio value={item.value}>{item.label}</Radio>
+											</List.Item>
+										)}></List>
+								</Radio.Group>
+								{/* <Select onChange={value => guestList_OnChange(value)} options={guestList_select()} placeholder="如果列表里面没有客人信息，请手动录到备注里" /> */}
+							</Form.Item>
+						</>
+					)}
+
+					<Form.Item label="客人信息/备注" name="Memo">
+						<Input.TextArea rows={4} disabled={isTicketType} />
+					</Form.Item>
+
+					<Form.Item name="CLF_SN" hidden>
+						<input />
+					</Form.Item>
+					<Form.Item name="GRI_SN" hidden>
+						<input />
+					</Form.Item>
+					<Form.Item name="VEI_SN" hidden>
+						<input />
+					</Form.Item>
+					<Form.Item name="CLC_SN" hidden>
+						<input />
+					</Form.Item>
+				</Form>
+			</Modal>
 		</Space>
 	);
 };