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

feature/2.9.9.2312.01-社保核算以及薪资账套查询优化

This commit is contained in:
黎永顺 2023-11-29 18:29:55 +08:00
parent 79fca386d3
commit 84d4df6d3d
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
View File

@ -102,9 +102,7 @@ class SalaryCalcOcList extends Component {
return _.map(cols, (item, index) => {
const col = { title: item.text, dataIndex: item.column };
if (_.isNaN(parseInt(item.column))) {
return item.fixed ? { ...col, width: 150, fixed: item.fixed } : index < 2 ? {
...col, width: 150, fixed: "left"
} : { ...col, width: 150 };
return { ...col, width: 150, fixed: item.fixed || false };
} else {
return { ...col, width: 180, children: this.convertColumns(item.children) };
}

2
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
View File

@ -112,7 +112,7 @@ class LedgerSlide extends Component {
const { editId: salarySobId } = this.props;
const payload = {
empFields: _.map(empFields, it => {
if (Object.prototype.toString.call(it.id) === "[object Number]") delete it.id;
if (!it.salarySobId) delete it.id;
return { ...it };
}),
itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), item => {

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

@ -15,6 +15,7 @@ import { getPaymentGroup, getSupplementPaymentForm, siaccountSupplementarySave }
import "./index.less";
import BusinessAccounting from "./businessAccounting";
import InputPaymentAmount from "./inputPaymentAmount";
import { toDecimal_n } from "../../../../util";
const getLabel = WeaLocaleProvider.getLabel;
@ -90,8 +91,13 @@ class SupplementarySlide extends Component {
_.map(inputPaymentAmount[item], child => {
const key = child.insuranceId, valuePer = child[`${child.insuranceId}_per`],
valueCom = child[`${child.insuranceId}_com`];
_.assign(payload[`${item}PerString`], { [key]: valuePer ? valuePer.toString() : "0" });
_.assign(payload[`${item}ComString`], { [key]: valueCom ? valueCom.toString() : "0" });
console.log(child);
if (!_.isNil(valuePer) && valuePer !== "") {
_.assign(payload[`${item}PerString`], { [key]: toDecimal_n(valuePer, 2) });
}
if (!_.isNil(valueCom) && valuePer !== "") {
_.assign(payload[`${item}ComString`], { [key]: toDecimal_n(valueCom, 2) });
}
});
});
for (let i in payload) {
@ -127,6 +133,8 @@ class SupplementarySlide extends Component {
...this.convertBusinessAccounting(),
...this.convertInputPaymentAmount()
};
console.log(payload);
return;
this.setState({ loading: true });
siaccountSupplementarySave(payload).then(({ status, errormsg }) => {
this.setState({ loading: false });