diff --git a/src/stores/Trainticket.js b/src/stores/Trainticket.js
index 8f0a1bf..247649e 100644
--- a/src/stores/Trainticket.js
+++ b/src/stores/Trainticket.js
@@ -45,6 +45,8 @@ const trainTicketStore = create((set, get) => ({
 	},
 
 	async postFlightDetail(CLF_SN, GRI_SN, VEI_SN, original_values, info_object) {
+		console.log(original_values);
+		
 		const formData = new FormData();
 		formData.append("CLF_SN", CLF_SN ? CLF_SN : "");
 		formData.append("GRI_SN", GRI_SN);
diff --git a/src/views/airticket/Plan.jsx b/src/views/airticket/Plan.jsx
index ee87d93..bd61d85 100644
--- a/src/views/airticket/Plan.jsx
+++ b/src/views/airticket/Plan.jsx
@@ -145,13 +145,13 @@ const AirticketPlan = props => {
 		},
 	];
 
-	const Airticket_form = props => {
-		const airInfo = props.airInfo;
-		const [airinfo_form] = Form.useForm();
+	const Airticket_form = airInfo => {
+		// const airInfo = props.airInfo;
+		// const [airinfo_form] = Form.useForm();
 		return (
 			<>
 				<Form
-					form={airinfo_form}
+					// form={airinfo_form}
 					name={"ticket_form_" + airInfo.id}
 					labelCol={{
 						span: 6,
@@ -277,6 +277,39 @@ const AirticketPlan = props => {
 							</Space>
 						</Col>
 					</Row>
+				</Form>
+
+				<Form
+					labelCol={{
+						span: 6,
+					}}
+					wrapperCol={{
+						span: 16,
+					}}
+					initialValues={{ ...airInfo }}
+					onFinish={values => {
+						ticketIssuedNotifications(userId, airInfo.CLF_SN, airInfo.OPI_SN, values.FlightMemo_messages)
+							.then(() => {
+								notification.success({
+									message: `成功`,
+									description: "提醒信息已发出!",
+									placement: "top",
+									duration: 4,
+									icon: <LikeTwoTone />,
+								});
+								//airinfo_form.setFieldValue('FlightMemo_messages','')
+							})
+							.catch(() => {
+								notification.error({
+									message: `错误`,
+									description: "提醒失败",
+									placement: "top",
+									duration: 4,
+									icon: <FrownTwoTone />,
+								});
+							});
+					}}
+					autoComplete="off">
 					<Divider orientation="left"></Divider>
 					<Row gutter={16}>
 						<Col md={24} lg={20} xxl={20}>
@@ -284,34 +317,11 @@ const AirticketPlan = props => {
 								<Input placeholder="没有提醒请留空,信息会抄送给上下站地接" />
 							</Form.Item>
 							<Form.Item label="已发提醒" name="FlightMemo">
-								<Input.TextArea rows={4} readOnly disabled  />
+								<Input.TextArea rows={4} readOnly disabled />
 							</Form.Item>
 						</Col>
 						<Col md={24} lg={4} xxl={4}>
-							<Button
-								type="primary"
-								onClick={() => {
-									ticketIssuedNotifications(userId,airInfo.CLF_SN, airInfo.OPI_SN,airinfo_form.getFieldValue('FlightMemo_messages'))
-										.then(() => {
-											notification.success({
-												message: `成功`,
-												description: "提醒信息已发出!",
-												placement: "top",
-												duration: 4,
-												icon: <LikeTwoTone />,
-											});
-											airinfo_form.setFieldValue('FlightMemo_messages','')
-										})
-										.catch(() => {
-											notification.error({
-												message: `错误`,
-												description: "提醒失败",
-												placement: "top",
-												duration: 4,
-												icon: <FrownTwoTone />,
-											});
-										});
-								}}>
+							<Button type="primary" htmlType="submit">
 								3. 通知顾问
 							</Button>
 						</Col>
@@ -342,7 +352,7 @@ const AirticketPlan = props => {
 								</Button>
 							</Popconfirm>
 						),
-						children: <Airticket_form airInfo={item} />,
+						children: Airticket_form(item),
 					};
 			  })
 			: [];
@@ -518,8 +528,8 @@ const AirticketPlan = props => {
 						<Popconfirm
 							title="请确认要增加航班记录"
 							description=""
-							onConfirm={() => {
-								postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1 }, []); //新增加一条记录
+							onConfirm={async () => {
+								await postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1 }, []); //新增加一条记录
 								getPlanDetail(travelAgencyId, gri_sn); //计划详情，含费用列表
 							}}
 							okText="是"
diff --git a/src/views/trainticket/index.jsx b/src/views/trainticket/index.jsx
index cc6a295..b77c282 100644
--- a/src/views/trainticket/index.jsx
+++ b/src/views/trainticket/index.jsx
@@ -129,7 +129,7 @@ const Trainticket = props => {
 
 			<Row gutter={16}>
 				<Col md={24} lg={24} xxl={24}>
-					<Table bordered={true} rowKey="id" columns={planListColumns} dataSource={planList} loading={loading} pagination={{ defaultPageSize: 20, showTotal: showTotal }} />
+					<Table bordered={true} rowKey={record => `${record.id}-${record.GRI_SN}`} columns={planListColumns} dataSource={planList} loading={loading} pagination={{ defaultPageSize: 20, showTotal: showTotal }} />
 					<TableExportBtn btnTxt="导出计划" label={`出票计划`} {...{ columns: planListColumns, dataSource: planList }} />
 				</Col>
 				<Col md={24} lg={24} xxl={24}></Col>
diff --git a/src/views/trainticket/plan.jsx b/src/views/trainticket/plan.jsx
index c8b978a..bdb2e50 100644
--- a/src/views/trainticket/plan.jsx
+++ b/src/views/trainticket/plan.jsx
@@ -46,7 +46,7 @@ const TrainticketPlan = props => {
 	]);
 	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 [form] = Form.useForm();
 	const { notification } = App.useApp();
 
 	//乘客下拉列表
@@ -74,7 +74,7 @@ const TrainticketPlan = props => {
 				city, // 城市（如北京）
 			] = record.split("|");
 			return {
-				value: name + "-" + pinyin,
+				value: name + "(" + pinyin + ")",
 				label: name,
 			};
 		});
@@ -155,13 +155,10 @@ const TrainticketPlan = props => {
 		},
 	];
 
-	const Trainticket_form = props => {
-		const trainInfo = props.airInfo;
-		const [traininfo_form] = Form.useForm();
+	const Trainticket_form = trainInfo => {
 		return (
 			<>
 				<Form
-					form={traininfo_form}
 					name={"ticket_form_" + trainInfo.id}
 					labelCol={{
 						span: 6,
@@ -273,7 +270,40 @@ const TrainticketPlan = props => {
 							</Space>
 						</Col>
 					</Row>
-					<Divider orientation="left"></Divider>
+				</Form>
+
+				<Form
+					labelCol={{
+						span: 6,
+					}}
+					wrapperCol={{
+						span: 16,
+					}}
+					initialValues={{ ...trainInfo }}
+					onFinish={values => {
+						ticketIssuedNotifications(userId, trainInfo.CLF_SN, trainInfo.OPI_SN, values.FlightMemo_messages)
+							.then(() => {
+								notification.success({
+									message: `成功`,
+									description: "提醒信息已发出!",
+									placement: "top",
+									duration: 4,
+									icon: <LikeTwoTone />,
+								});
+								//todo: 在这里情况输入框的内容，还未实现 values.FlightMemo_messages = "";
+							})
+							.catch(() => {
+								notification.error({
+									message: `错误`,
+									description: "提醒失败",
+									placement: "top",
+									duration: 4,
+									icon: <FrownTwoTone />,
+								});
+							});
+					}}
+					autoComplete="off">
+					<Divider orientation="left">出票完成通知</Divider>
 					<Row gutter={16}>
 						<Col md={24} lg={20} xxl={20}>
 							<Form.Item label="上下站提醒信息" name="FlightMemo_messages">
@@ -284,30 +314,7 @@ const TrainticketPlan = props => {
 							</Form.Item>
 						</Col>
 						<Col md={24} lg={4} xxl={4}>
-							<Button
-								type="primary"
-								onClick={() => {
-									ticketIssuedNotifications(userId, trainInfo.CLF_SN, trainInfo.OPI_SN, traininfo_form.getFieldValue("FlightMemo_messages"))
-										.then(() => {
-											notification.success({
-												message: `成功`,
-												description: "提醒信息已发出!",
-												placement: "top",
-												duration: 4,
-												icon: <LikeTwoTone />,
-											});
-											traininfo_form.setFieldValue("FlightMemo_messages", "");
-										})
-										.catch(() => {
-											notification.error({
-												message: `错误`,
-												description: "提醒失败",
-												placement: "top",
-												duration: 4,
-												icon: <FrownTwoTone />,
-											});
-										});
-								}}>
+							<Button type="primary" htmlType="submit">
 								3. 通知顾问
 							</Button>
 						</Col>
@@ -338,7 +345,7 @@ const TrainticketPlan = props => {
 								</Button>
 							</Popconfirm>
 						),
-						children: <Trainticket_form airInfo={item} />,
+						children: Trainticket_form(item),
 					};
 			  })
 			: [];
@@ -516,8 +523,9 @@ const TrainticketPlan = props => {
 						<Popconfirm
 							title="请确认要增加车票记录"
 							description=""
-							onConfirm={() => {
-								postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1, ServiceType: 2 }, []); //新增加一条记录
+							onConfirm={async () => {
+								const startDate = planDetail && planDetail.length > 0 && planDetail[planDetail.length - 1].StartDate ? planDetail[planDetail.length - 1].StartDate : "";
+								await postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1, ServiceType: 2 }, { StartDate: startDate }); //新增加一条记录
 								getPlanDetail(travelAgencyId, gri_sn); //计划详情，含费用列表
 							}}
 							okText="是"
@@ -529,11 +537,12 @@ const TrainticketPlan = props => {
 					</p>
 				</Col>
 			</Row>
+
 			<Row>
 				<Divider orientation="left">计划变更</Divider>
 				<Col md={24} lg={12} xxl={12}>
 					<Space direction="vertical" style={{ width: "90%" }}>
-						<Input.TextArea rows={16} readOnly value={veiPlanChangeTxt && veiPlanChangeTxt.ChangeText} />
+						<Input.TextArea rows={16} value={veiPlanChangeTxt && veiPlanChangeTxt.ChangeText} />
 						<Button
 							type="primary"
 							onClick={() => {
@@ -560,7 +569,6 @@ const TrainticketPlan = props => {
 					</Form.Item>
 				</Form>
 			</Modal>
-
 			<Modal
 				title="费用信息"
 				open={isModalOpen}