Merge remote-tracking branch 'origin/main'

doc/RBAC 权限.sql

@@ -61,6 +61,8 @@ INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
 VALUES ('所有国内功能', '/domestic/all', 'domestic')
 INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
 VALUES ('所有机票功能', '/air-ticket/all', 'air-ticket')
+INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
+VALUES ('所有火车票功能', '/train-ticket/all', 'train-ticket')
 
 -- 价格管理
 INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])

package.json

@@ -1,7 +1,7 @@
 {
   "name": "global-highlights-hub",
   "private": true,
-  "version": "2.0.15",
+  "version": "2.0.20",
   "type": "module",
   "scripts": {
     "dev": "vite",

public/locales/en/common.json

@@ -88,6 +88,7 @@
     "Notice": "Notice",
     "Report": "Report",
     "Airticket": "AirTicket",
+    "Trainticket": "TrainTicket",
     "Products": "Products"
   },
   "Validation": {

public/locales/zh/common.json

@@ -88,6 +88,7 @@
     "Notice": "通知",
     "Report": "质量评分",
     "Airticket": "机票订票",
+    "Trainticket": "火车订票",
     "Products": "产品管理"
   },
   "Validation": {

src/components/SecondHeaderWrapper.jsx

@@ -10,8 +10,8 @@ const HeaderWrapper = ({ children, header, loading, backTo, ...props }) => {
   } = theme.useToken();
   return (
     <>
-      <Spin spinning={loading || false}>
+      <Spin spinning={loading || false} wrapperClassName='h-full [&_.ant-spin-container]:h-full' >
-        <Layout className=' bg-white'>
+        <Layout className=' bg-white h-full'>
           <Header className='header px-6 h-10 ' style={{ background: 'white' }}>
             <Flex justify={'space-between'} align={'center'} className='h-full'>
               {/* {header} */}
@@ -20,7 +20,7 @@ const HeaderWrapper = ({ children, header, loading, backTo, ...props }) => {
             </Flex>
           </Header>
           <Divider className='my-2' />
-          <Content className='' style={{ backgroundColor: colorBgContainer }}>
+          <Content className='overflow-auto' style={{ backgroundColor: colorBgContainer }}>
             {children || <Outlet />}
           </Content>
         </Layout>

src/config.js

@@ -34,6 +34,10 @@ export const PERM_DOMESTIC = '/domestic/all'
 // category: air-ticket
 export const PERM_AIR_TICKET = '/air-ticket/all'
 
+// 火车票供应商
+// category: train-ticket
+export const PERM_TRAIN_TICKET = '/train-ticket/all'
+
 // 价格管理
 export const PERM_PRODUCTS_MANAGEMENT = '/products/*'; // 管理
 export const PERM_PRODUCTS_NEW = '/products/new'; // 新增产品

src/main.jsx

@@ -24,12 +24,19 @@ import NoticeIndex from '@/views/notice/Index'
 import NoticeDetail from '@/views/notice/Detail'
 import InvoiceIndex from '@/views/invoice/Index'
 import InvoiceDetail from '@/views/invoice/Detail'
+import InvoiceHistory from '@/views/invoice/History'
 import InvoicePaid from '@/views/invoice/Paid'
 import InvoicePaidDetail from '@/views/invoice/PaidDetail'
 import Airticket from '@/views/airticket/Index'
 import AirticketPlan from '@/views/airticket/Plan'
 import AirticketInvoice from '@/views/airticket/Invoice'
 import AirticketInvoicePaid from '@/views/airticket/InvoicePaid'
+
+import Trainticket from '@/views/trainticket/index'
+import TrainticketPlan from '@/views/trainticket/plan'
+import TrainticketInvoice from '@/views/trainticket/invoice'
+import TrainticketInvoicePaid from '@/views/trainticket/invoicePaid'
+
 import { ThemeContext } from '@/stores/ThemeContext'
 import { usingStorage } from '@/hooks/usingStorage'
 import useAuthStore from './stores/Auth'
@@ -38,7 +45,7 @@ import { isNotEmpty } from '@/utils/commons'
 import ProductsManage from '@/views/products/Manage';
 import ProductsDetail from '@/views/products/Detail';
 import ProductsAudit from '@/views/products/Audit';
-import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET, PERM_PRODUCTS_MANAGEMENT, PERM_PRODUCTS_OFFER_PUT } from '@/config'
+import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA,PERM_TRAIN_TICKET, PERM_AIR_TICKET, PERM_PRODUCTS_MANAGEMENT, PERM_PRODUCTS_OFFER_PUT } from '@/config'
 
 import './i18n'
 
@@ -64,12 +71,19 @@ const initRouter = async () => {
         { path: 'notice/:CCP_BLID', element: <NoticeDetail />},
         { path: 'invoice',element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoiceIndex /></RequireAuth>},
         { path: 'invoice/detail/:GMDSN/:GSN',element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoiceDetail /></RequireAuth>},
+        { path: 'invoice/history/:GMDSN/:GSN',element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoiceHistory /></RequireAuth>},
         { path: 'invoice/paid',element:<RequireAuth subject={PERM_OVERSEA} result={true}><InvoicePaid /></RequireAuth>},
         { path: 'invoice/paid/detail/:flid', element: <RequireAuth subject={PERM_OVERSEA} result={true}><InvoicePaidDetail /></RequireAuth>},
         { path: 'airticket',element: <RequireAuth subject={PERM_AIR_TICKET} result={true}><Airticket /></RequireAuth>},
         { path: 'airticket/plan/:coli_sn/:gri_sn',element:<RequireAuth subject={PERM_AIR_TICKET} result={true}><AirticketPlan /></RequireAuth>},
         { path: 'airticket/invoice',element:<RequireAuth subject={PERM_AIR_TICKET} result={true}><AirticketInvoice /></RequireAuth>},
         { path: 'airticket/invoicepaid',element:<RequireAuth subject={PERM_AIR_TICKET} result={true}><AirticketInvoicePaid /></RequireAuth>},
+
+        { path: 'trainticket',element: <RequireAuth subject={PERM_TRAIN_TICKET} result={true}><Trainticket /></RequireAuth>},
+        { path: 'trainticket/plan/:coli_sn/:gri_sn',element:<RequireAuth subject={PERM_TRAIN_TICKET} result={true}><TrainticketPlan /></RequireAuth>},
+        { path: 'trainticket/invoice',element:<RequireAuth subject={PERM_TRAIN_TICKET} result={true}><TrainticketInvoice /></RequireAuth>},
+        { path: 'trainticket/invoicepaid',element:<RequireAuth subject={PERM_TRAIN_TICKET} result={true}><TrainticketInvoicePaid /></RequireAuth>},
+
         { path: "products",element: <RequireAuth subject={PERM_PRODUCTS_MANAGEMENT} result={true}><ProductsManage /></RequireAuth>},
         { path: "products/:travel_agency_id/:use_year/:audit_state/audit",element:<RequireAuth subject={PERM_PRODUCTS_MANAGEMENT} result={true}><ProductsAudit /></RequireAuth>},
 

src/stores/Trainticket.js

@@ -0,0 +1,209 @@
+import { create } from "zustand";
+import { fetchJSON, postForm } from "@/utils/request";
+import { prepareUrl, isNotEmpty } from "@/utils/commons";
+import { HT_HOST, DATE_FORMAT } from "@/config";
+import dayjs from "dayjs";
+
+const trainTicketStore = create((set, get) => ({
+	loading: false,
+	setLoading: loading => set({ loading }),
+	setPlanList: planList => set({ planList }),
+	setPlanDetail: planDetail => set({ planDetail }),
+	setGuestList: guestList => set({ guestList }),
+	setVEIFlightBill: vEIFlightBill => set({ vEIFlightBill }),
+	setVeiPlanChangeTxt: veiPlanChangeTxt => set({ veiPlanChangeTxt }),
+
+	async getPlanList(vei_sn, GRI_Name, TimeStart, TimeEnd, plan_state, airticket_state) {
+		const { setLoading, setPlanList } = get();
+		setLoading(true);
+		const searchParams = {
+			vei_sn: vei_sn,
+			FlightDate1: TimeStart,
+			FlightDate2: TimeEnd,
+			GRI_Name: GRI_Name,
+			FlightStatus: plan_state,
+			TicketIssued: airticket_state,
+		};
+
+		const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetTrainPlan`, searchParams);
+		const _result = errcode !== 0 ? [] : result;
+		setPlanList(_result);
+		setLoading(false);
+	},
+
+	async getPlanDetail(vei_sn, gri_sn) {
+		const { setPlanDetail } = get();
+		const searchParams = {
+			vei_sn: vei_sn,
+			gri_sn: gri_sn,
+		};
+		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));
+		return "dsadsd";
+	},
+
+	async postFlightDetail(CLF_SN, GRI_SN, VEI_SN, original_values, info_object) {
+		const formData = new FormData();
+		formData.append("CLF_SN", CLF_SN ? CLF_SN : "");
+		formData.append("GRI_SN", GRI_SN);
+		formData.append("VEI_SN", VEI_SN);
+		for (const [key, value] of Object.entries(original_values)) {
+			formData.append(key, value); //先用原始数据填充一遍，确保复制了全部数据到新表
+		}
+		for (const [key, value] of Object.entries(info_object)) {
+			formData.set(key, value); //再用新值覆盖
+		}
+		formData.set("StartDate", dayjs(info_object.StartDate).format(DATE_FORMAT)); //再用新值覆盖
+		//是否出票的值，true、false变为1或0
+		formData.set("TicketIssued", info_object.TicketIssued ? 1 : 0);
+		const postUrl = HT_HOST + "/Service_BaseInfoWeb/edit_or_new_flight_info";
+		return postForm(postUrl, formData).then(json => {
+			if (json.errcode == 0) {
+				return json;
+			} else {
+				throw new Error(json.errmsg + ": " + json.errcode);
+			}
+		});
+	},
+	//删除火车信息
+	async delete_flight_info(CLF_SN) {
+		const searchParams = {
+			CLF_SN: CLF_SN,
+		};
+		const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/Delete_flight_info`, searchParams);
+		const _result = errcode !== 0 ? [] : result;
+		return _result;
+	},
+
+	async getGuestList(coli_sn) {
+		const { setGuestList } = get();
+		const searchParams = {
+			COLI_SN: coli_sn,
+		};
+		const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetFlightGuestInfo`, searchParams);
+		const _result = errcode !== 0 ? [] : result;
+		setGuestList(_result);
+	},
+	//获取账单列表
+	async getVEIFlightBill(VEI_SN, GRI_Name, CheckStatus, FlightDate1, FlightDate2) {
+		const { setLoading, setVEIFlightBill } = get();
+		setLoading(true);
+		const searchParams = {
+			VEI_SN: VEI_SN,
+			GRI_Name: GRI_Name,
+			CheckStatus: CheckStatus,
+			FlightDate1: FlightDate1,
+			FlightDate2: FlightDate2,
+			ServiceType: 2,
+		};
+		const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetVEIFlightBill`, searchParams);
+		const _result = errcode !== 0 ? [] : result;
+		setVEIFlightBill(_result);
+		setLoading(false);
+	},
+	//保存费用
+	async postFlightCost(values) {
+		const formData = new FormData();
+		for (const [key, value] of Object.entries(values)) {
+			formData.append(key, value); //先用原始数据填充一遍，确保复制了全部数据到新表
+		}
+		const postUrl = HT_HOST + "/Service_BaseInfoWeb/edit_or_new_flight_cost";
+		return postForm(postUrl, formData).then(json => {
+			if (json.errcode == 0) {
+				return json;
+			} else {
+				throw new Error(json.errmsg + ": " + json.errcode);
+			}
+		});
+	},
+	//删除费用
+	async deleteFlightCost(CLC_SN) {
+		const searchParams = {
+			CLC_SN: CLC_SN,
+		};
+		const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/Delete_flight_cost`, searchParams);
+		const _result = errcode !== 0 ? [] : result;
+		return _result;
+	},
+	//获取变更信息
+	async getVeiPlanChange(VEI_SN, GRI_SN) {
+		const { setVeiPlanChangeTxt } = get();
+		const searchParams = {
+			VEI_SN: VEI_SN,
+			GRI_SN: GRI_SN,
+		};
+		const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/GetVeiFlightPlanChange`, searchParams);
+		const _result = errcode !== 0 ? [] : result;
+		setVeiPlanChangeTxt(_result);
+	},
+	//提交变更确认
+	async postVeiFlightPlanConfirm(VEI_SN, GRI_SN, LMI_SN, ConfirmInfo) {
+		const formData = new FormData();
+		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 => {
+			if (json.errcode == 0) {
+				return json;
+			} else {
+				throw new Error(json.errmsg + ": " + json.errcode);
+			}
+		});
+	},
+	//提交账单
+	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 => {
+			if (json.errcode == 0) {
+				return json;
+			} else {
+				throw new Error(json.errmsg + ": " + json.errcode);
+			}
+		});
+	},
+	//通知顾问查看车票信息
+	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;
+	},
+
+
+	// 定义座位表对象
+	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" },
+	],
+}));
+
+export default trainTicketStore;

src/views/App.jsx

@@ -20,7 +20,7 @@ import { useDefaultLgc } from '@/i18n/LanguageSwitcher'
 import { appendRequestParams } from '@/utils/request'
 import { uploadPageSpyLog } from '@/pageSpy';
 
-import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET, PERM_PRODUCTS_MANAGEMENT } from '@/config'
+import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET, PERM_PRODUCTS_MANAGEMENT,PERM_TRAIN_TICKET } from '@/config'
 
 const { Header, Content, Footer } = Layout
 
@@ -98,7 +98,7 @@ function App() {
       </FloatButton.Group>
       {contextHolder}
       <ErrorBoundary>
-				<Layout className='min-h-screen'>
+				<Layout className='min-h-screen h-dvh'>
 					<Header className='sticky top-0 z-10 w-full'>
 						<Row gutter={{ md: 24 }} justify='end' align='middle'>
 							<Col span={15}>
@@ -115,6 +115,7 @@ function App() {
 										isPermitted(PERM_OVERSEA) ? { key: 'feedback', label: <Link to='/feedback'>{t('menu.Feedback')}</Link> } : null,
 										isPermitted(PERM_OVERSEA) ? { key: 'report', label: <Link to='/report'>{t('menu.Report')}</Link> } : null,
 										isPermitted(PERM_AIR_TICKET) ? { key: 'airticket', label: <Link to='/airticket'>{t('menu.Airticket')}</Link> } : null,
+										isPermitted(PERM_TRAIN_TICKET) ? { key: 'trainticket', label: <Link to='/trainticket'>{t('menu.Trainticket')}</Link> } : null,
 										isProductPermitted ? { key: 'products', label: <Link to={productLink}>{t('menu.Products')}</Link> } : null,
 										{
 											key: 'notice',
@@ -158,7 +159,7 @@ function App() {
 							</Col>
 						</Row>
 					</Header>
-					<Content className='p-6 m-0 min-h-72 bg-white'>
+					<Content className='p-6 m-0 min-h-72 bg-white overflow-auto'>
             {needToLogin ? <>login...</> : <Outlet />}
 					</Content>
           <Footer>China Highlights International Travel Service Co., LTD, Version: {BUILD_VERSION}</Footer>

src/views/account/RoleList.jsx

@@ -68,6 +68,7 @@ function RoleList() {
       ['oversea', '海外供应商'],
       ['domestic', '国内供应商'],
       ['air-ticket', '机票供应商'],
+      ['train-ticket', '火车票供应商'],
       ['products', '产品价格'],
       ['page', '默认页面'],
     ]);

src/views/invoice/Detail.jsx

@@ -1,7 +1,7 @@
 import { useParams, useNavigate } from "react-router-dom";
 import { useEffect, useState } from "react";
 import { Row, Col, Space, Button, Typography, Card, Form, Upload, Input, Divider, DatePicker, Select, App, Descriptions, Image } from "antd";
-import { PlusOutlined } from "@ant-design/icons";
+import { PlusOutlined,AuditOutlined } from "@ant-design/icons";
 import { isNotEmpty } from "@/utils/commons";
 import * as config from "@/config";
 import dayjs from "dayjs";
@@ -224,7 +224,7 @@ function Detail() {
 											<Descriptions column={1}>
 												<Descriptions.Item label="Amount">{data.GMD_Cost}</Descriptions.Item>
 												<Descriptions.Item label="Currency">{data.GMD_Currency}</Descriptions.Item>
-												<Descriptions.Item label="Due Dat">{data.GMD_PayDate}</Descriptions.Item>
+												<Descriptions.Item label="Due Date">{data.GMD_PayDate}</Descriptions.Item>
 												<Descriptions.Item label="Status">{invoiceStatus(data.FKState)}</Descriptions.Item>
 											</Descriptions>
 										</Col>
@@ -358,6 +358,9 @@ function Detail() {
 					</Col>
 					<Col span={4}>
 						<BackBtn />
+						<Button icon={<AuditOutlined />} onClick={() => navigate(`/invoice/history/0/338787`)}>
+							Billing Records
+						</Button>
 					</Col>
 				</Row>
 				<Title level={5}></Title>

src/views/invoice/History.jsx

@@ -0,0 +1,130 @@
+import { useParams, NavLink, useNavigate } from "react-router-dom";
+import { useEffect, useState } from "react";
+import { Row, Col, Space, Table, Image,App } from "antd";
+import { formatDate, isNotEmpty } from "@/utils/commons";
+import SearchForm from "@/components/SearchForm";
+import dayjs from "dayjs";
+import BackBtn from "@/components/BackBtn";
+import { fetchInvoiceDetail } from "@/stores/Invoice";
+import useInvoiceStore from "@/stores/Invoice";
+import { usingStorage } from "@/hooks/usingStorage";
+
+function History() {
+  const { travelAgencyId } = usingStorage();
+  const { GMDSN, GSN } = useParams();
+  const [dataLoading, setDataLoading] = useState(false);
+  const [invoiceZDDetail, setInvoiceZDDetail] = useState([]);
+  const { notification } = App.useApp();
+
+  useEffect(() => {
+    defaultShow();
+  }, [GMDSN, GSN]);
+
+  function defaultShow() {
+    setDataLoading(true);
+
+    fetchInvoiceDetail(travelAgencyId, GMDSN, GSN)
+      .then((json) => {
+        //console.log("id:"+travelAgencyId+",gmdsn:"+GMDSN+",GSN:"+GSN+"#13"+json);
+        setInvoiceZDDetail(json.invoiceZDDetail);
+      })
+      .catch((ex) => {
+        notification.error({
+          message: `Notification`,
+          description: ex.message,
+          placement: "top",
+          duration: 4,
+        });
+      })
+      .finally(() => {
+        setDataLoading(false);
+      });
+  }
+
+  const invoicePaidColumns = [
+    {
+      title: "ID",
+      dataIndex: "GMD_SN",
+      key: "GMD_SN",
+    },
+    {
+      title: "Due Date",
+      key: "GMD_PayDate",
+      dataIndex: "GMD_PayDate",
+      render: (text, record) =>
+        isNotEmpty(text) ? formatDate(new Date(text)) : "",
+    },
+    {
+      title: "Amount",
+      key: "GMD_Cost",
+      dataIndex: "GMD_Cost",
+    },
+    {
+      title: "Currency",
+      key: "GMD_Currency",
+      dataIndex: "GMD_Currency",
+    },
+    {
+      title: "Status",
+      key: "FKState",
+      dataIndex: "FKState",
+      render: (text, record) => (isNotEmpty(record.FKState) ? invoiceStatus(record.FKState) : text),
+    },
+    {
+      title: "Invoice",
+      key: "GMD_Pic",
+      dataIndex: "GMD_Pic",
+      render: showPIc,
+    },
+  ];
+
+  const invoiceStatus = (FKState) => {
+    switch (FKState - 1) {
+      case 1:
+        return "Submitted";
+      case 2:
+        return "Travel Advisor";
+      case 3:
+        return "Finance Dept";
+      case 4:
+        return "Paid";
+      default:
+        return "";
+    }
+  };
+
+  function showPIc(text, record) {
+    let strPic = record.GMD_Pic;
+    //console.log(JSON.parse(strPic));
+    if (isNotEmpty(strPic)) {
+      return JSON.parse(strPic).map((item, index) => {
+        return <Image key={index} width={90} src={item.url} />;
+      });
+    } else {
+      return "";
+    }
+  }
+
+  return (
+    <Space direction="vertical" style={{ width: "100%" }}>
+      <Row gutter={16}>
+        <Col span={20}></Col>
+        <Col span={4}>
+          <BackBtn />
+        </Col>
+      </Row>
+      <Row>
+        <Col md={24} lg={24} xxl={24}>
+          <Table
+            rowKey={"GMD_SN"}
+            bordered
+            columns={invoicePaidColumns}
+            dataSource={invoiceZDDetail}
+          />
+        </Col>
+      </Row>
+    </Space>
+  );
+}
+
+export default History;

src/views/invoice/Index.jsx

@@ -72,7 +72,7 @@ function Index() {
 	return (
 		<Space direction="vertical" style={{ width: "100%" }}>
 			<Row gutter={16}>
-				<Col flex="auto">
+				<Col md={16} sm={16} xs={24}  >
 					<SearchForm
 					initialValue={{
 					dates: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')],
@@ -90,13 +90,15 @@ function Index() {
 					}}
 					/>
 				</Col>
-				<Col md={24} lg={4} xxl={4}>
+				<Col md={8} sm={8} xs={24} >
-					<Button icon={<AuditOutlined />} onClick={() => navigate(`/invoice/detail/0/338787`)}>
+					<Space>
+						<Button icon={<AuditOutlined />} onClick={() => navigate(`/invoice/detail/0/395074`)}>
 							Misc. Invoice
 						</Button>
 						<Button icon={<AuditOutlined />} onClick={() => navigate(`/invoice/paid`)}>
 							Bank statement
 						</Button>
+					</Space>
 				</Col>
 			</Row>
 			<Row>

src/views/products/Detail.jsx

@@ -43,11 +43,11 @@ function Detail() {
       backTo={false}
       header={<Header title={activeAgency.travel_agency_name} refresh={handleGetAgencyProducts} handleNewProduct={() => setAddProductVisible(true)} />}>
       <>
-        <Flex gap={10}>
+        <Flex gap={10} className='h-full'>
           {/* onNodeSelect={handleNodeSelect} */}
-          <ProductsTree className='basis-80 sticky top-16 overflow-y-auto shrink-0' style={{ height: 'calc(100vh - 150px)' }} />
+          <ProductsTree className='basis-80 sticky top-0 overflow-y-auto shrink-0' style1={{ height: 'calc(100vh - 150px)' }} />
           <Divider type={'vertical'} className='mx-1 h-auto' />
-          <div className=' flex-auto '>
+          <div className=' flex-auto overflow-auto '>
             <ProductInfo />
           </div>
         </Flex>

src/views/products/Detail/Header.jsx

@@ -19,7 +19,7 @@ import VendorSelector from "@/components/VendorSelector";
 import AuditStateSelector from "@/components/AuditStateSelector";
 import { usingStorage } from "@/hooks/usingStorage";
 
-import AgencyContract from "../Print/AgencyContract_v1120";
+import AgencyContract from "../Print/AgencyContract";
 // import AgencyContract from "../Print/AgencyContract_v0903";
 import { saveAs } from "file-saver";
 import { Packer } from "docx";

src/views/products/Detail/ProductInfoForm.jsx

@@ -400,7 +400,7 @@ const formValuesMapper = (values) => {
         key: 'lgc_details',
         transform: (value) => {
           const valueArr = Object.values(value)
-            .filter((_v) => !isEmpty(_v))
+            .filter((_v) => !isEmpty(_v.lgc))
             .map((e) => ({ title: '', ...e, descriptions: e.descriptions || '' }));
           return valueArr;
         },
@@ -409,7 +409,7 @@ const formValuesMapper = (values) => {
         key: 'lgc_details_mapped',
         transform: (value) => {
           const valueArr = Object.values(value)
-            .filter((_v) => !isEmpty(_v))
+            .filter((_v) => !isEmpty(_v.lgc))
             .map((e) => ({ title: '', ...e, descriptions: e.descriptions || '' }));
           return valueArr.reduce((r, c) => ({ ...r, [c.lgc]: c }), {});
         },

src/views/products/Detail/ProductInfoLgc.jsx

@@ -46,7 +46,7 @@ const ProductInfoLgc = ({ editable, formInstance, pickEditedInfo, ...props }) =>
           <Form.Item name={['lgc_details_mapped', `${ele.lgc}`, 'descriptions']} label={t('products:Description')} initialValue={ele.descriptions} tooltip={t('FormTooltip.Description')}>
             <Input.TextArea
               className={'!text-slate-600'}
-              rows={3}
+              rows={3} maxLength={2000} showCount
               allowClear
               // onChange={(e) => handleChange('description', e.target.value)}
               // disabled={ignoreEditable ? false : (!isEmpty(ele.descriptions) || !editable)}
@@ -98,7 +98,7 @@ const ProductInfoLgc = ({ editable, formInstance, pickEditedInfo, ...props }) =>
             <Input allowClear placeholder={t(`FormTooltip.NewTitle.${editingProduct?.info?.product_type_id}`)} />
           </Form.Item>
           <Form.Item name={['lgc_details_mapped', `${lgcItem.value}`, 'descriptions']} preserve={false} label={t('products:Description')} tooltip={t('FormTooltip.Description')}>
-            <Input.TextArea rows={3} allowClear />
+            <Input.TextArea rows={3} maxLength={2000} showCount allowClear />
           </Form.Item>
           <Form.Item hidden name={['lgc_details_mapped', `${lgcItem.value}`, 'lgc']} preserve={false} initialValue={lgcItem.value}>
             <Input />

src/views/products/Print/AgencyContract.jsx

@@ -109,6 +109,7 @@ const chunkBy = (use_year, dataList = [], by = []) => {
     aq[cq.WPI_SN] = aq[cq.WPI_SN] || []
     aq[cq.WPI_SN].push(cq.group_size_min)
     aq[cq.WPI_SN] = unique(aq[cq.WPI_SN])
+    aq[cq.WPI_SN] = aq[cq.WPI_SN].slice().sort((a,b) => a-b)
     return aq
   }, {})
 
@@ -116,9 +117,10 @@ const chunkBy = (use_year, dataList = [], by = []) => {
   const maxSet = maxGroupSize === 1000 ? Infinity : maxGroupSize
 
   const _SSMinSet = uniqWith(Object.values(PGroupSizeSS), (a, b) => a.join(',') === b.join(','))
-
+  // const uSSsizeSetArr = (_SSMinSet)
   const uSSsizeSetArr = uniqueBySub(_SSMinSet)
 
+  // * 若不重叠分组, 则上面不要 uniqueBySub
   for (const key in PGroupSizeSS) {
     if (Object.prototype.hasOwnProperty.call(PGroupSizeSS, key)) {
       const element = PGroupSizeSS[key]
@@ -225,7 +227,9 @@ const tableBorderOne = {
   left: { style: BorderStyle.SINGLE, space: 0, size: 6, color: 'auto' },
   right: { style: BorderStyle.SINGLE, space: 0, size: 6, color: 'auto' },
 }
-
+/**
+ * v1120
+ */
 export default class AgencyContract {
   #remarkList = []
   create([headerParams, activeAgency, agencyProducts, agencyExtras, remarks]) {
@@ -1690,7 +1694,7 @@ export default class AgencyContract {
         children: [
           new TextRun({
             break: 2,
-            children: ['甲方：', new Tab(), '乙方：桂林海纳国际旅行社有限公司'],
+            children: ['甲方：桂林海纳国际旅行社有限公司', new Tab(), '乙方：'],
           }),
           new TextRun({
             break: 1,
@@ -1698,15 +1702,15 @@ export default class AgencyContract {
           }),
           new TextRun({
             break: 3,
-            children: ['联系人: ', new Tab(), '联系人：游佳佳'],
+            children: ['联系人: 游佳佳', new Tab(), '联系人：'],
           }),
           new TextRun({
             break: 1,
-            children: ['电话: ', new Tab(), '电话：13507831547'],
+            children: ['电话: 13507831547', new Tab(), '电话：'],
           }),
           new TextRun({
             break: 1,
-            children: ['电子邮箱: ', new Tab(), '电子邮箱：xeniayou@hainatravel.com'],
+            children: ['电子邮箱: xeniayou@hainatravel.com', new Tab(), '电子邮箱：'],
           }),
           new TextRun({
             break: 1,

src/views/reservation/Detail.jsx

@@ -43,7 +43,7 @@ function Detail() {
   ];
 
   function detailTextRender(_, confirm) {
-    const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, '\n——————————————————————\n');
+    const formattedText = confirm.PCI_ConfirmText;
     return (
       <div className='whitespace-pre-line'>
       {formattedText}
@@ -76,6 +76,8 @@ function Detail() {
   const [confirmText, setConfirmText] = useState('');
   const [newConfirmText, setNewConfirmText] = useState('');
   const [dataLoading, setDataLoading] = useState(false);
+  const [reservationPreviewUrl, setReservationPreviewUrl] = useState('');
+  const [nameCardPreviewUrl, setNameCardPreviewUrl] = useState('');
   const { notification } = App.useApp();
   const { reservationId } = useParams();
 
@@ -93,9 +95,6 @@ function Detail() {
   const nameCardUrl =
     `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${travelAgencyId}&token=${loginToken}&FileType=2&v=${randomString}`
 
-  const reservationPreviewUrl = officeWebViewerUrl + encodeURIComponent(reservationUrl);
-  const nameCardPreviewUrl = officeWebViewerUrl + encodeURIComponent(nameCardUrl);
-
   const showConfirmModal = (confirm) => {
     setIsModalOpen(true);
     const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, '\n——————————————————————\n');
@@ -118,6 +117,10 @@ function Detail() {
 
   useEffect(() => {
     setDataLoading(true);
+
+    setReservationPreviewUrl(officeWebViewerUrl + encodeURIComponent(reservationUrl))
+    setNameCardPreviewUrl(officeWebViewerUrl + encodeURIComponent(nameCardUrl))
+
     getReservationDetail(reservationId)
       .catch(ex => {
         notification.error({

src/views/trainticket/index.jsx

@@ -0,0 +1,140 @@
+import { useState, useEffect } from "react";
+import { Grid, Divider, Layout, Spin, Input, Col, Row, Space, List, Table, Button, Typography } from "antd";
+import { PhoneOutlined, CustomerServiceOutlined, AudioOutlined, AuditOutlined } from "@ant-design/icons";
+import { useParams, useHref, useNavigate, NavLink } from "react-router-dom";
+import { isEmpty, formatColonTime } from "@/utils/commons";
+import dayjs from "dayjs";
+import SearchForm from "@/components/SearchForm";
+import { DATE_FORMAT } from "@/config";
+import { TableExportBtn } from "@/components/Data";
+import trainTicketStore from "@/stores/Trainticket";
+import { usingStorage } from "@/hooks/usingStorage";
+
+const planListColumns = [
+	{
+		title: "团名",
+		key: "GRI_No",
+		dataIndex: "GRI_No",
+		// sorter: (a, b) => b.GRI_No - a.GRI_No,
+		render: (text, record) => (
+			<Typography.Text title={record.Memo}>
+				{record.GRI_No} {record.WL}
+			</Typography.Text>
+		),
+	},
+	{
+		title: "人数",
+		dataIndex: "PersonNum",
+		key: "PersonNum",
+	},
+	{
+		title: "出发",
+		key: "FromAirport",
+		dataIndex: "FromAirport",
+	},
+	{
+		title: "抵达",
+		key: "ToAirport",
+		dataIndex: "ToAirport",
+	},
+	{
+		title: "车次",
+		key: "FlightNo",
+		dataIndex: "FlightNo",
+	},
+	{
+		title: "出发日期",
+		key: "StartDate",
+		dataIndex: "StartDate",
+		sorter: (a, b) => {
+			const dateA = new Date(a.StartDate);
+			const dateB = new Date(b.StartDate);
+			return dateB.getTime() - dateA.getTime();
+		},
+	},
+	{
+		title: "开始时间",
+		key: "FlightStart",
+		dataIndex: "FlightStart",
+		render: text => formatColonTime(text),
+	},
+	{
+		title: "抵达时间",
+		key: "FlightEnd",
+		dataIndex: "FlightEnd",
+		render: text => formatColonTime(text),
+	},
+
+	{
+		title: "出票处理",
+		key: "TicketIssued",
+		dataIndex: "TicketIssued",
+		render: (text, record) => record.TicketIssuedName,
+	},
+	{
+		title: "计划状态",
+		key: "FlightStatus",
+		dataIndex: "FlightStatus",
+		render: (text, record) => record.FlightStatusName,
+	},
+	{
+		title: "操作",
+		key: "FlightInfo",
+		dataIndex: "FlightInfo",
+		render: (text, record) => <NavLink to={`/trainticket/plan/${record.COLI_SN}/${record.GRI_SN}`}>{"编辑"}</NavLink>,
+	},
+];
+
+const Trainticket = props => {
+	const navigate = useNavigate();
+	const { travelAgencyId } = usingStorage();
+	const [getPlanList, planList, loading] = trainTicketStore(state => [state.getPlanList, state.planList, state.loading]);
+	const showTotal = total => `合计 ${total} `;
+
+	useEffect(() => {
+		!planList && getPlanList(travelAgencyId, "", dayjs().startOf("M").format(DATE_FORMAT), dayjs().endOf("M").format(DATE_FORMAT), "-1", "-1");
+	}, []);
+
+	return (
+		<Space direction="vertical" style={{ width: "100%" }}>
+			<Row>
+				<Col md={20} lg={20} xxl={20}>
+					<SearchForm
+						initialValue={{
+							dates: [dayjs().startOf("M"), dayjs().endOf("M")],
+						}}
+						fieldsConfig={{
+							shows: ["referenceNo", "dates", "airticket_state", "plan_state"],
+							fieldProps: {
+								referenceNo: { label: "搜索计划" },
+								dates: { label: "出发日期", col: 8 },
+							},
+						}}
+						onSubmit={(err, formVal, filedsVal) => {
+							getPlanList(travelAgencyId, formVal.referenceNo, formVal.startdate, formVal.endtime, formVal.plan_state, formVal.airticket_state);
+						}}
+					/>
+				</Col>
+				<Col md={4} lg={4} xxl={4}>
+					<Space>
+						<Button icon={<AuditOutlined />} onClick={() => navigate(`/trainticket/invoice`)}>
+							报账
+						</Button>
+						<Button icon={<AuditOutlined />} onClick={() => navigate(`/trainticket/invoicepaid`)}>
+							汇款记录
+						</Button>
+					</Space>
+				</Col>
+			</Row>
+
+			<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 }} />
+					<TableExportBtn btnTxt="导出计划" label={`出票计划`} {...{ columns: planListColumns, dataSource: planList }} />
+				</Col>
+				<Col md={24} lg={24} xxl={24}></Col>
+			</Row>
+		</Space>
+	);
+};
+export default Trainticket;

src/views/trainticket/invoice.jsx

@@ -0,0 +1,245 @@
+import { useState, useEffect } from "react";
+import { Grid, Divider, Layout, Steps, Statistic, Col, Row, Space, Checkbox, Table, Button, App, Typography } from "antd";
+import { PhoneOutlined, CustomerServiceOutlined, FrownTwoTone, LikeTwoTone } from "@ant-design/icons";
+import { useParams, useHref, useNavigate, NavLink } from "react-router-dom";
+import { isEmpty, formatColonTime } from "@/utils/commons";
+import dayjs from "dayjs";
+import SearchForm from "@/components/SearchForm";
+import BackBtn from "@/components/BackBtn";
+import { TableExportBtn } from "@/components/Data";
+
+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] = trainTicketStore(state => [state.getVEIFlightBill, state.vEIFlightBill, state.loading, state.postVEIFlightBillSubmit]);
+	const showTotal = total => `合计 ${total} `;
+	const [selectedValues, setSelectedValues] = useState([]);
+
+	const vEIFlightBillColumns = [
+		{
+			title: "团名",
+			key: "GRI_No",
+			dataIndex: "GRI_No",
+			render: (text, record) => (
+				<Typography.Text title={record.Memo}>
+					{record.GRI_No} {record.WL}
+				</Typography.Text>
+			),
+		},
+		{
+			title: "状态",
+			key: "CostType",
+			dataIndex: "CostType",
+		},
+		{
+			title: "出发日期",
+			key: "StartDate",
+			dataIndex: "StartDate",
+			sorter: (a, b) => {
+				const dateA = new Date(a.StartDate);
+				const dateB = new Date(b.StartDate);
+				return dateB.getTime() - dateA.getTime();
+			},
+		},
+		{
+			title: "出发",
+			key: "CLF_FromAirport",
+			dataIndex: "CLF_FromAirport",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "抵达",
+			key: "ToAirport",
+			dataIndex: "ToAirport",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "车次",
+			key: "FlightNo",
+			dataIndex: "FlightNo",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "取票号",
+			key: "TicketNo",
+			dataIndex: "TicketNo",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "车票类型",
+			key: "SeatClass",
+			dataIndex: "SeatClass",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "车票价格",
+			children: [
+				{
+					title: vEIFlightBill && vEIFlightBill.reduce((acc, curr) => acc + curr.Cost, 0),
+					dataIndex: "Cost",
+					render: (text, record) => (record.CostType == "出票" ? text : "-"),
+				},
+			],
+			key: "Cost",
+		},
+		{
+			title: "服务费",
+			children: [
+				{
+					title: vEIFlightBill && vEIFlightBill.reduce((acc, curr) => acc + curr.ServiceFee, 0),
+					dataIndex: "ServiceFee",
+				},
+			],
+		},
+		{
+			title: "审核状态",
+			children: [
+				{
+					title: (
+						<Button type="link" onClick={() => checkALL()}>
+							全选
+						</Button>
+					),
+					dataIndex: "CheckStatus", //状态小于2，表示还未提交审核
+					render: (text, record) =>
+						record.CheckStatus < 2 ? (
+							<Checkbox onChange={event => handleCheckboxChange(event, record)} checked={checkboxStates(record.CLC_SN)}>
+								待提交
+							</Checkbox>
+						) : (
+							<Steps
+								size="small"
+								current={record.CheckStatus - 1}
+								items={[
+									{
+										title: "提交账单",
+									},
+									{
+										title: "顾问审核",
+									},
+									{
+										title: "财务处理",
+									},
+									{
+										title: "账单支付",
+									},
+								]}
+							/>
+						),
+				},
+			],
+
+			sorter: (a, b) => {
+				return b.CheckStatus - a.CheckStatus;
+			},
+		},
+	];
+	//获取当前状态
+	const checkboxStates = CLC_SN => {
+		return selectedValues.some(v => v.CLC_SN === CLC_SN);
+	};
+	// 处理checkbox改变事件
+	const handleCheckboxChange = (event, data) => {
+		const value = { CLC_SN: data.CLC_SN, WL: data.WL, OPI_SN: data.OPI_SN, OPI_Email: data.OPI_Email, GRI_SN: data.GRI_SN, GRI_Name: data.GRI_Name, Cost: data.Cost, ServiceFee: data.ServiceFee };
+		if (event.target.checked) {
+			setSelectedValues([...selectedValues, value]); // 如果被选中，则添加到数组
+		} else {
+			setSelectedValues(selectedValues.filter(v => v.CLC_SN !== value.CLC_SN)); // 如果取消选中，则从数组中移除
+		}
+	};
+	//提交账单
+	const postInvoice = () => {
+		postVEIFlightBillSubmit(travelAgencyId, selectedValues)
+			.then(() => {
+				notification.success({
+					message: `成功`,
+					description: "账单提交成功!",
+					placement: "top",
+					duration: 4,
+					icon: <LikeTwoTone />,
+				});
+				setSelectedValues([]); //清空选中的项目
+			})
+			.catch(() => {
+				notification.error({
+					message: `错误`,
+					description: "保存失败",
+					placement: "top",
+					duration: 4,
+					icon: <FrownTwoTone />,
+				});
+			});
+	};
+	//全选或不全选
+	const checkALL = () => {
+		if (isEmpty(vEIFlightBill)) return;
+		const allChecked = selectedValues.length === vEIFlightBill.filter(item => item.CheckStatus < 2).length;
+		setSelectedValues(
+			allChecked
+				? []
+				: vEIFlightBill
+						.filter(item => item.CheckStatus < 2)
+						.map(item => ({ CLC_SN: item.CLC_SN, WL: item.WL, OPI_SN: item.OPI_SN, OPI_Email: item.OPI_Email, GRI_SN: item.GRI_SN, GRI_Name: item.GRI_Name, Cost: item.Cost, ServiceFee: item.ServiceFee }))
+		); // 如果全选，则清空数组，否则添加所有项
+	};
+
+	useEffect(() => {}, []);
+
+	return (
+		<Space direction="vertical" style={{ width: "100%" }}>
+			<Row>
+				<Col md={20} lg={20} xxl={20}>
+					<SearchForm
+						initialValue={{
+							dates: [dayjs().startOf("M"), dayjs().endOf("M")],
+						}}
+						fieldsConfig={{
+							shows: ["referenceNo", "dates", "invoiceCheckStatus"],
+							fieldProps: {
+								referenceNo: { label: "搜索计划" },
+								dates: { label: "出发日期", col: 8 },
+							},
+						}}
+						onSubmit={(err, formVal, filedsVal) => {
+							getVEIFlightBill(travelAgencyId, formVal.referenceNo, formVal.invoiceCheckStatus, formVal.startdate, formVal.endtime);
+							console.log(vEIFlightBill);
+							
+						}}
+					/>
+				</Col>
+				<Col md={4} lg={4} xxl={4}>
+					<BackBtn to={"/trainticket"} />
+				</Col>
+			</Row>
+
+			<Row>
+				<Col md={24} lg={24} xxl={24}>
+					<Table bordered={true} rowKey="CLC_SN" columns={vEIFlightBillColumns} dataSource={vEIFlightBill} loading={loading} pagination={{ defaultPageSize: 100, showTotal: showTotal }} />
+
+					<TableExportBtn btnTxt="导出账单" label={`车票账单`} {...{ columns: vEIFlightBillColumns, dataSource: vEIFlightBill }} />
+				</Col>
+
+				<Col md={24} lg={24} xxl={24}></Col>
+			</Row>
+			<Row>
+				<Col md={24} lg={18} xxl={18}></Col>
+				<Col md={24} lg={2} xxl={2}>
+					<Statistic title="已选车票价格" value={selectedValues.reduce((acc, curr) => acc + curr.Cost, 0)} />
+				</Col>
+				<Col md={24} lg={2} xxl={2}>
+					<Statistic title="已选服务费" value={selectedValues.reduce((acc, curr) => acc + curr.ServiceFee, 0)} />
+				</Col>
+				<Col md={24} lg={2} xxl={2}>
+					<Button type="primary" size="large" onClick={postInvoice} disabled={selectedValues.length == 0}>
+						提交账单
+					</Button>
+				</Col>
+			</Row>
+		</Space>
+	);
+};
+export default Invoice;

src/views/trainticket/invoicePaid.jsx

@@ -0,0 +1,136 @@
+import { useState, useEffect } from "react";
+import { Grid, Divider, Layout, Spin, Input, Col, Row, Space, Checkbox, Table, Button, App } from "antd";
+import { PhoneOutlined, CustomerServiceOutlined, FrownTwoTone, LikeTwoTone } from "@ant-design/icons";
+import { useParams, useHref, useNavigate, NavLink } from "react-router-dom";
+import { isEmpty, formatColonTime, formatDate, isNotEmpty } from "@/utils/commons";
+import { DATE_FORMAT } from "@/config";
+import dayjs from "dayjs";
+import SearchForm from "@/components/SearchForm";
+import BackBtn from "@/components/BackBtn";
+import { TableExportBtn } from "@/components/Data";
+import useInvoiceStore from "@/stores/Invoice";
+import { fetchInvoicePaidDetail } from "@/stores/Invoice";
+
+import { usingStorage } from "@/hooks/usingStorage";
+
+const InvoicePaid = props => {
+	const navigate = useNavigate();
+	const { notification } = App.useApp();
+	const { travelAgencyId } = usingStorage();
+	const [invoicePaidDetail, setInvoicePaidDetail] = useState([]);
+	const [invoiceNO, setInvoiceNO] = useState([]); //显示账单编号
+	const [loading, invoicePaid, fetchInvoicePaid] = useInvoiceStore(state => [state.loading, state.invoicePaid, state.fetchInvoicePaid]);
+	const showTotal = total => `Total ${total} items`;
+	const showTotal_detail = total => `Total ${total} items`;
+	useEffect(() => {
+		// fetchInvoicePaid(travelAgencyId, "", dayjs().subtract(2, "M").startOf("M").format(DATE_FORMAT), dayjs().endOf("M").format(DATE_FORMAT));
+	}, []);
+
+	const invoicePaidColumns = [
+		{
+			title: "编号",
+			dataIndex: "fl_finaceNo",
+			key: "fl_finaceNo",
+		},
+		{
+			title: "报账日期",
+			key: "fl_adddate",
+			dataIndex: "fl_adddate",
+			render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ""),
+		},
+		{
+			title: "团数",
+			key: "fcount",
+			dataIndex: "fcount",
+		},
+		{
+			title: "总额",
+			key: "pSum",
+			dataIndex: "pSum",
+			//render: (text, record) => (isNotEmpty(record.GMD_Currency) ? record.GMD_Currency + " " + text : text),
+		},
+		{
+			title: "查看",
+			key: "pSum",
+			dataIndex: "pSum",
+			render: (text, record) => (
+				<Button
+					type="link"
+					onClick={() => {
+						fetchInvoicePaidDetail(travelAgencyId, record.key).then(res => setInvoicePaidDetail(res));
+						setInvoiceNO(record.fl_finaceNo);
+					}}>
+					查看明细
+				</Button>
+			),
+		},
+	];
+
+	const invoicePaidDetailColumns = [
+		{
+			title: "团号",
+			dataIndex: "fl2_GroupName",
+			key: "fl2_GroupName",
+		},
+		{
+			title: "金额",
+			key: "fl2_price",
+			dataIndex: "fl2_price",
+		},
+		{
+			title: "报账日期",
+			key: "fl2_ArriveDate",
+			dataIndex: "fl2_ArriveDate",
+			render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ""),
+		},
+		{
+			title: "顾问",
+			dataIndex: "fl2_wl",
+			key: "fl2_wl",
+		},
+	];
+
+	return (
+		<Space direction="vertical" style={{ width: "100%" }}>
+			<Row>
+				<Col md={20} lg={20} xxl={20}>
+					<SearchForm
+						initialValue={{
+							dates: [dayjs().subtract(2, "M").startOf("M"), dayjs().endOf("M")],
+						}}
+						fieldsConfig={{
+							shows: ["dates"],
+							fieldProps: {
+								dates: { col: 10, label: "报账日期" },
+							},
+						}}
+						onSubmit={(err, formVal) => {
+							fetchInvoicePaid(travelAgencyId, "", formVal.startdate, formVal.enddate);
+							setInvoicePaidDetail([]);
+						}}
+					/>
+				</Col>
+				<Col md={4} lg={4} xxl={4}>
+					<BackBtn to={"/trainticket"} />
+				</Col>
+			</Row>
+
+			<Row>
+				<Col md={24} lg={16} xxl={16}>
+					<Divider orientation="left">汇款列表</Divider>
+					<Table bordered columns={invoicePaidColumns} dataSource={invoicePaid} loading={loading} pagination={{ defaultPageSize: 20, showTotal: showTotal }} />
+				</Col>
+				<Col md={24} lg={4} xxl={4}></Col>
+			</Row>
+			<Row>
+				<Col md={24} lg={20} xxl={20}>
+					<Divider orientation="left">账单明细 {invoiceNO}</Divider>
+					<Table bordered columns={invoicePaidDetailColumns} dataSource={invoicePaidDetail} pagination={{ defaultPageSize: 100, showTotal: showTotal_detail }} />
+					<TableExportBtn btnTxt="导出账单明细" label={`车票账单`} {...{ columns: invoicePaidDetailColumns, dataSource: invoicePaidDetail }} />
+				</Col>
+				<Col md={24} lg={4} xxl={4}></Col>
+			</Row>
+		</Space>
+	);
+};
+export default InvoicePaid;

src/views/trainticket/plan.jsx

@@ -0,0 +1,706 @@
+import { useState, useEffect } from "react";
+import { Checkbox, Divider, DatePicker, Modal, Form, Input, Col, Row, Space, Collapse, Table, Button, Select, App, Popconfirm, Switch, Radio, List } from "antd";
+import { PhoneOutlined, FrownTwoTone, LikeTwoTone, ArrowUpOutlined, ArrowDownOutlined, PlusOutlined } from "@ant-design/icons";
+import { useParams, useHref, useNavigate, NavLink } from "react-router-dom";
+import { isEmpty, formatColonTime } from "@/utils/commons";
+import { OFFICEWEBVIEWERURL } from "@/config";
+import dayjs from "dayjs";
+import trainTicketStore from "@/stores/Trainticket";
+import { usingStorage } from "@/hooks/usingStorage";
+import BackBtn from "@/components/BackBtn";
+import { station_names } from "@/views/trainticket/station_name";
+
+const TrainticketPlan = props => {
+	const { coli_sn, gri_sn } = useParams();
+	const { travelAgencyId, loginToken, userId } = usingStorage();
+	const [
+		getPlanDetail,
+		planDetail,
+		getGuestList,
+		guestList,
+		loading,
+		postFlightDetail,
+		postFlightCost,
+		deleteFlightCost,
+		getVeiPlanChange,
+		veiPlanChangeTxt,
+		postVeiFlightPlanConfirm,
+		ticketIssuedNotifications,
+		delete_flight_info,
+		seatTable,
+	] = trainTicketStore(state => [
+		state.getPlanDetail,
+		state.planDetail,
+		state.getGuestList,
+		state.guestList,
+		state.loading,
+		state.postFlightDetail,
+		state.postFlightCost,
+		state.deleteFlightCost,
+		state.getVeiPlanChange,
+		state.veiPlanChangeTxt,
+		state.postVeiFlightPlanConfirm,
+		state.ticketIssuedNotifications,
+		state.delete_flight_info,
+		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();
+
+	//乘客下拉列表
+	const guestList_select = () => {
+		return (
+			guestList &&
+			guestList.map(item => {
+				return { label: `${item.MEI_Name} , ${item.MEI_PassportNo}`, value: `${item.MEI_Name} , ${item.MEI_PassportNo}  , ${item.MEI_Country} , ${item.MEI_Gender} , ${item.MEI_age} , ${item.MEI_Birthday}` };
+			})
+		);
+	};
+
+	const station_name_select = rawStr => {
+		const records = rawStr.split("@").filter(item => item); // 1. 按@分割记录（过滤空的首元素）
+		return records.map(record => {
+			// 按|分割字段（最多取前8个有效字段，忽略末尾空字段）
+			const [
+				abbreviation, // 缩写（如bjb）
+				name, // 站名（如北京北）
+				code, // 代码（如VAP）
+				pinyin, // 拼音（如beijingbei）
+				shortPinyin, // 简拼（如bjb）
+				sequence, // 序号（如0）
+				areaCode, // 区域代码（如0357）
+				city, // 城市（如北京）
+			] = record.split("|");
+			return {
+				value: name + "-" + pinyin,
+				label: name,
+			};
+		});
+	};
+
+	const guestList_OnChange = e => {
+		ticket_form.setFieldsValue({ Memo: `${e.target.value}` });
+	};
+	//座位类型下拉列表
+	const seatTableList_select = () => {
+		return (
+			seatTable &&
+			seatTable.map(item => {
+				return { label: `${item.name}`, value: `${item.name}` };
+			})
+		);
+	};
+
+	//费用列表
+	const costListColumns = [
+		{
+			title: "客人信息/备注",
+			key: "Memo",
+			dataIndex: "Memo",
+		},
+		{
+			title: "费用类型",
+			key: "CostType",
+			dataIndex: "CostType",
+		},
+		{
+			title: "车厢",
+			key: "Cabin",
+			dataIndex: "Cabin",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "座位号",
+			key: "SeatNo",
+			dataIndex: "SeatNo",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+
+		{
+			title: "座位类型",
+			key: "SeatClass",
+			dataIndex: "SeatClass",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "车票价格",
+			key: "Cost",
+			dataIndex: "Cost",
+			render: (text, record) => (record.CostType == "出票" ? text : "-"),
+		},
+		{
+			title: "服务费",
+			key: "ServiceFee",
+			dataIndex: "ServiceFee",
+		},
+		{
+			title: "编辑",
+			key: "CLC_SN",
+			dataIndex: "CLC_SN",
+			render: (text, record) =>
+				record.CheckStatus <= 2 ? (
+					<Space>
+						<a onClick={() => showModal(record)}>编辑</a>
+						<Popconfirm title="删除" description="请确认是否删除?" onConfirm={() => handleDelete(record.CLC_SN)} okText="是" cancelText="否">
+							<Button danger type="link">
+								删除
+							</Button>
+						</Popconfirm>
+					</Space>
+				) : (
+					record.CheckStatusName
+				),
+		},
+	];
+
+	const Trainticket_form = props => {
+		const trainInfo = props.airInfo;
+		const [traininfo_form] = Form.useForm();
+		return (
+			<>
+				<Form
+					form={traininfo_form}
+					name={"ticket_form_" + trainInfo.id}
+					labelCol={{
+						span: 6,
+					}}
+					wrapperCol={{
+						span: 16,
+					}}
+					initialValues={{ ...trainInfo, StartDate: dayjs(trainInfo.StartDate) }}
+					onFinish={values => {
+						postFlightDetail(trainInfo.CLF_SN, trainInfo.GRI_SN, trainInfo.VEI_SN, trainInfo, values)
+							.then(() => {
+								notification.success({
+									message: `成功`,
+									description: "车票信息保存成功!",
+									placement: "top",
+									duration: 4,
+									icon: <LikeTwoTone />,
+								});
+							})
+							.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="出发日期、车次、取票号" 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: "请输入车次!" }]}>
+										<Input placeholder="车次" />
+									</Form.Item>
+									<Form.Item name="TicketNo" noStyle rules={[{ required: true, message: "请输入取票号!" }]}>
+										<Input placeholder="取票号" maxLength={9} />
+									</Form.Item>
+								</Space>
+							</Form.Item>
+							<Form.Item label="出发站、抵达站" required>
+								<Space>
+									<Form.Item name="FromAirport" noStyle rules={[{ required: true, message: "请输入出发站!" }]}>
+										{/* <Input placeholder="出发" /> */}
+										<Select
+											placeholder="出发"
+											showSearch
+											style={{
+												minWidth: 160,
+											}}
+											options={station_name_select(station_names)}
+										/>
+									</Form.Item>
+									<Form.Item name="FlightStart" noStyle rules={[{ required: true, message: "请输入出发时间!" }]}>
+										<Input placeholder="出发时间" />
+									</Form.Item>
+									-
+									<Form.Item name="ToAirport" noStyle rules={[{ required: true, message: "请输入抵达站!" }]}>
+										{/* <Input placeholder="抵达" /> */}
+										<Select
+											placeholder="抵达"
+											showSearch
+											style={{
+												minWidth: 160,
+											}}
+											options={station_name_select(station_names)}
+										/>
+									</Form.Item>
+									<Form.Item name="FlightEnd" noStyle rules={[{ required: true, message: "请输入抵达时间!" }]}>
+										<Input placeholder="抵达时间" />
+									</Form.Item>
+								</Space>
+							</Form.Item>
+							<Form.Item name="ServiceType" hidden initialValue="2"></Form.Item>
+						</Col>
+						<Col md={24} lg={4} xxl={4}>
+							<Space direction="vertical">
+								<Form.Item name="TicketIssued">
+									<Switch checkedChildren="已处理" unCheckedChildren="未处理" />
+								</Form.Item>
+								<Button type="primary" htmlType="submit">
+									1. 保存车票信息
+								</Button>
+							</Space>
+						</Col>
+					</Row>
+
+					<Divider orientation="left">出票信息</Divider>
+					<Row gutter={16}>
+						<Col md={24} lg={20} xxl={20}>
+							<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(trainInfo)}>
+									2. 添加出票信息
+								</Button>
+							</Space>
+						</Col>
+					</Row>
+					<Divider orientation="left"></Divider>
+					<Row gutter={16}>
+						<Col md={24} lg={20} xxl={20}>
+							<Form.Item label="上下站提醒信息" name="FlightMemo_messages">
+								<Input placeholder="没有提醒请留空,信息会抄送给上下站地接" />
+							</Form.Item>
+							<Form.Item label="已发提醒" name="FlightMemo">
+								<Input.TextArea rows={4} readOnly disabled />
+							</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 />,
+											});
+										});
+								}}>
+								3. 通知顾问
+							</Button>
+						</Col>
+					</Row>
+				</Form>
+			</>
+		);
+	};
+
+	const detail_items = () => {
+		return planDetail
+			? planDetail.map(item => {
+					return {
+						key: item.id,
+						label: `${item.StartDate} ${item.FlightNo}(${item.FromAirport}${item.FlightStart}-${item.ToAirport}${item.FlightEnd})(${item.FlightCabin})`,
+						extra: (
+							<Popconfirm
+								title="请确认要删除车票记录"
+								description=""
+								onConfirm={() => {
+									delete_flight_info(item.CLF_SN); //删除记录
+									getPlanDetail(travelAgencyId, gri_sn); //更新页面计划详情，含费用列表
+								}}
+								okText="是"
+								cancelText="否">
+								<Button type="dashed" size="small" disabled={item.Flightcost_AsJOSN.length == 0 ? false : true}>
+									删除
+								</Button>
+							</Popconfirm>
+						),
+						children: <Trainticket_form airInfo={item} />,
+					};
+			  })
+			: [];
+	};
+
+	// 车票信息编辑表单 begin
+
+	const [isModalOpen, setIsModalOpen] = useState(false);
+	const [isModalOpen_confirmInfo, setisModalOpen_confirmInfo] = useState(false);
+	const [isTicketType, setisTicketType] = useState(true);
+	const [isAddNew, setisAddNew] = useState(true); //是否是在新增费用信息
+	const [ticket_form] = Form.useForm();
+	const [confirmInfo_form] = Form.useForm();
+
+	const showModal = ticket => {
+		setIsModalOpen(true);
+		ticket_form.resetFields();
+		if (isEmpty(ticket.CostType)) ticket.CostType = "出票";
+		ticket.CostType == "出票" ? setisTicketType(true) : setisTicketType(false); //如果是出票类型，显示票号、折扣等选项
+		const isNew = isEmpty(ticket.CLC_SN); // 判断是否为新增状态
+		setisAddNew(isNew);
+		if (isNew) {
+			ticket.ServiceFee = "60"; // // 新增时设置服务费默认值为60
+		}
+		ticket_form.setFieldsValue(ticket);
+		if (isEmpty(ticket.Memo)) ticket_form.setFieldsValue({ Memo: "" });
+	};
+
+	const handleOk = (close_modal = true) => {
+		ticket_form
+			.validateFields()
+			.then(values => {
+				// 在这里处理表单提交逻辑，例如发送数据到服务器
+				postFlightCost(values)
+					.then(() => {
+						notification.success({
+							message: `成功`,
+							description: "保存成功!",
+							placement: "top",
+							duration: 4,
+							icon: <LikeTwoTone />,
+						});
+						getPlanDetail(travelAgencyId, gri_sn);
+					})
+					.catch(() => {
+						notification.error({
+							message: `错误`,
+							description: "保存失败",
+							placement: "top",
+							duration: 4,
+							icon: <FrownTwoTone />,
+						});
+					});
+				if (close_modal) setIsModalOpen(false);
+			})
+			.catch(info => {
+				console.log("Validate Failed:", info);
+			});
+	};
+
+	const handleCancel = () => {
+		ticket_form.resetFields();
+		setIsModalOpen(false);
+	};
+
+	const handleDelete = CLC_SN => {
+		deleteFlightCost(CLC_SN)
+			.then(() => {
+				notification.success({
+					message: `成功`,
+					description: "删除成功!",
+					placement: "top",
+					duration: 4,
+					icon: <LikeTwoTone />,
+				});
+				getPlanDetail(travelAgencyId, gri_sn);
+			})
+			.catch(() => {
+				notification.error({
+					message: `错误`,
+					description: "删除失败",
+					placement: "top",
+					duration: 4,
+					icon: <FrownTwoTone />,
+				});
+			});
+	};
+
+	const onChangeType = value => {
+		if (value == "出票") {
+			setisTicketType(true);
+		} else {
+			setisTicketType(false);
+		}
+	};
+
+	//变更确认表单
+	const showModal_confirmInfo = ConfirmInfo => {
+		setisModalOpen_confirmInfo(true);
+		confirmInfo_form.setFieldsValue({ ConfirmInfo: ConfirmInfo });
+	};
+	const handleCancel_confirmInfo = () => {
+		setisModalOpen_confirmInfo(false);
+		confirmInfo_form.resetFields();
+	};
+
+	const handleOk_confirmInfo = () => {
+		confirmInfo_form
+			.validateFields()
+			.then(values => {
+				console.log("Received values of form: ", values.ConfirmInfo);
+				postVeiFlightPlanConfirm(travelAgencyId, gri_sn, userId, values.ConfirmInfo)
+					.then(() => {
+						notification.success({
+							message: `成功`,
+							description: "保存成功!",
+							placement: "top",
+							duration: 4,
+							icon: <LikeTwoTone />,
+						});
+						getVeiPlanChange(travelAgencyId, gri_sn);
+					})
+					.catch(() => {
+						notification.error({
+							message: `错误`,
+							description: "保存失败",
+							placement: "top",
+							duration: 4,
+							icon: <FrownTwoTone />,
+						});
+					});
+				confirmInfo_form.resetFields();
+				setisModalOpen_confirmInfo(false);
+			})
+			.catch(info => {
+				console.log("Validate Failed:", info);
+			});
+	};
+
+	// 车票信息编辑表单 end
+
+	useEffect(() => {
+		getPlanDetail(travelAgencyId, gri_sn); //计划详情，含费用列表
+		getGuestList(coli_sn); //客人列表
+		getVeiPlanChange(travelAgencyId, gri_sn); //计划变更信息
+	}, []);
+
+	return (
+		<Space direction="vertical" style={{ width: "100%" }}>
+			<Row>
+				<Col md={20} lg={20} xxl={20}></Col>
+				<Col md={4} lg={4} xxl={4}>
+					<BackBtn to={"/trainticket"} />
+				</Col>
+			</Row>
+
+			<Row>
+				<Col md={24} lg={24} xxl={24} style={{ height: "100%" }}>
+					<iframe id="msdoc-iframe-reservation" title="msdoc-iframe-reservation" src={reservationPreviewUrl + "&v=" + Math.random()} style={{ width: "100%", height: "600px" }}></iframe>
+					<Button type="link" target="_blank" href={reservationUrl}>
+						下载
+					</Button>
+				</Col>
+			</Row>
+
+			<Row>
+				<Divider orientation="center">{planDetail ? `${planDetail[0].GRI_No} - ${planDetail[0].WL}` : ""}</Divider>
+				<Col md={24} lg={24} xxl={24}>
+					<Collapse items={detail_items()} />
+				</Col>
+
+				<Col md={24} lg={24} xxl={24}>
+					<br />
+					<p style={{ textAlign: "right" }}>
+						<Popconfirm
+							title="请确认要增加车票记录"
+							description=""
+							onConfirm={() => {
+								postFlightDetail("", gri_sn, travelAgencyId, { FlightNo: "新的记录", FlightStatus: 1, ServiceType: 2 }, []); //新增加一条记录
+								getPlanDetail(travelAgencyId, gri_sn); //计划详情，含费用列表
+							}}
+							okText="是"
+							cancelText="否">
+							<Button type="dashed" icon={<PlusOutlined />}>
+								新增车票记录
+							</Button>
+						</Popconfirm>
+					</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} />
+						<Button
+							type="primary"
+							onClick={() => {
+								showModal_confirmInfo(veiPlanChangeTxt && veiPlanChangeTxt.ChangeText);
+							}}
+							disabled={isEmpty(veiPlanChangeTxt) || isEmpty(veiPlanChangeTxt.ChangeText)}>
+							确认变更
+						</Button>
+					</Space>
+				</Col>
+				<Col md={24} lg={12} xxl={12}>
+					<Input.TextArea rows={16} readOnly value={veiPlanChangeTxt && veiPlanChangeTxt.ConfirmInfo} />
+				</Col>
+			</Row>
+
+			<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="车厢" name="Cabin" rules={[{ required: true }]}>
+								<Select
+									style={{
+										width: 160,
+									}}
+									options={Array.from({ length: 16 }, (_, index) => ({
+										value: `${String(index + 1).padStart(2, "0")}车`,
+										label: `${String(index + 1).padStart(2, "0")}车`,
+									}))}
+								/>
+							</Form.Item>
+							<Form.Item label="座位号" name="SeatNo" rules={[{ required: true }]}>
+								<Input
+									style={{
+										width: 160,
+									}}
+								/>
+							</Form.Item>
+							<Form.Item label="座位类型" name="SeatClass" rules={[{ required: true }]}>
+								<Select
+									style={{
+										width: 160,
+									}}
+									options={seatTableList_select()}
+								/>
+							</Form.Item>
+							<Form.Item label="车票价格" name="Cost" rules={[{ required: true }]}>
+								<Input
+									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="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>
+	);
+};
+
+export default TrainticketPlan;