diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index f830c61c..c30c4f60 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -19,6 +19,7 @@ import TaxRate from './pages/taxRate'; import TaxAgent from './pages/taxAgent'; import CalculateDetail from './pages/calculateDetail' import PlaceOnFileDetail from './pages/calculateDetail/placeOnFileDetail'; +import CompareDetail from './pages/calculateDetail/compareDetail' import BaseForm from './components'; @@ -55,6 +56,7 @@ const DataAcquisition = props => props.children; // calculate 薪资核算 // calculateDetail 核算详情 // placeOnFileDetail 核算归档详情 + // compareDetail 线下线上对比 // payroll 工资单发放 // declare 个税申请表 // taxRate 个税税率表 @@ -82,6 +84,8 @@ const Routes = ( + + diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/columns.js b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js index e2f045c0..8751a73e 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/columns.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js @@ -273,6 +273,54 @@ export const mergeDetailColumns = [ }, ] +export const compareColumn = [ + { + 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' + } +] + export const dataSource = [ { title: "测试", diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js index c561254c..0f449c15 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js @@ -1,11 +1,50 @@ import React from 'react' - +import { Button, Table } from "antd" +import { WeaInputSearch, WeaCheckbox } from 'ecCom' +import { mergeDetailColumns, dataSource } from './columns' +import CustomTab from '../../components/customTab' export default class CompareDetail extends React.Component { render() { + + const renderRightOperation = () => { + return ( +
+ + + +
+ ) + } + + const renderLeftOperation = () => { + return ( +
+ + +
+ ) + } return ( -
- +
+ +
+
+ 公式= + 系统值;线下值;差值 +
+
+ +
+ + ) } diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index 83c94eef..503b118c 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -16,11 +16,18 @@ export default class CalculateDetail extends React.Component { selectedKey: "0" } } + + render() { const { selectedKey } = this.state; + const handleMenuClick = (e) => { + if(e.key == "2") { + window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/compareDetail") + } + } const menu = ( - + 导入 线下对比 导出全部 diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.less b/pc4mobx/hrmSalary/pages/calculateDetail/index.less index a5522fc5..5297c85a 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.less +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.less @@ -115,6 +115,18 @@ .tableWrapper { margin-top: 10px; } - +} +.compareDetail { + padding: 20px; + .titleBarWrapper { + height: 47px; + line-height: 47px; + .rightTitle { + float: right; + } + } + .tableWrapper { + margin-top: 10px; + } } \ No newline at end of file