From 0341038a9609bb3aeaeb0a71598e1ba5fdb1c9be Mon Sep 17 00:00:00 2001 From: zhangminghua Date: Tue, 29 Nov 2022 10:22:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=9A=E7=BB=A9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-=E5=90=88=E5=90=8C=E6=98=8E=E7=BB=86-=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E6=98=8E=E7=BB=86=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 2 +- .../src/layout/components/header/contant.js | 6 +++ .../src/sections/business/containers/index.js | 6 ++- .../performanceReport/contractDetails.jsx | 44 +++++++++++++++++++ .../performanceReport/invoicingDetails.jsx | 44 +++++++++++++++++++ web/client/src/sections/business/nav-item.jsx | 12 +++++ web/client/src/sections/business/routes.js | 19 +++++++- 7 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 web/client/src/sections/business/containers/performanceReport/contractDetails.jsx create mode 100644 web/client/src/sections/business/containers/performanceReport/invoicingDetails.jsx diff --git a/.vscode/launch.json b/.vscode/launch.json index 3eab84f..4951e72 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -45,7 +45,7 @@ "-g postgres://FashionAdmin:123456@10.8.30.36:5432/data_center", "--redisHost localhost", "--redisPort 6379", - "--apiEmisUrl http://localhost:14000", + "--apiEmisUrl http://10.8.30.161:1111", // 镇江研发结束 // 测试 "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", diff --git a/web/client/src/layout/components/header/contant.js b/web/client/src/layout/components/header/contant.js index aee4b04..22c3c92 100644 --- a/web/client/src/layout/components/header/contant.js +++ b/web/client/src/layout/components/header/contant.js @@ -7,6 +7,12 @@ const headerItems = [{ itemKey: "pmReport", text: "项目报表", to: "/businessManagement/pmReport/reserveItemsReporting" + }, { + fatherKey: "authCenter", + openKey: "performanceReport", + itemKey: "performanceReport", + text: "业绩报表", + to: "/businessManagement/performanceReport/contractDetails" }] }] diff --git a/web/client/src/sections/business/containers/index.js b/web/client/src/sections/business/containers/index.js index 2f671bd..f4822e5 100644 --- a/web/client/src/sections/business/containers/index.js +++ b/web/client/src/sections/business/containers/index.js @@ -4,10 +4,14 @@ import ReserveItemsReporting from './reserveItemsReporting'; import ReserveItemsPeriodicStatistics from './reserveItemsPeriodicStatistics'; import ReserveItemsDepSummary from './reserveItemsDepSummary'; import ReserveItemsLostStatistics from './reserveItemsLostStatistics'; +import ContractDetails from './performanceReport/contractDetails'; +import InvoicingDetails from './performanceReport/invoicingDetails'; export { ReserveItemsReporting, ReserveItemsPeriodicStatistics, ReserveItemsDepSummary, - ReserveItemsLostStatistics + ReserveItemsLostStatistics, + ContractDetails, + InvoicingDetails }; \ No newline at end of file diff --git a/web/client/src/sections/business/containers/performanceReport/contractDetails.jsx b/web/client/src/sections/business/containers/performanceReport/contractDetails.jsx new file mode 100644 index 0000000..444e96f --- /dev/null +++ b/web/client/src/sections/business/containers/performanceReport/contractDetails.jsx @@ -0,0 +1,44 @@ +import React, { useEffect, useState } from 'react'; +import { connect } from 'react-redux'; +import { Table } from '@douyinfe/semi-ui'; +import '../../style.less'; + +const ContractDetails = (props) => { + + const columns = [ + { + title: '序号', + dataIndex: 'index', + render: (text, record, index) => index + 1 + }, + ]; + const data = []; + return ( + <> +
+
+
业务管理
+
/
+
业绩报表
+
/
+
合同明细表
+
+
+ + + + + + ) +} + + +function mapStateToProps(state) { + const { auth, global } = state; + return { + user: auth.user, + actions: global.actions, + }; +} + +export default connect(mapStateToProps)(ContractDetails); \ No newline at end of file diff --git a/web/client/src/sections/business/containers/performanceReport/invoicingDetails.jsx b/web/client/src/sections/business/containers/performanceReport/invoicingDetails.jsx new file mode 100644 index 0000000..34660cf --- /dev/null +++ b/web/client/src/sections/business/containers/performanceReport/invoicingDetails.jsx @@ -0,0 +1,44 @@ +import React, { useEffect, useState } from 'react'; +import { connect } from 'react-redux'; +import { Table } from '@douyinfe/semi-ui'; +import '../../style.less'; + +const InvoicingDetails = (props) => { + + const columns = [ + { + title: '序号', + dataIndex: 'index', + render: (text, record, index) => index + 1 + }, + ]; + const data = []; + return ( + <> +
+
+
业务管理
+
/
+
业绩报表
+
/
+
开票明细表
+
+
+
+ + + + + ) +} + + +function mapStateToProps(state) { + const { auth, global } = state; + return { + user: auth.user, + actions: global.actions, + }; +} + +export default connect(mapStateToProps)(InvoicingDetails); \ No newline at end of file diff --git a/web/client/src/sections/business/nav-item.jsx b/web/client/src/sections/business/nav-item.jsx index 9826c9c..9560751 100644 --- a/web/client/src/sections/business/nav-item.jsx +++ b/web/client/src/sections/business/nav-item.jsx @@ -26,6 +26,18 @@ export function getNavItem(user, dispatch) { itemKey: 'reserveItemsLostStatistics', to: '/businessManagement/pmReport/reserveItemsLostStatistics', text: '储备项目丢单统计表' }] + },{ + itemKey: 'performanceReport', + text: '业绩报表', + icon: , + to: '/businessManagement/performanceReport/contractDetails', + items: [{ + itemKey: 'contractDetails', + to: '/businessManagement/performanceReport/contractDetails', text: '合同明细表' + }, { + itemKey: 'invoicingDetails', + to: '/businessManagement/performanceReport/invoicingDetails', text: '开票明细表' + }] }] }, ] diff --git a/web/client/src/sections/business/routes.js b/web/client/src/sections/business/routes.js index 7c6185f..a856b22 100644 --- a/web/client/src/sections/business/routes.js +++ b/web/client/src/sections/business/routes.js @@ -1,5 +1,6 @@ import { - ReserveItemsReporting, ReserveItemsPeriodicStatistics, ReserveItemsDepSummary,ReserveItemsLostStatistics + ReserveItemsReporting, ReserveItemsPeriodicStatistics, ReserveItemsDepSummary, ReserveItemsLostStatistics, + ContractDetails, InvoicingDetails } from './containers'; export default [{ @@ -35,6 +36,22 @@ export default [{ breadcrumb: '储备项目丢单统计表', component: ReserveItemsLostStatistics }] + }, + { + path: '/performanceReport', + key: 'performanceReport', + breadcrumb: '业绩报表', + childRoutes: [{ + path: '/contractDetails', + key: 'contractDetails', + component: ContractDetails, + breadcrumb: '合同明细表' + }, { + path: '/invoicingDetails', + key: 'invoicingDetails', + breadcrumb: '开票明细表', + component: InvoicingDetails + }] }] } }]; \ No newline at end of file