diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js index dee64cb5..9516b9a6 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js @@ -108,6 +108,7 @@ export default class EditSlideContent extends React.Component { setSlidePageObj({ ...slidePageObj, current, pageSize }); getCumDeductDetailList(currentRecord.id, { ...slidePageObj, + taxAgentId: currentRecord.taxAgentId, current, pageSize, declareMonth: _.filter(declareMonth, item => item) @@ -121,6 +122,7 @@ export default class EditSlideContent extends React.Component { }); getCumDeductDetailList(currentRecord.id, { ...slidePageObj, current, + taxAgentId: currentRecord.taxAgentId, declareMonth: _.filter(declareMonth, item => item) }); } @@ -152,7 +154,7 @@ export default class EditSlideContent extends React.Component { this.handleFetchCumDeductDetailList( startDate, endDate, - taxAgentId + currentRecord.taxAgentId ); }} /> diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js index fc9b430a..4ef993a4 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js @@ -110,14 +110,14 @@ export default class EditSlideContent extends React.Component { getCumDeductDetailList(currentRecord.id, { ...slidePageObj, current, - pageSize, + pageSize,taxAgentId:currentRecord.taxAgentId, declareMonth: _.filter(declareMonth, item => item) }); }, onChange(current) { setSlidePageObj({ ...slidePageObj, - current, + current,taxAgentId:currentRecord.taxAgentId, pageSize: slidePageObj.pageSize }); getCumDeductDetailList(currentRecord.id, { @@ -175,7 +175,7 @@ export default class EditSlideContent extends React.Component { this.handleFetchCumDeductDetailList( startDate, endDate, - taxAgentId + currentRecord.taxAgentId ); }} /> diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js index 6f464d9e..e66c6b4f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js @@ -1,13 +1,7 @@ import React from "react"; -import { Row, Col, Table, DatePicker } from "antd"; +import { Col, DatePicker, Row } from "antd"; import { inject, observer } from "mobx-react"; -import { - WeaInput, - WeaTextarea, - WeaSearchGroup, - WeaSelect, - WeaTable, -} from "ecCom"; +import { WeaTable } from "ecCom"; import "./editSlideContent.less"; import moment from "moment"; @@ -21,7 +15,7 @@ let emptyItem = { taxableIncomeLl: "0.00", taxableIncomeUl: "0.00", taxRate: "0.00", - taxDeduction: "0.00", + taxDeduction: "0.00" }; @inject("otherDeductStore", "taxAgentStore") @@ -34,21 +28,21 @@ export default class EditSlideContent extends React.Component { startDate: "", endDate: "", editable: - this.props.editable === undefined ? "true" : this.props.editable, + this.props.editable === undefined ? "true" : this.props.editable }; } componentWillMount() { // 初始化渲染页面 const { - taxAgentStore: { fetchTaxAgentOption }, + taxAgentStore: { fetchTaxAgentOption } } = this.props; fetchTaxAgentOption(); } addItem() { const { - taxRateStore: { setDataSource }, + taxRateStore: { setDataSource } } = this.props; let dataSource = [...this.props.taxRateStore.dataSource]; let indexNum = 1; @@ -78,7 +72,7 @@ export default class EditSlideContent extends React.Component { declareMonth.push(endDate); } let item = { - taxAgentId: taxAgentId, + taxAgentId: taxAgentId }; if (declareMonth.length != 0) { item.declareMonth = declareMonth; @@ -100,7 +94,7 @@ export default class EditSlideContent extends React.Component { slidePageObj, slideTableDataSource, setSlidePageObj, - slideLoading, + slideLoading } = otherDeductStore; const { startDate, endDate, taxAgentId } = this.state; const declareMonth = [startDate, endDate]; @@ -123,20 +117,20 @@ export default class EditSlideContent extends React.Component { onChange(current) { setSlidePageObj({ ...slidePageObj, - current, - pageSize: slidePageObj.pageSize, + current, taxAgentId: currentRecord.taxAgentId, + pageSize: slidePageObj.pageSize }); getOtherDeductDetailList(currentRecord.id, { ...slidePageObj, - current, + current, taxAgentId: currentRecord.taxAgentId, declareMonth: _.filter(declareMonth, item => item) }); - }, + } }; const newColumns = _.map([...slideColumns], (item) => ({ ...item })); const rowSelection = { selectedRowKeys: this.props.slideSelectedKey, - onChange: this.onSelectChange, + onChange: this.onSelectChange }; return (
@@ -180,7 +174,7 @@ export default class EditSlideContent extends React.Component { this.handleFetchCumDeductDetailList( startDate, endDate, - taxAgentId + currentRecord.taxAgentId ); }} />