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

新增补缴添加空值判断

This commit is contained in:
黎永顺 2023-01-04 14:37:19 +08:00
parent 62f36c4d42
commit 4f89a7ef4f
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
View File

@ -580,28 +580,6 @@ export default class NormalIndex extends Component {
});
}}
/>
{/*{addProps.visible &&*/}
{/* <WeaDialog*/}
{/* {...addProps}*/}
{/* onCancel={() =>*/}
{/* this.setState({*/}
{/* addProps: {*/}
{/* ...addProps,*/}
{/* title: "",*/}
{/* visible: false*/}
{/* }*/}
{/* })}*/}
{/* buttons={[*/}
{/* <Button*/}
{/* type="primary"*/}
{/* onClick={this.handleSave}*/}
{/* loading={saveLoading}>*/}
{/* 保存*/}
{/* </Button>,*/}
{/* <Button onClick={() => form.resetForm()}>重置</Button>*/}
{/* ]}>*/}
{/* {getSearchs(form, toJS(condition), 1)}*/}
{/* </WeaDialog>}*/}
{
selectedKey === "1" && this.props.type !== "detail" &&
<React.Fragment>
@ -640,7 +618,7 @@ export default class NormalIndex extends Component {
<Tooltip title="导入数据">
<i
className="icon-coms02-Import"
style={{ color: "#2db7f5", fontSize: 18, marginRight: 10 }}
style={{ color: "#2db7f5", fontSize: 18, marginRight: 10, cursor: "pointer" }}
onClick={() => this.setState({ importParams: { ...importParams, visible: true } })}
/>
</Tooltip>
@ -673,7 +651,7 @@ export default class NormalIndex extends Component {
<Tooltip title="导出全部">
<i
className="icon-coms02-coms2-export"
style={{ color: "#2db7f5", fontSize: 18 }}
style={{ color: "#2db7f5", fontSize: 18, marginRight: 10, cursor: "pointer" }}
onClick={this.handleExport}
/>
</Tooltip>

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

@ -59,7 +59,7 @@ class SupplementarySlide extends Component {
const key = child.insuranceId, value = child.insuranceBase;
_.assign(
payload[item === "socialSecurityBase" ? "socialPaymentBaseString" : item === "fundBase" ? "fundPaymentBaseString" : "otherPaymentBaseString"],
{ [key]: value ? value.toString() : "" }
{ [key]: value ? value.toString() : "0" }
);
});
});
@ -88,8 +88,8 @@ 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() : "" });
_.assign(payload[`${item}ComString`], { [key]: valueCom ? valueCom.toString() : "" });
_.assign(payload[`${item}PerString`], { [key]: valuePer ? valuePer.toString() : "0" });
_.assign(payload[`${item}ComString`], { [key]: valueCom ? valueCom.toString() : "0" });
});
});
for (let i in payload) {