+
薪资所属月
this.setState({date: value})}
/>
-
- 备注
-
-
-
-
)
diff --git a/pc4mobx/hrmSalary/pages/declare/index.js b/pc4mobx/hrmSalary/pages/declare/index.js
index 40b4293b..9ee0abec 100644
--- a/pc4mobx/hrmSalary/pages/declare/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/index.js
@@ -12,10 +12,11 @@ import ContentWrapper from '../../components/contentWrapper';
import { columns, dataSource } from './columns';
import GenerateModal from './generateModal'
+import moment from 'moment'
const { MonthPicker } = DatePicker;
-@inject('baseTableStore')
+@inject('declareStore')
@observer
export default class Declare extends React.Component {
constructor(props) {
@@ -23,21 +24,82 @@ export default class Declare extends React.Component {
this.state = {
value: "",
selectedKey: "0",
- declarationModalVisible: false
+ declarationModalVisible: false,
+ startDate: moment(new Date()).format("YYYY-MM"),
+ endDate: moment(new Date()).format("YYYY-MM")
}
columns.map(item => {
if(item.dataIndex == "cz") {
- item.render =() => {
+ item.render =(text, record) => {
return (
-
{window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/generateDeclarationDetail")}}>查看
+
{window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/generateDeclarationDetail?id=" + record.id)}}>查看
)
}
}
})
}
+
+ componentWillMount() {
+ this.handleSearch()
+ }
+
+ // 开始月份改变
+ handleStartDateChange(value) {
+ this.setState({
+ startDate: value
+ })
+ const { declareStore } = this.props;
+ const { getDeclareList } = declareStore
+ getDeclareList({
+ fromSalaryMonthStr: value,
+ endSalaryMonthStr: this.state.endDate
+ })
+ }
+
+ // 结束月份改变
+ handleEndDateChange(value) {
+ this.setState({
+ endDate: value
+ })
+ const { declareStore } = this.props;
+ const { getDeclareList } = declareStore
+ getDeclareList({
+ fromSalaryMonthStr: this.state.startDate,
+ endSalaryMonthStr: value
+ })
+ }
+
+ // 查询列表
+ handleSearch() {
+ const { declareStore } = this.props;
+ const { getDeclareList } = declareStore
+ getDeclareList({
+ fromSalaryMonthStr: this.state.startDate,
+ endSalaryMonthStr: this.state.endDate
+ })
+ }
+
+ getColumns() {
+ const { declareStore: {listColumns}} = this.props;
+ let columns = [...listColumns]
+ columns.push({
+ title: "操作",
+ dataIndex: "operate",
+ render: (text, record) => {
+ return (
+
{window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/generateDeclarationDetail?id=" + record.id)}}>查看
+ )
+ }
+ })
+ return columns;
+ }
+
+
render() {
- const { baseTableStore } = this.props;
- const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = baseTableStore;
+ const { declareStore } = this.props;
+ const { loading, hasRight, form, condition,
+ tableStore, showSearchAd, getTableDatas, doSearch,
+ setShowSearchAd, listDataSource, listColumns } = declareStore;
if (!hasRight && !loading) { // 无权限处理
return renderNoright();
@@ -72,13 +134,13 @@ export default class Declare extends React.Component {
this.setState({startDate: value})}
+ onChange={value => this.handleStartDateChange(value)}
/>
至
this.setState({endDate: value})}
+ onChange={value => this.handleEndDateChange(value)}
/>