diff --git a/src/pages/HomeView.tsx b/src/pages/HomeView.tsx index 31d8a98..d1577ac 100644 --- a/src/pages/HomeView.tsx +++ b/src/pages/HomeView.tsx @@ -148,6 +148,9 @@ function HomeView() { key: "/stat", //icon: React.createElement(UserOutlined), label: 财务统计, + }, { + key: "/config", + label: 系统配置 }] const { @@ -197,8 +200,10 @@ function HomeView() { { diff --git a/src/pages/configuration/Configuration.tsx b/src/pages/configuration/Configuration.tsx new file mode 100644 index 0000000..8c20c9c --- /dev/null +++ b/src/pages/configuration/Configuration.tsx @@ -0,0 +1,54 @@ +import {Tabs} from "antd"; +import React from "react"; +import UserConfig from "./subpage/UserConfig"; +import CityConfig from "./subpage/CityConfig"; +import DepartmentConfig from "./subpage/DepartmentConfig"; +import OtherConfig from "./subpage/OtherConfig"; + +class Configuration extends React.Component { + + constructor(props: any) { + super(props); + this.state = { + activatedTab: 0 + } + } + + tabItems = () => { + return [{ + label: "用户配置", + key: "0", + children: + }, + { + label: "城市配置", + key: "1", + children: + }, + { + label: "部门配置", + key: "2", + children: + }, + { + label: "其他配置", + key: "3", + children: + }] + } + tabChange = (key: string) => { + this.setState({activatedTab: Number(key)}) + } + render() { + return ( + + ) + } +} +export default Configuration; \ No newline at end of file diff --git a/src/pages/configuration/subpage/CityConfig.tsx b/src/pages/configuration/subpage/CityConfig.tsx new file mode 100644 index 0000000..1c9d36e --- /dev/null +++ b/src/pages/configuration/subpage/CityConfig.tsx @@ -0,0 +1,12 @@ +import React from "react"; + +class CityConfig extends React.Component{ + render() { + return ( +
+

City Config

+
+ ); + } +} +export default CityConfig; \ No newline at end of file diff --git a/src/pages/configuration/subpage/DepartmentConfig.tsx b/src/pages/configuration/subpage/DepartmentConfig.tsx new file mode 100644 index 0000000..f475793 --- /dev/null +++ b/src/pages/configuration/subpage/DepartmentConfig.tsx @@ -0,0 +1,13 @@ +import React from "react"; + + +class DepartmentConfig extends React.Component { + render() { + return ( +
+

Department Config

+
+ ); + } +} +export default DepartmentConfig; \ No newline at end of file diff --git a/src/pages/configuration/subpage/OtherConfig.tsx b/src/pages/configuration/subpage/OtherConfig.tsx new file mode 100644 index 0000000..e56f8b0 --- /dev/null +++ b/src/pages/configuration/subpage/OtherConfig.tsx @@ -0,0 +1,12 @@ +import React from "react"; + +class OtherConfig extends React.Component { + render() { + return ( +
+

Other Config

+
+ ); + } +} +export default OtherConfig; \ No newline at end of file diff --git a/src/pages/configuration/subpage/UserConfig.tsx b/src/pages/configuration/subpage/UserConfig.tsx new file mode 100644 index 0000000..58633d1 --- /dev/null +++ b/src/pages/configuration/subpage/UserConfig.tsx @@ -0,0 +1,12 @@ +import React from "react"; + +class UserConfig extends React.Component { + render() { + return ( +
+

User Config

+
+ ); + } +} +export default UserConfig; \ No newline at end of file diff --git a/src/pages/reimbursement/mine/ReimbursementCreate.tsx b/src/pages/reimbursement/mine/ReimbursementCreate.tsx index b0baadf..a9f4ddf 100644 --- a/src/pages/reimbursement/mine/ReimbursementCreate.tsx +++ b/src/pages/reimbursement/mine/ReimbursementCreate.tsx @@ -68,11 +68,14 @@ class ReimbursementCreate extends React.Component { this.formRef.current?.resetFields(["departureName", "destinationName"]) }) store.subscribe(this.handleStoreChange); + let defaultDepartment = this.departments?.length>0?{id: this.departments[0].departmentId, name: this.departments[0].departmentName}:null; + if(defaultDepartment==null) + defaultDepartment={id:-1,name:""} this.state = { loading: false, open: this.props.open, invoices: [], - selectedDepartment: {id: this.departments[0].departmentId, name: this.departments[0].departmentName}, + selectedDepartment: defaultDepartment, departmentsProps: { items: departmentsPropItems, onClick: this.handleMenuClick, diff --git a/src/router/router.tsx b/src/router/router.tsx index b416c44..c35e74f 100644 --- a/src/router/router.tsx +++ b/src/router/router.tsx @@ -8,6 +8,7 @@ import {BrowserRouter} from "./BrowserRouter" import InvoiceManagement from "../pages/Invoice/management/InvoiceManagement"; import ReimbursementApproval from "../pages/reimbursement/approval/ReimbursementApproval"; import StatView from "../pages/stat/StatView"; +import Configuration from "../pages/configuration/Configuration"; export const history = createBrowserHistory() @@ -21,6 +22,7 @@ function CustomRouter() { }> }> }> + }> }>