From 9153ce934b5e13c2f42eca6a86a1cffa9152c140 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Wed, 16 Mar 2022 16:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A1=AE=E8=AE=A4=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/index.js | 2 +
pc4mobx/hrmSalary/pages/calculate/columns.js | 27 +++--
pc4mobx/hrmSalary/pages/calculate/index.js | 55 ++++++++-
.../pages/calculateDetail/columns.js | 114 ++++++++++++++++++
.../hrmSalary/pages/calculateDetail/index.js | 41 +++++++
.../pages/calculateDetail/index.less | 41 +++++++
.../pages/calculateDetail/userSure.js | 94 +++++++++++++++
7 files changed, 362 insertions(+), 12 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/calculateDetail/columns.js
create mode 100644 pc4mobx/hrmSalary/pages/calculateDetail/index.js
create mode 100644 pc4mobx/hrmSalary/pages/calculateDetail/index.less
create mode 100644 pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 40f1131b..4e660631 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -17,6 +17,7 @@ import Payroll from './pages/payroll';
import Declare from './pages/declare';
import TaxRate from './pages/taxRate';
import TaxAgent from './pages/taxAgent';
+import CalculateDetail from './pages/calculateDetail'
import BaseForm from './components';
@@ -74,6 +75,7 @@ const Routes = (
+
diff --git a/pc4mobx/hrmSalary/pages/calculate/columns.js b/pc4mobx/hrmSalary/pages/calculate/columns.js
index cb9722d4..c76fef89 100644
--- a/pc4mobx/hrmSalary/pages/calculate/columns.js
+++ b/pc4mobx/hrmSalary/pages/calculate/columns.js
@@ -1,42 +1,51 @@
export const columns = [
{
- title: "姓名",
+ title: "薪资所属月",
dataIndex: 'title',
key: 'title',
},
{
- title: "个税扣缴义务人",
+ title: "薪资账套",
dataIndex: 'title',
key: 'title',
},
{
- title: "部门",
+ title: "状态",
dataIndex: 'title',
key: 'title',
},
{
- title: "手机号",
+ title: "税款所属期",
dataIndex: 'title',
key: 'title',
},
{
- title: "员工状态",
+ title: "核算人数",
dataIndex: 'title',
key: 'title',
},
{
- title: "基本工资",
+ title: "核算人",
+ dataIndex: 'title',
+ key: 'title',
+ },
+ {
+ title: "最后操作时间",
+ dataIndex: 'title',
+ key: 'title',
+ },
+ {
+ title: "备注",
dataIndex: 'title',
key: 'title',
},
{
title: "操作",
- dataIndex: 'title',
- key: 'title',
+ dataIndex: 'cz',
+ key: 'cz',
}
]
-
export const dataSource = [];
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js
index dfb750d3..7862d84c 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/index.js
@@ -4,13 +4,14 @@ import { toJS } from 'mobx';
import { Button, Table, DatePicker } from 'antd';
-import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable } from 'ecCom';
+import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable, WeaDatePicker, WeaInputSearch } from 'ecCom';
import { renderNoright, getSearchs } from '../../util'; // 渲染form数据的方法:因为多个页面都会使用,所以抽的公共方法在util中
import CustomTab from '../../components/customTab';
import ContentWrapper from '../../components/contentWrapper';
import { columns, dataSource } from './columns';
+import moment from 'moment';
const { MonthPicker } = DatePicker;
@@ -21,13 +22,28 @@ export default class Calculate extends React.Component {
super(props);
this.state = {
value: "",
- selectedKey: "0"
+ selectedKey: "0",
+ modalParam:{
+ startDate: moment(new Date()).format("YYYY-MM"),
+ endDate: moment(new Date()).format("YYYY-MM")
+ },
+ columns: columns.map(item => {
+ if(item.dataIndex == 'cz') {
+ item.render = () => (
+
+ )
+ }
+ })
}
}
render() {
const { baseTableStore } = this.props;
const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = baseTableStore;
-
+ const { modalParam } = this.state
if (!hasRight && !loading) { // 无权限处理
return renderNoright();
}
@@ -61,6 +77,31 @@ export default class Calculate extends React.Component {
}
+ const renderRightOperation = () => {
+ return (
+
+
+
+ this.setState({ modalParam: {...modalParam, declareMonth: value} })}
+ />
+ {' '}
+ 至
+ {' '}
+ this.setState({ modalParam: {...modalParam, declareMonth: value} })}
+ />
+
+
+
+ )
+ }
+
return (
+ {
+
+ }}
+ />
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/columns.js b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js
new file mode 100644
index 00000000..1e83fcae
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/columns.js
@@ -0,0 +1,114 @@
+export const userSureColumns = [
+ {
+ 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: "员工状态",
+ dataIndex: 'title',
+ key: 'title',
+ },
+ {
+ title: "入职日期",
+ dataIndex: 'title',
+ key: 'title',
+ },
+ {
+ title: "离职日期",
+ dataIndex: 'title',
+ key: 'title',
+ },
+ {
+ title: "操作",
+ dataIndex: 'cz',
+ key: 'cz',
+ }
+]
+
+export const monthOnMonthColumns = [
+ {
+ 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: "员工状态",
+ 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
new file mode 100644
index 00000000..d890a9ad
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import UserSure from './userSure'
+import { inject, observer } from 'mobx-react';
+import CustomTab from '../../components/customTab'
+
+@inject('baseTableStore')
+@observer
+export default class CalculateDetail extends React.Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ selectedKey: "0"
+ }
+ }
+ render() {
+ const { selectedKey } = this.state;
+ const topTab = [{
+ title: "人员确认",
+ viewcondition: "0"
+ },
+ {
+ title: "薪资核算",
+ viewcondition: "1"
+ }];
+
+ return (
+
+ {
+
+ }}
+ />
+ {
+ selectedKey == 0 &&
+ }
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.less b/pc4mobx/hrmSalary/pages/calculateDetail/index.less
new file mode 100644
index 00000000..37bff41f
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.less
@@ -0,0 +1,41 @@
+.userSure {
+ padding: 20px;
+ .baseInfo {
+ height: 47px;
+ line-height: 47px;
+ }
+ .formWrapper {
+ line-height: 40px;
+ border-bottom: 1px solid #eee;
+ }
+
+ .operateBarWrapper {
+ border-bottom: 1px solid #eee;
+ line-height: 47px;
+ height: 47px;
+ .crumbsWrapper {
+ display: inline-block;
+ .crumbItem {
+ margin-right: 10px;
+ cursor: pointer;
+ }
+ .crumbItemSelected {
+ color: #2db7f5;
+ }
+ }
+ .crumbsOperateWrapper {
+ float: right;
+ display: inline-block;
+ .headerIcon {
+ display: inline-block;
+ .iconItem {
+ margin-right: 15px;
+ color: #2db7f5;
+ cursor: pointer;
+ }
+ }
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
new file mode 100644
index 00000000..ca267e99
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
@@ -0,0 +1,94 @@
+import React from 'react'
+import { Row, Col, Icon, Table } from 'antd'
+import { WeaHelpfulTip, WeaInputSearch } from 'ecCom'
+import { dataSource , monthOnMonthColumns, userSureColumns} from './columns'
+import "./index.less"
+
+export default class UserSure extends React.Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ selectedKey: "0"
+ }
+ }
+ render() {
+ return (
+
+
基本信息
+
+
+
+
+ 薪资所属月:
+
+ 2021-11
+
+
+
+
+ 核算账套:
+
+ 薪资账套A
+
+
+
+
+
+ 备注:
+ 这是个备注
+
+
+
+
+
+ {this.setState({selectedKey: "0"})}}>核算人员范围
+
+ {' '}|{' '}
+ {this.setState({selectedKey: "1"})}}>环比上月减少人员
+
+
+
+ {
+ this.state.selectedKey == "0" &&
+
+
+
+ }
+
+
+
+
+
+
+
+ {
+ this.state.selectedKey == 0 &&
+ }
+ {
+ this.state.selectedKey == 1 &&
+ }
+
+
+
+ )
+ }
+}
\ No newline at end of file