qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/2.10.1.2401.01-社保福利方案重构

This commit is contained in:
黎永顺 2024-02-18 14:48:06 +08:00
parent 5614a0da6d
commit 47608b0522
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCustomDialog/index.js
View File

@ -48,7 +48,7 @@ class Index extends Component {
const { programmeStore: { planCustomForm } } = props;
planCustomForm.initFormFields(this.state.conditions);
_.forEach(getConditionDomkeys(this.state.conditions), k => {
if (k === "paymentScope" && props.customId) {
if (k === "paymentScope" && props.customId && form[k]) {
planCustomForm.updateFields({ [k]: { value: form[k].join(",") } });
} else {
planCustomForm.updateFields({ [k]: { value: form[k] || "" } });

3
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
View File

@ -82,7 +82,7 @@ class Index extends Component {
const { planDatas } = this.state;
const payload = {
insuranceScheme: {
...planForm.getFormParams(), welfareTypeEnum, id,
...planForm.getFormParams(), welfareType: welfareTypeEnum, id,
paymentArea: planForm.getFormParams().paymentType
},
insuranceSchemeDetailList: planDatas
@ -174,6 +174,7 @@ class Index extends Component {
//先统一上下限值
let dataSource = _.reduce(planDatas, (pre, cur) => {
const curData = _.find(datas, o => o.insuranceId === cur.insuranceId);
if (_.isEmpty(curData)) return [...pre, cur];
return [...pre, { ...cur, lowerLimit: curData.lowerLimit, upperLimit: curData.upperLimit }];
}, []);
//再赋值修改值