diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
index 7b02b40a..a238a1fe 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
@@ -63,7 +63,7 @@ export default class CalculateDetail extends React.Component {
return (
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
index 7472495f..c28d3c92 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
@@ -6,7 +6,7 @@ import { WeaTableNew } from "comsMobx"
import { Button, Table, DatePicker, Row, Col, Menu, Dropdown, Switch } from 'antd';
import { WeaInputSearch, WeaSlideModal, WeaHelpfulTip, WeaCheckbox, WeaDatePicker, WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaSelect, WeaTable } from 'ecCom';
-
+import moment from 'moment'
import { renderNoright, getSearchs } from '../../../util'; // 渲染form数据的方法:因为多个页面都会使用,所以抽的公共方法在util中
import CustomTab from '../../../components/customTab';
import ContentWrapper from '../../../components/contentWrapper';
@@ -24,7 +24,9 @@ import TwoColContent from '../../../components/twoColContent'
import TipLabel from '../../../components/TipLabel'
import ItemMangeFormModal from './itemMangeFormModal'
-const { MonthPicker } = DatePicker;
+// const { MonthPicker } = DatePicker;
+
+const { RangePicker } = DatePicker;
@inject('attendanceStore')
@@ -45,8 +47,6 @@ export default class Attendance extends React.Component {
this.state = {
value: "",
selectedKey: "0",
- startDate: "",
- endDate: "",
modalParam: {},
modalVisiable: false,
selectItemVisible: false,
@@ -108,7 +108,7 @@ export default class Attendance extends React.Component {
const { attendanceStore } = this.props;
const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = attendanceStore;
const { step, setStep, setSlideVisiable, slideVisiable, doBatchDelete, attendTableStore, fieldSettingAttendList, fieldSettingCustomList, setFieldSettingAttendList, setFieldSettingCustomList, searchFieldSettingList } = attendanceStore;
- const { getAttendanceFieldSettingList, saveAttendanceFieldSetting, fieldDataSource, fieldTableStore, fieldPageInfo, attendanceDataSource, attendanceColumns} = attendanceStore
+ const { getAttendanceFieldSettingList, saveAttendanceFieldSetting, fieldDataSource, fieldTableStore, fieldPageInfo, attendanceDataSource, attendanceColumns, attendancePageInfo} = attendanceStore
const selectedRowKeys = toJS(tableStore.selectedRowKeys) || []; // tableStore 右侧选中数组
if (!hasRight && !loading) { // 无权限处理
@@ -161,35 +161,19 @@ export default class Attendance extends React.Component {
const renderSearchOperationItem = () => {
return
-
+
}
const renderLeftOperation = () => {
const { attendanceStore: {getAttendanceList}} = this.props;
- return
{
- this.setState({
- startDate: value
- })
- this.listSearch = {
- salaryYearMonth: [value, this.state.endDate]
- }
- getAttendanceList(this.listSearch)
-
- }}
- onEndDateChange={(value) => {
- this.setState({
- endDate: value
- })
- this.listSearch = {
- salaryYearMonth: [this.state.startDate, value]
- }
- getAttendanceList(this.listSearch)
- }}
- />
+ return 薪资所属月: {
+ this.listSearch = {
+ salaryYearMonth: range.map(item => moment(item).format("YYYY-MM"))
+ }
+ getAttendanceList(this.listSearch)
+ }}/>
}
diff --git a/pc4mobx/hrmSalary/pages/declare/index.js b/pc4mobx/hrmSalary/pages/declare/index.js
index 66b13252..9f4a53c1 100644
--- a/pc4mobx/hrmSalary/pages/declare/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/index.js
@@ -28,6 +28,7 @@ export default class Declare extends React.Component {
startDate: moment(new Date()).format("YYYY-MM"),
endDate: moment(new Date()).format("YYYY-MM")
}
+ this.searchParams = {current: 1}
columns.map(item => {
if(item.dataIndex == "cz") {
item.render =(text, record) => {
@@ -63,20 +64,21 @@ export default class Declare extends React.Component {
})
const { declareStore } = this.props;
const { getDeclareList } = declareStore
- getDeclareList({
- fromSalaryMonthStr: this.state.startDate,
- endSalaryMonthStr: value
- })
+ this.searchParams.fromSalaryMonthStr = this.state.startDate
+ this.searchParams.endSalaryMonthStr = value
+ getDeclareList(this.searchParams)
}
// 查询列表
handleSearch() {
const { declareStore } = this.props;
const { getDeclareList } = declareStore
- getDeclareList({
+ this.searchParams = {
fromSalaryMonthStr: this.state.startDate,
- endSalaryMonthStr: this.state.endDate
- })
+ endSalaryMonthStr: this.state.endDate,
+ current: 1
+ }
+ getDeclareList(this.searchParams)
}
getColumns() {
@@ -95,11 +97,16 @@ export default class Declare extends React.Component {
}
+ handleDataPageChange(value) {
+
+ }
+
+
render() {
const { declareStore } = this.props;
const { loading, hasRight, form, condition,
tableStore, showSearchAd, getTableDatas, doSearch,
- setShowSearchAd, listDataSource, listColumns } = declareStore;
+ setShowSearchAd, listDataSource, listColumns, pageInfo } = declareStore;
if (!hasRight && !loading) { // 无权限处理
return renderNoright();
@@ -171,7 +178,13 @@ export default class Declare extends React.Component {
renderRightOperation()
}
/>
-
+ {this.handleDataPageChange(value)},
+ total: pageInfo.total,
+ current: pageInfo.pageNum
+ }}
+ />
{
diff --git a/pc4mobx/hrmSalary/pages/ledger/columns.js b/pc4mobx/hrmSalary/pages/ledger/columns.js
index f3127c39..42a1669e 100644
--- a/pc4mobx/hrmSalary/pages/ledger/columns.js
+++ b/pc4mobx/hrmSalary/pages/ledger/columns.js
@@ -67,11 +67,11 @@ export const slideStep3Columns = [
dataIndex: 'formulaContent',
key: 'formulaContent'
},
- {
- title: "个税申请表对应字段",
- dataIndex: 'taxDeclarationColumn',
- key: 'taxDeclarationColumn',
- }
+ // {
+ // title: "个税申请表对应字段",
+ // dataIndex: 'taxDeclarationColumn',
+ // key: 'taxDeclarationColumn',
+ // }
]
export const slideStep4Columns = [
diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js
index 70c80ef0..ab5ab90f 100644
--- a/pc4mobx/hrmSalary/pages/ledger/index.js
+++ b/pc4mobx/hrmSalary/pages/ledger/index.js
@@ -216,7 +216,7 @@ export default class Ledger extends React.Component {
"关联人员",
"薪资项目",
"调薪记薪规则",
- "校验规则",
+ // "校验规则",
]
const handleStep1Save = () => {
@@ -305,14 +305,14 @@ export default class Ledger extends React.Component {
}
{
- (currentStep == 2 || currentStep == 3) &&
+ currentStep == 2 &&
}
{
- currentStep == 4 &&
+ currentStep == 3 &&
@@ -336,9 +336,9 @@ export default class Ledger extends React.Component {
{
currentStep == 3 &&
}
- {
+ {/* {
currentStep == 4 &&
- }
+ } */}
@@ -357,7 +357,7 @@ export default class Ledger extends React.Component {
title={
this.handleEditSlideSave()}
@@ -379,9 +379,9 @@ export default class Ledger extends React.Component {
{
selectedTab == 3 &&
}
- {
+ {/* {
selectedTab == 4 &&
- }
+ } */}
}
onClose={() => this.setState({editSlideVisible: false})}
showMask={true}
diff --git a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
index c3e436f4..50c36282 100644
--- a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
+++ b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
@@ -102,7 +102,7 @@ export default class CanMoveItem extends React.Component {
{
- this.state.showContent &&