From aaa02b443716675ed5cbd5bbaa1790dfdf0967fb Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Thu, 17 Mar 2022 10:54:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/calculateDetail/columns.js | 84 +++++++++++++++++++ .../hrmSalary/pages/calculateDetail/index.js | 35 +++++++- .../pages/calculateDetail/index.less | 21 ++++- .../pages/calculateDetail/salaryDetail.js | 42 ++++++++++ .../pages/calculateDetail/warningModal.js | 32 +++++++ 5 files changed, 211 insertions(+), 3 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js create mode 100644 pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js 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 ( +