From fe3bdef7718857a2b9790877db9a5bfe03514280 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Thu, 17 Mar 2022 12:30:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 8 ++- pc4mobx/hrmSalary/pages/calculate/columns.js | 4 +- pc4mobx/hrmSalary/pages/calculate/index.js | 1 + .../pages/calculateDetail/columns.js | 53 ++++++++++++++++++ .../hrmSalary/pages/calculateDetail/index.js | 2 + .../calculateDetail/placeOnFileDetail.js | 56 +++++++++++++++++++ .../pages/calculateDetail/salaryDetail.js | 24 +++++++- 7 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 4e660631..f830c61c 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -18,13 +18,14 @@ import Declare from './pages/declare'; import TaxRate from './pages/taxRate'; import TaxAgent from './pages/taxAgent'; import CalculateDetail from './pages/calculateDetail' - +import PlaceOnFileDetail from './pages/calculateDetail/placeOnFileDetail'; import BaseForm from './components'; import stores from './stores'; import './style/index'; + // 读取系统多语言配置 let getLocaleLabel = WeaLocaleProvider.getLocaleLabel.bind(this, 'hrmSalary'); @@ -52,11 +53,15 @@ const DataAcquisition = props => props.children; // attendance 考勤引用 // ledger 薪资账套 // calculate 薪资核算 + // calculateDetail 核算详情 + // placeOnFileDetail 核算归档详情 // payroll 工资单发放 // declare 个税申请表 // taxRate 个税税率表 // taxAgent 个税扣缴义务人 + + const Routes = ( @@ -76,6 +81,7 @@ const Routes = ( + diff --git a/pc4mobx/hrmSalary/pages/calculate/columns.js b/pc4mobx/hrmSalary/pages/calculate/columns.js index c76fef89..17c4adc3 100644 --- a/pc4mobx/hrmSalary/pages/calculate/columns.js +++ b/pc4mobx/hrmSalary/pages/calculate/columns.js @@ -46,7 +46,9 @@ export const columns = [ } ] -export const dataSource = []; +export const dataSource = [{ + title: "测试" +}]; diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js index 7862d84c..b4faf56e 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/index.js @@ -33,6 +33,7 @@ export default class Calculate extends React.Component { ) diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/columns.js b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js index 9b1b66fe..6635bc28 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/columns.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js @@ -190,6 +190,59 @@ export const warningModalColumns = [ } ] +export const placeOnFileColumns = [ + { + 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' + } +] + export const dataSource = []; diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index 02a60fa4..83c94eef 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -66,6 +66,8 @@ export default class CalculateDetail extends React.Component { { selectedKey == 1 && } + + ) } diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js new file mode 100644 index 00000000..da5b3e46 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js @@ -0,0 +1,56 @@ +import React from 'react' +import CustomTab from '../../components/customTab' +import { Dropdown, Menu, Button, Table } from 'antd' +import { WeaHelpfulTip, WeaInputSearch } from 'ecCom' + +import { placeOnFileColumns, dataSource } from './columns' + +export default class PlaceOnFileDetail extends React.Component { + render() { + const menu = ( + + 导出所选 + + ); + + const renderRightOperation = () => { + return ( +
+ 导出全部 + + +
+ ) + } + + return ( + +
+ +
+ 薪资所属月:2021-11 + +
+
+ + + + ) + } +} \ No newline at end of file diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index 99ff9b1e..895f4c30 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -9,10 +9,12 @@ export default class SalaryDetail extends React.Component { constructor(props) { super(props) this.state ={ - visible: false + visible: false, + slideVisiable: false } } render() { + const { slideVisiable } = this.state; return (
@@ -36,6 +38,26 @@ export default class SalaryDetail extends React.Component {
{this.setState({visible: false})}}/> + { + slideVisiable && {this.state.currentOperate == "add" ? doSave() : doUpdate()}} + editable={this.state.editable} + /> + } + content={()} + onClose={() => setSlideVisiable(false)} + showMask={true} + closeMaskOnClick={() => setSlideVisiable(false)} /> + } ) }