From 7579a8cd31af803457eb16033b72fde27951b389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 24 Nov 2023 14:45:37 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42310.02-=E7=A4=BE=E4=BF=9D?=
=?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E9=87=8D?=
=?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../welfareEditArchiveSlide/index.js | 3 ++-
.../welfareArchive/config.js | 20 +++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
index 2507a7c8..ad549ea8 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
@@ -126,6 +126,7 @@ class Index extends Component {
});
}
};
+ handleExtraChange = (key, value) => this.setState({ formData: { ...this.state.formData, [key]: value } });
renderTitle = () => {
const { loading } = this.state;
return
@@ -162,7 +163,7 @@ class Index extends Component {
top={0} width={800} height={100} measureT={"%"} measureX={"px"} measureY={"%"}
direction={"right"} title={this.renderTitle()} onClose={this.handleClose}
content={
- {getWelfareSearchsForm(welfareProfileForm, conditions, this.handleFormChange, formData, this.props)}
+ {getWelfareSearchsForm(welfareProfileForm, conditions, this.handleFormChange, this.handleExtraChange, formData, this.props)}
}
/>
);
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
index a5cb8917..91714b3e 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
@@ -656,7 +656,7 @@ export const welfareConditions = [
]
}
];
-export const getWelfareSearchsForm = (form, condition, onChange = () => void (0), payload, extraFormField) => {
+export const getWelfareSearchsForm = (form, condition, onChange = () => void (0), onExtraChange = () => void (0), payload, extraFormField) => {
const CustomComponent = ({ type }) => {
const value = payload[type].nonPayment ? payload[type].nonPayment.toString() : "";
return
;
@@ -690,18 +690,21 @@ export const getWelfareSearchsForm = (form, condition, onChange = () => void (0)
});
return _.reduce(group, (pre, cur) => {
if (cur.props.title === getLabel(543194, "社保基础信息") && _.every(socialBase.items, o => o.items.length > 0)) {
- return [...pre, cur,
];
+ return [...pre, cur,
+ ];
} else if (cur.props.title === getLabel(543197, "公积金基础信息") && _.every(fundBase.items, o => o.items.length > 0)) {
- return [...pre, cur, ];
+ return [...pre, cur,
+ ];
} else if (cur.props.title === getLabel(543198, "其他福利基础信息") && _.every(otherBase.items, o => o.items.length > 0)) {
- return [...pre, cur, ];
+ return [...pre, cur,
+ ];
}
return [...pre, cur];
}, []);
};
const BenefitBaseComponent = (props) => {
- const { dataSource, value } = props;
+ const { dataSource, value, onChange } = props;
return
{
_.map(dataSource, item => {
@@ -710,9 +713,10 @@ const BenefitBaseComponent = (props) => {
items={_.map(items, child => ({
com:
0 ? minNum : -999999999999999}
- // max={maxNum > 0 ? maxNum : 999999999999999}
+ value={value[getKey(child)] || (child.min !== "0.000" ? child.min : 0)} precision={2}
+ min={child.min !== "0.000" ? child.min : -999999999999999}
+ max={child.max !== "0.000" ? child.max : 999999999999999}
+ onChange={v => onChange(getKey(child), v)}
/>
}))}