diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/editSlideContent.js index f6106d94..ab1caf24 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/editSlideContent.js @@ -32,13 +32,11 @@ export default class EditSlideContent extends React.Component { taxAgentId: "", startDate: moment(new Date()).format("YYYY-MM"), endDate: moment(new Date()).format("YYYY-MM"), + editable: this.props.editable === undefined ? "true": this.props.editable } } componentWillMount() { // 初始化渲染页面 - this.state = { - editable: this.props.editable === undefined ? "true": this.props.editable - } const { taxAgentStore: { fetchTaxAgentOption } } = this.props; fetchTaxAgentOption(); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index e4889375..adaa79fb 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -312,7 +312,7 @@ export default class CumDeduct extends React.Component { setStep={setStep} slideDataSource={slideDataSource} importResult={importResult} - onFinish={() => {setModalVisiable(false); setStep(0)}} + onFinish={() => {setModalVisiable(false); setStep(0); doSearch();}} previewImport={(params) => {previewImport(params)}} importFile={(params) => {importFile(params)}} templateLink={"/api/bs/hrmsalary/addUpDeduction/downloadTemplate"} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js index b034f935..ed75036f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js @@ -32,13 +32,11 @@ export default class EditSlideContent extends React.Component { taxAgentId: "", startDate: moment(new Date()).format("YYYY-MM"), endDate: moment(new Date()).format("YYYY-MM"), + editable: this.props.editable === undefined ? "true": this.props.editable } } componentWillMount() { // 初始化渲染页面 - this.state = { - editable: this.props.editable === undefined ? "true": this.props.editable - } const { taxAgentStore: { fetchTaxAgentOption } } = this.props; fetchTaxAgentOption(); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index c67446ff..130178aa 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -297,7 +297,7 @@ export default class CumSituation extends React.Component { columns={modalColumns} step={step} setStep={setStep} - onFinish={() => {setModalVisiable(false); setStep(0)}} + onFinish={() => {setModalVisiable(false); setStep(0); doSearch();}} slideDataSource={slideDataSource} importResult={importResult} previewImport={(params) => {previewImport(params)}} diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js index 88480366..953b508f 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js @@ -32,13 +32,11 @@ export default class EditSlideContent extends React.Component { taxAgentId: "", startDate: moment(new Date()).format("YYYY-MM"), endDate: moment(new Date()).format("YYYY-MM"), + editable: this.props.editable === undefined ? "true": this.props.editable } } componentWillMount() { // 初始化渲染页面 - this.state = { - editable: this.props.editable === undefined ? "true": this.props.editable - } const { taxAgentStore: { fetchTaxAgentOption } } = this.props; fetchTaxAgentOption(); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index 7729584f..6ea3ca1c 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -298,7 +298,7 @@ export default class OtherDeduct extends React.Component { columns={modalColumns} step={step} setStep={setStep} - onFinish={() => {setModalVisiable(false); setStep(0)}} + onFinish={() => {setModalVisiable(false); setStep(0); doSearch();}} importResult={importResult} slideDataSource={slideDataSource} previewImport={(params) => {previewImport(params)}} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js index dc17fee2..fa502551 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js @@ -4,7 +4,7 @@ import { toJS } from 'mobx'; import { Button, Table, DatePicker } from 'antd'; -import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaInputSearch, WeaSlideModal } from 'ecCom'; +import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaInputSearch, WeaSlideModal, WeaSelect } from 'ecCom'; import { WeaTableNew } from "comsMobx" import "./index.less"; @@ -48,7 +48,7 @@ export default class Programme extends React.Component { render() { const { programmeStore } = this.props; const { loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = programmeStore; - const { selectedKey, setSelectedKey, getCustomCategoryList, customTableStore } = programmeStore; + const { selectedKey, setSelectedKey, getCustomCategoryList, customTableStore, customSelectkey, setCustomSelectkey } = programmeStore; if (!hasRight && !loading) { // 无权限处理 return renderNoright(); } @@ -93,13 +93,36 @@ export default class Programme extends React.Component { } ]; + const options = [ + { + showname: "社保", + key: "SOCIAL_SECURITY" + }, + { + showname: "公积金", + key: "ACCUMULATION_FUND" + }, + { + showname: "企业年金及其他福利", + key: "OTHER" + } + ] + const renderSearchOperationItem = () => { return