diff --git a/src/pages/HomeView.tsx b/src/pages/HomeView.tsx index b0bec0a..03193f8 100644 --- a/src/pages/HomeView.tsx +++ b/src/pages/HomeView.tsx @@ -3,7 +3,7 @@ import {UploadOutlined, UserOutlined, VideoCameraOutlined} from '@ant-design/ico import {Layout, Menu, theme, Typography, Button, Dropdown, MenuProps} from 'antd'; import {useAppDispatch, useAppSelector} from "../models/hooks"; import {getToken, setToken, store} from "../models/store"; -import {Link, Outlet, useNavigate} from "react-router-dom"; +import {Link, Outlet, useLocation, useNavigate} from "react-router-dom"; import Icon from '@ant-design/icons'; import {Logo} from "../assets/icons"; import axiosInstance from "../utils/axiosInstance"; @@ -105,11 +105,11 @@ function HeaderBar(props: any) { } function MyMenu(props: any) { - + console.log(props) return ( ) @@ -118,28 +118,29 @@ function MyMenu(props: any) { function HomeView() { const token = useAppSelector(getToken); const navigate = useNavigate(); + const location = useLocation() console.log(store.getState()) let items = [{ - key: "0", + key: "/invoice/mine", //icon: React.createElement(UserOutlined), label: 我的发票 }, { - key: "1", + key: "/reimbursement/mine", //icon: React.createElement(UserOutlined), label: 我的报销, }, { - key: "2", + key: "/invoice/management", //icon: React.createElement(UserOutlined), - label: 报销审批, + label: 发票管理, }, { - key: "3", + key: "/reimbursement/approval", //icon: React.createElement(UserOutlined), - label: 发票管理, + label: 报销审批, }, { - key: "4", + key: "/stat", //icon: React.createElement(UserOutlined), - label: 财务统计, + label: 财务统计, }] const { @@ -154,6 +155,7 @@ function HomeView() { }) const [menuItems, setMenuItems] = useState(items.slice(0,2)) + const [defaultSelectedKeys, setDefaultSelectedKeys] = useState(['/invoice/mine']) const getStaffInfo = () => { axiosInstance({ @@ -163,23 +165,24 @@ function HomeView() { console.log(response.data) const staff = response.data setStaff( response.data) - navigate('/invoice/mine') - + if(location.pathname==='/') + navigate('/invoice/mine') + setDefaultSelectedKeys([location.pathname]) if(staff.managingDepartment) { // @ts-ignore - if(staff.managingDepartment.departmentName==='财务部') + if(staff.managingDepartment.departmentId===1) { setMenuItems(items) } else{ - console.log('aaaaaaaaaaa') - setMenuItems(items.slice(0,3)) + setMenuItems(items.slice(0,4)) } } else { setMenuItems(items.slice(0,2)) } + }).catch(function (error) { console.log(error) }) @@ -221,7 +224,7 @@ function HomeView() { marginLeft: '4px' }}>智能财务报销系统 - + diff --git a/src/pages/Invoice/management/InvoiceManagement.tsx b/src/pages/Invoice/management/InvoiceManagement.tsx new file mode 100644 index 0000000..f310b03 --- /dev/null +++ b/src/pages/Invoice/management/InvoiceManagement.tsx @@ -0,0 +1,6 @@ +function InvoiceManagement() { + return( +
发票管理
+ ) +} +export default InvoiceManagement \ No newline at end of file diff --git a/src/pages/reimbursement/approval/ReimbursementApproval.tsx b/src/pages/reimbursement/approval/ReimbursementApproval.tsx new file mode 100644 index 0000000..05f2e56 --- /dev/null +++ b/src/pages/reimbursement/approval/ReimbursementApproval.tsx @@ -0,0 +1,6 @@ +function ReimbursementApproval() { + return( +
报销审批
+ ) +} +export default ReimbursementApproval \ No newline at end of file diff --git a/src/pages/stat/StatView.tsx b/src/pages/stat/StatView.tsx new file mode 100644 index 0000000..6d59943 --- /dev/null +++ b/src/pages/stat/StatView.tsx @@ -0,0 +1,6 @@ +function StatView() { + return( +
财务统计
+ ) +} +export default StatView \ No newline at end of file diff --git a/src/router/router.tsx b/src/router/router.tsx index 03e6993..b416c44 100644 --- a/src/router/router.tsx +++ b/src/router/router.tsx @@ -5,6 +5,9 @@ import HomeView from "../pages/HomeView"; import InvoiceListView from "../pages/Invoice/mine/InvoiceListView"; import MyReimbursement from "../pages/reimbursement/mine/MyReimbursement"; import {BrowserRouter} from "./BrowserRouter" +import InvoiceManagement from "../pages/Invoice/management/InvoiceManagement"; +import ReimbursementApproval from "../pages/reimbursement/approval/ReimbursementApproval"; +import StatView from "../pages/stat/StatView"; export const history = createBrowserHistory() @@ -15,6 +18,9 @@ function CustomRouter() { }> }> }> + }> + }> + }> }>