From 19c6148508627fca1397eb80b53d776edbbde3cd Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Fri, 18 Mar 2022 15:04:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=96=AA=E8=B5=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/salaryItem/columns.js | 32 +++++++++++++++++++ pc4mobx/hrmSalary/pages/salaryItem/index.js | 17 +++++++--- .../pages/salaryItem/systemSalaryItemModal.js | 23 +++++++++++++ 3 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js index 60529c65..18538a8c 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js @@ -51,6 +51,38 @@ export const columns = [ } ] +export const systemItemColumns = [ + { + title: "薪资项目", + dataIndex: 'title', + key: 'title' + }, + { + title: "属性", + dataIndex: 'title', + key: 'title' + }, + { + title: "类型", + dataIndex: 'title', + key: 'title' + }, + { + title: "舍入规则", + dataIndex: 'title', + key: 'title' + }, + { + title: "保留小数位", + dataIndex: 'title', + key: 'title' + }, + { + title: "取值方式", + dataIndex: 'title', + key: 'title' + } +] export const dataSource = [ { diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index 2a979268..4804d4dd 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -9,7 +9,7 @@ import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable, WeaInputSearch import { renderNoright, getSearchs } from '../../util'; // 渲染form数据的方法:因为多个页面都会使用,所以抽的公共方法在util中 import CustomTab from '../../components/customTab'; import ContentWrapper from '../../components/contentWrapper'; - +import SystemSalaryItemModal from './systemSalaryItemModal' import { columns, dataSource } from './columns'; const { MonthPicker } = DatePicker; @@ -21,7 +21,8 @@ export default class SalaryItem extends React.Component { super(props); this.state = { value: "", - selectedKey: "0" + selectedKey: "0", + systemItemVisible: false } columns.map(item => { if(item.dataIndex == "refere") { @@ -73,9 +74,15 @@ export default class SalaryItem extends React.Component { const topTab = [ ]; + + const handleMenuClick = (e) => { + if(e.key == "1") { + this.setState({systemItemVisible: true}) + } + } const menu = ( - + 系统薪资项 自定义薪资项 @@ -103,7 +110,7 @@ export default class SalaryItem extends React.Component { dropMenuDatas={rightMenu} // 下拉菜单(和页面的右键菜单相同) dropMenuProps={{ collectParams }} // 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能 > - + + {this.setState({systemItemVisible: false})}}/> ) } diff --git a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js new file mode 100644 index 00000000..77378871 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js @@ -0,0 +1,23 @@ +import React from 'react' +import { systemItemColumns, dataSource } from './columns' +import { WeaInputSearch } from 'ecCom' +import { Modal, Button, Table } from 'antd' + +export default class SystemSalaryItemModal extends React.Component { + render() { + return ( + {this.props.onCancel()}} width={800}> +
+ 添加系统薪资项目 +
+ + +
+
+
+ + + + ) + } +} \ No newline at end of file