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

hotfix/2.14.2.2406.02

This commit is contained in:
黎永顺 2024-06-12 17:38:34 +08:00
parent 76db508066
commit 1ddcab4f38
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js
View File

@ -20,7 +20,7 @@ class InputPaymentAmount extends Component {
return (
<WeaInputNumber
value={record[`${record.insuranceId}_per`]} disabled={record.perDisabled}
precision={parseFloat(record.validNum || 2)}
precision={parseFloat(record.perValidNum || 2)}
onChange={(val) => this.handleChangeBaseItem(record, val, type, "per")}
/>
);
@ -32,7 +32,7 @@ class InputPaymentAmount extends Component {
return (
<WeaInputNumber
value={record[`${record.insuranceId}_com`]} disabled={record.comDisabled}
precision={parseFloat(record.validNum || 2)}
precision={parseFloat(record.comValidNum || 2)}
onChange={(val) => this.handleChangeBaseItem(record, val, type, "com")}
/>
);

34
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
View File

@ -165,7 +165,8 @@ class RegEditDetial extends Component {
const other = this.combinedData(otherBenefits, result);
this.setState({
listMap: [
{ ...socialData, dataSource: social, columns: _.map(regColumns, item => {
{
...socialData, dataSource: social, columns: _.map(regColumns, item => {
if (item.dataIndex === "personalPaymentAmount" || item.dataIndex === "companyPaymentAmount") {
return {
...item,
@ -173,7 +174,7 @@ class RegEditDetial extends Component {
return (
<WeaInputNumber
disabled={_.isNil(text)}
precision={parseFloat(record.validNum || 2)}
precision={parseFloat(record[`${item.dataIndex}ValidNum`] || 2)}
value={text}
onChange={v => this.handleChange("social", item.dataIndex, v, record)}
/>
@ -182,8 +183,10 @@ class RegEditDetial extends Component {
};
}
return { ...item };
}) },
{ ...foundData, dataSource: fund, columns: _.map(regColumns, item => {
})
},
{
...foundData, dataSource: fund, columns: _.map(regColumns, item => {
if (item.dataIndex === "personalPaymentAmount" || item.dataIndex === "companyPaymentAmount") {
return {
...item,
@ -191,7 +194,7 @@ class RegEditDetial extends Component {
return (
<WeaInputNumber
disabled={_.isNil(text)}
precision={parseFloat(record.validNum || 2)}
precision={parseFloat(record[`${item.dataIndex}ValidNum`] || 2)}
value={text}
onChange={v => this.handleChange("fund", item.dataIndex, v, record)}
/>
@ -200,8 +203,10 @@ class RegEditDetial extends Component {
};
}
return { ...item };
}) },
{ ...otherData, dataSource: other, columns: _.map(regColumns, item => {
})
},
{
...otherData, dataSource: other, columns: _.map(regColumns, item => {
if (item.dataIndex === "personalPaymentAmount" || item.dataIndex === "companyPaymentAmount") {
return {
...item,
@ -209,7 +214,7 @@ class RegEditDetial extends Component {
return (
<WeaInputNumber
disabled={_.isNil(text)}
precision={parseFloat(record.validNum || 2)}
precision={parseFloat(record[`${item.dataIndex}ValidNum`] || 2)}
value={text}
onChange={v => this.handleChange("other", item.dataIndex, v, record)}
/>
@ -218,7 +223,8 @@ class RegEditDetial extends Component {
};
}
return { ...item };
}) }
})
}
]
});
}
@ -231,9 +237,15 @@ class RegEditDetial extends Component {
let obj = { benefits: item };
_.forEach(data, it => {
if (item === it.insuranceName && it.paymentScopeSign === "per") {
obj = _.assign(obj, { ...it, personalPaymentAmount: it.insuranceValue });
obj = _.assign(obj, {
...it, personalPaymentAmount: it.insuranceValue,
personalPaymentAmountValidNum: it.validNum
});
} else if (item === it.insuranceName && it.paymentScopeSign === "com") {
obj = _.assign(obj, { ...it, companyPaymentAmount: it.insuranceValue });
obj = _.assign(obj, {
...it, companyPaymentAmount: it.insuranceValue,
companyPaymentAmountValidNum: it.validNum
});
}
});
return obj;

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
View File

@ -444,7 +444,9 @@ export const convertData = (dataSource) => {
[perKey]: "",
[comKey]: "",
perDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "per"),
comDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "com")
perValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "per")) ? _.filter(itemList, i => i.paymentScopeSign === "per")[0].validNum : 2,
comDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "com"),
comValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "com")) ? _.filter(itemList, i => i.paymentScopeSign === "com")[0].validNum : 2,
});
});
return endList.push(data);