diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js index 622e9929..f523d68f 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js @@ -1,6 +1,6 @@ import React from "react"; -import { WeaSelect, WeaInput, WeaTable, WeaInputNumber } from "ecCom"; -import { Row, Col, Switch } from "antd"; +import { WeaInput, WeaInputNumber, WeaSelect, WeaTable } from "ecCom"; +import { Col, Row, Switch } from "antd"; import { insertUpdateColumns } from "./columns"; import { inject, observer } from "mobx-react"; import SmallTab from "../../../components/smallTab"; @@ -88,7 +88,7 @@ export default class DefaultSlideForm extends React.Component { key: "6", selected: false, showname: "向上取偶" - }, + } ]; item.render = (text, record) => { return ( @@ -168,20 +168,20 @@ export default class DefaultSlideForm extends React.Component { } = this.props; let result = { ...record }; result[key] = e; - if(key === 'upperLimit' || key === 'lowerLimit'){ + if (key === "upperLimit" || key === "lowerLimit") { let dataSource = [...defaultPersonDataSource], - dataSource_company = [...defaultCompanyDataSource]; + dataSource_company = [...defaultCompanyDataSource]; dataSource = dataSource.map(item => { - if (item.insuranceName === result.insuranceName) return {...item, [key]: e, }; + if (item.insuranceName === result.insuranceName) return { ...item, [key]: e }; else return item; }); dataSource_company = dataSource_company.map(item => { - if (item.insuranceName === result.insuranceName) return {...item, [key]: e }; + if (item.insuranceName === result.insuranceName) return { ...item, [key]: e }; else return item; }); setDefaultPersonDataSource(dataSource); setDefaultCompanyDataSource(dataSource_company); - }else{ + } else { if (this.state.selectItem == "个人") { let dataSource = [...defaultPersonDataSource]; dataSource = dataSource.map(item => { @@ -200,18 +200,16 @@ export default class DefaultSlideForm extends React.Component { } } - componentWillReceiveProps(nextProps, nextContext) { + componentDidMount() { const { taxAgentStore } = this.props; const { getTaxAgentSelectListAsAdmin } = taxAgentStore; - if(nextProps.customEditVisible !== this.props.customEditVisible){ - getTaxAgentSelectListAsAdmin(); - } + getTaxAgentSelectListAsAdmin(); } render() { const { programmeStore, salaryFileStore, taxAgentStore } = this.props; const { userStatusList } = salaryFileStore; - const { taxAgentAdminOption,getTaxAgentSelectListAsAdmin } = taxAgentStore; + const { taxAgentAdminOption, getTaxAgentSelectListAsAdmin } = taxAgentStore; const { defaultPersonDataSource, defaultCompanyDataSource } = programmeStore; const options = [ { @@ -285,16 +283,17 @@ export default class DefaultSlideForm extends React.Component { options={userStatusList} onChange={(visibleVal) => { let requestParams = { ...this.props.requestParams }; + visibleVal === "1" && getTaxAgentSelectListAsAdmin(); + (visibleVal === "0" || visibleVal === "") && (requestParams.taxAgentIds = ''); requestParams.sharedType = visibleVal; this.props.onChange(requestParams); - visibleVal=== '1' && getTaxAgentSelectListAsAdmin(); }} /> { this.props.requestParams.sharedType === "1" && - + 可见性范围 {this.state.selectItem == "个人" ? + dataSource={defaultPersonDataSource} + columns={insertUpdateColumns} + pagination={false} + /> : } + dataSource={defaultCompanyDataSource} + columns={insertUpdateColumns} + pagination={false} + />}