diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index b8f6c267..68876f0d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -214,6 +214,7 @@ export default class Archives extends React.Component { const { archivesStore: { save, socialSecurityForm, accumulationFundForm, otherForm } } = this.props; if (selectedTab == 1) { const { data } = socialSecurityForm; + console.log(socialSecurityForm); if (data.socialSchemeId && !data.socialStartTime) { Modal.warning({ title: "信息确认", @@ -221,9 +222,9 @@ export default class Archives extends React.Component { }); return; } - save("SOCIAL_SECURITY").then(() => { - this.query(); - }); + // save("SOCIAL_SECURITY").then(() => { + // this.query(); + // }); } else if (selectedTab == 2) { const { data } = accumulationFundForm; if (data.fundSchemeId && !data.fundStartTime) { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.less index 348327f9..67111a4e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.less @@ -20,6 +20,11 @@ } } + .welfareBaseWrapper { + .title { + margin-right: 10px; + } + } } .mySalaryBenefitsWrapper { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js index 461f542c..2c27a311 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js @@ -33,30 +33,21 @@ export default class SocialSecurityForm extends React.Component { getPaymentForm(employeeId, "SOCIAL_SECURITY", value, paymentOrganization); }; - //基数变化 - handlePaymentChange(params) { + handlePaymentChange = ({ key, value }) => { + const params = { [key]: value }; const { archivesStore: { socialSecurityPaymentForm, setSocialSecurityPaymentForm } } = this.props; const { data } = socialSecurityPaymentForm; let request = { ...data, ...params }; let form = { ...socialSecurityPaymentForm }; form.data = request; setSocialSecurityPaymentForm(form); - } + }; render() { const { archivesStore: { socialSecurityForm, socialSecurityPaymentForm } } = this.props; const { items, data: socialData } = socialSecurityForm; const paymentData = socialSecurityPaymentForm.data; const paymentItems = socialSecurityPaymentForm.items; - // Integer数据转为string - // let socialData = { ...baseData }; - // if (!_.isNil(socialData)) { - // Object.keys(socialData).map(key => { - // if (!_.isNil(socialData[key])) { - // socialData[key] = socialData[key].toString(); - // } - // }); - // } const { nonPayment = "", schemeAccount = "", socialStartTime = "", socialEndTime = "", socialName = "" @@ -101,7 +92,7 @@ export default class SocialSecurityForm extends React.Component {
} items={socialItems} col={2} showGroup needTigger={false}/> { @@ -113,124 +104,31 @@ export default class SocialSecurityForm extends React.Component { key: child["domkey"][0], label: child.label, value: !_.isNil(paymentData[child["domkey"][0]]) ? paymentData[child["domkey"][0]].toString() : "", - onChange: this.handleFormChange + onChange: this.handlePaymentChange }) }))} + customComponent={} title={title} col={2} showGroup />; }) } - {/*
*/} - {/* {*/} - {/* this.handleFormChange({ nonPayment: value });*/} - {/* }}*/} - {/* />*/} - {/*
*/} - {/**/} - {/* */} - {/* 社保起始缴纳月:*/} - {/* */} - {/* {*/} - {/* this.handleFormChange({ socialStartTime: value });*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* 社保方案名称:*/} - {/* */} - {/* {*/} - {/* this.handleFormChange({ socialName: showName, socialSchemeId: value });*/} - {/* this.handleFetchPaymentForm(value);*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* */} - {/* 社保最后缴纳月:*/} - {/* */} - {/* this.handleFormChange({ socialEndTime: value })}*/} - {/* />*/} - {/* */} - {/* 社保账号:*/} - {/* */} - {/* {*/} - {/* this.handleFormChange({ schemeAccount: value });*/} - {/* }}/>*/} - {/* */} - {/* */} - {/* */} - {/* 社保个人实际承担方:*/} - {/* */} - {/* {*/} - {/* this.handleFormChange({ underTake: value });*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/**/} - {/*{*/} - {/* data.socialSchemeId && paymentItems && paymentItems.map(group => (*/} - {/*
*/} - {/* {*/} - {/* group.items && group.items.length > 0 && */} - {/* */} - {/* {*/} - {/* group.items && group.items.map((item, idx) => (*/} - {/* */} - {/* */} - {/* {item.label}:*/} - {/* */} - {/* {*/} - {/* this.handlePaymentChange({ [item.domkey[0]]: value ? String(value) : '0' });*/} - {/* }}*/} - {/* />*/} - {/* */} - {/* */} - {/* */} - {/* ))*/} - {/* }*/} - {/* */} - {/* */} - {/* }*/} - {/*
*/} - {/* ))*/} - {/*}*/}
); } } -const SocialTitle = (props) => { +const ConsistentWelfare = (props) => { const { value, onChange, key } = props; + return
+ 各项福利基数一致: + onChange({ key, value: val })} + precision={2} + /> +
; +}; +const SocialTitle = (props) => { + const { value, onChange, keyname: key } = props; return onChange({ key, value: val })}/>; }; const SocialSelect = (props) => {