diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/columns.js b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js index 1e83fcae..9b1b66fe 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/columns.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js @@ -105,6 +105,90 @@ export const monthOnMonthColumns = [ ] +export const salaryDetailColumns = [ + { + 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' + }, + { + title: "薪资项目1", + dataIndex: 'title', + key: 'title' + }, + { + title: "薪资项目2", + dataIndex: 'title', + key: 'title' + }, + { + title: "薪资项目3", + dataIndex: 'title', + key: 'title' + }, + { + title: "薪资项目4", + dataIndex: 'title', + key: 'title' + }, + { + title: "操作", + dataIndex: 'cz', + key: 'cz' + } +] + +export const warningModalColumns = [ + { + title: "异常所属规则名称", + dataIndex: 'title', + key: 'title' + }, + + { + title: "异常人数", + dataIndex: 'title', + key: 'title' + }, + + + { + title: "校验规则", + dataIndex: 'title', + key: 'title' + }, + + { + title: "操作", + dataIndex: 'cz', + key: 'cz' + } +] export const dataSource = []; diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index d890a9ad..02a60fa4 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -2,6 +2,10 @@ import React from 'react'; import UserSure from './userSure' import { inject, observer } from 'mobx-react'; import CustomTab from '../../components/customTab' +import SalaryDetail from './salaryDetail' +import { Button, Menu, Dropdown } from 'antd' +import { WeaInputSearch } from "ecCom" + @inject('baseTableStore') @observer @@ -14,6 +18,28 @@ export default class CalculateDetail extends React.Component { } render() { const { selectedKey } = this.state; + + const menu = ( + + 导入 + 线下对比 + 导出全部 + + ); + + const renderRightOperation = () => { + if(selectedKey == "1") { + return ( +
+ + + 更多 + +
+ ) + } + } + const topTab = [{ title: "人员确认", viewcondition: "0" @@ -27,14 +53,19 @@ export default class CalculateDetail extends React.Component {
{ - + this.setState({selectedKey: v}) }} /> { selectedKey == 0 && } + { + selectedKey == 1 && + }
) } diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.less b/pc4mobx/hrmSalary/pages/calculateDetail/index.less index 37bff41f..1ab3ebf9 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.less +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.less @@ -35,7 +35,26 @@ } } } - } +} + +.salaryDetail { + padding: 10px 20px; + .salaryBarWrapper { + height: 47px; + line-height: 47px; + padding-left: 10px; + padding-right: 10px; + border-bottom: 1px solid #eee; + .warningspan { + float: right; + color: #2db7f5; + cursor: pointer; + } + } + + .tableWrapper { + margin-top: 10px; + } } \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js new file mode 100644 index 00000000..99ff9b1e --- /dev/null +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -0,0 +1,42 @@ +import React from 'react' +import { salaryDetailColumns, dataSource } from './columns' +import { WeaHelpfulTip } from 'ecCom' +import { Table } from 'antd' +import WarningModal from './warningModal' +import "./index.less" + +export default class SalaryDetail extends React.Component { + constructor(props) { + super(props) + this.state ={ + visible: false + } + } + render() { + return ( +
+
+ 薪资所属月:2021-12 + + {this.setState({visible: true})}}>校验异常:0 +
+
+ + + {this.setState({visible: false})}}/> + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js new file mode 100644 index 00000000..abf84d83 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js @@ -0,0 +1,32 @@ +import React from 'react' +import { Modal } from 'antd' +import { Button, Menu, Dropdown, Table } from "antd" +import { warningModalColumns, dataSource } from './columns' + + +export default class WarningModal extends React.Component { + + + + render() { + const menu = ( + + 导出所选 + + ); + return ( + {this.props.onCancel()}}> +
+ 验证结果 +
+ 导出全部 + +
+
+
+
+ + + ) + } +} \ No newline at end of file