diff --git a/config/router_transfer.ts b/config/router_transfer.ts index 8b49935..5992222 100644 --- a/config/router_transfer.ts +++ b/config/router_transfer.ts @@ -80,6 +80,11 @@ export default [ path: '/ChoiceLogin', component: './LoadingPage/MiddleLoading/ChoiceLogin', }, + //预约人员跳转中间页 + { + path: '/ToAppointment', + component: './LoadingPage/MiddleLoading/ToAppointment', + }, //跨工程跳转中间页结束 { name: 'index_1', diff --git a/src/pages/ElecEvaluation/AppointmentManage/index.tsx b/src/pages/ElecEvaluation/AppointmentManage/index.tsx index b92e594..0383638 100644 --- a/src/pages/ElecEvaluation/AppointmentManage/index.tsx +++ b/src/pages/ElecEvaluation/AppointmentManage/index.tsx @@ -1,6 +1,6 @@ import type { ActionType, ProColumns } from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table'; -import { Button, Card, Collapse, Space, Tag } from 'antd'; +import { Button, Card, Collapse, Result, Space, Tag } from 'antd'; import React, { useEffect, useState } from 'react'; import { useRef } from 'react'; import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation'; @@ -118,7 +118,7 @@ const ScreenTable = (props: { record: any, onCellClick: (id: any) => void, refre ) } -export default () => { +export default (props: any) => { //预约弹窗 const [modalVisible, setModalVisible] = useState(false); //评标场所列表数据 @@ -131,6 +131,9 @@ export default () => { const [meetData, setMeetData] = useState({}); //刷新参数 const [refresh, setRefresh] = useState(0); + //跳转参数 + const isRedirect: boolean | undefined = props.location?.state?.redirect; + console.log("isRedirect", isRedirect); //获取评标场所 const getSiteListData = (key: any) => { @@ -166,11 +169,11 @@ export default () => { } useEffect(() => { - getSiteListData("0"); + (isRedirect && roleCode != "ebtp-appointment") ? null : getSiteListData("0"); }, []) return ( - + (isRedirect && roleCode != "ebtp-appointment") ? :
{!btnAuthority(["ebtp-appointment", "ebtp-site-admin"]) &&