compareDetail

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 = (
     <Route key='calculate' path='calculate' component={Calculate} />
     <Route key='calculateDetail' path='calculateDetail' component={CalculateDetail} />
     <Route key='placeOnFileDetail' path='placeOnFileDetail' component={PlaceOnFileDetail} />    
+    <Route key='compareDetail' path='compareDetail' component={CompareDetail} />    
+    
     <Route key='payroll' path='payroll' component={Payroll} />
     <Route key='declare' path='declare' component={Declare} />
     <Route key='taxRate' path='taxRate' component={TaxRate} />

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: "测试",

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 (
+                <div style={{display: "inline-block"}}>
+                    <Button type="primary" style={{marginRight: "10px"}} onClick={() => this.setState({stepSlideVisible: true})}>导入</Button>
+                    <Button type="default" style={{marginRight: "10px"}} onClick={() => this.setState({stepSlideVisible: true})}>导出</Button>
+                    <WeaInputSearch />
+                </div>
+            )
+        }
+
+        const renderLeftOperation = () => {
+            return (
+                <div>
+                    <WeaCheckbox content="只显示有差异的人员" />
+                    <WeaCheckbox content="只显示有差异的薪资项目" />
+                </div>
+            )
+        }
         return (
-            <div>
-                
+            <div className="compareDetail">
+                <CustomTab 
+                    searchOperationItem={
+                        renderRightOperation()
+                    }
+                    leftOperation={
+                        renderLeftOperation()
+                    }
+                />
+                <div className="titleBarWrapper">
+                    <div className="titleBar">
+                        <span className="leftTitle">公式=</span>
+                        <span className="rightTitle">系统值；线下值；<span style={{color: "red"}}>差值</span></span>
+                    </div>
+                </div>
+
+                <div className="tableWrapper">
+                    <Table dataSource={dataSource} columns={mergeDetailColumns}/>
+                </div>
             </div>
         )
     }

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 = (
-            <Menu>
+            <Menu onClick={handleMenuClick}>
               <Menu.Item key="1">导入</Menu.Item>
               <Menu.Item key="2">线下对比</Menu.Item>
               <Menu.Item key="3">导出全部</Menu.Item>

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;
+    }
 }