From b14c2f9f87614c494a2b9bf9677beae2f2d4761e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 30 Nov 2023 15:13:09 +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 --- .../components/welfareEditArchiveSlide/index.js | 14 +++++++++++--- .../welfareArchive/config.js | 15 +++++++++------ 2 files changed, 20 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 8a1c7579..2f9cde90 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js @@ -40,7 +40,7 @@ class Index extends Component { getBaseForm = async (props) => { const { data: taxAgentList } = await getTaxAgentSelectList(); const { - archivesStore: { welfareProfileForm }, socialBase, fundBase, otherBase, + archivesStore: { welfareProfileForm }, socialBase, fundBase, otherBase, runStatuses, employeeId, paymentOrganization, socialBaseData, fundBaseData, othersBaseData } = props; const payload = { employeeId, paymentOrganization, welfareTypeEnum: "" }; @@ -57,6 +57,7 @@ class Index extends Component { if (o.title === "basic") { return { ...o, title: getLabel(542699, "员工基本信息"), + viewAttr: runStatuses === "4,5" ? 1 : o.viewAttr, items: _.map(o.items, g => { return { ...g, label: getLabel(g.lanId, g.label) }; }) @@ -80,16 +81,23 @@ class Index extends Component { const key = _.lowerCase(getKey(g)).indexOf("take") !== -1 ? "underTake" : getKey(g); return { ...g, label: getLabel(g.lanId, g.label), + viewAttr: runStatuses === "4,5" ? 1 : g.viewAttr, options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options }; } - return { ...g, label: getLabel(g.lanId, g.label) }; + return { + ...g, label: getLabel(g.lanId, g.label), + viewAttr: runStatuses === "4,5" ? 1 : g.viewAttr, + }; }) }; } return { ...o, items: _.map(o.items, g => { - return { ...g, label: getLabel(g.lanId, g.label) }; + return { + ...g, label: getLabel(g.lanId, g.label), + viewAttr: runStatuses === "4,5" ? 1 : g.viewAttr, + }; }) }; }) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js index 79ef18ed..b87b8299 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js @@ -662,9 +662,10 @@ export const getWelfareSearchsForm = (form, condition, onChange = () => void (0) return onNoPaymentChange(type, v)} + disabled={runStatuses === "4,5"} />; }; - const { socialBase, fundBase, otherBase } = extraFormField; + const { socialBase, fundBase, otherBase, runStatuses } = extraFormField; const { isFormInit } = form; const formParams = form.getFormParams(); let group = []; @@ -695,22 +696,22 @@ export const getWelfareSearchsForm = (form, condition, onChange = () => void (0) if (cur.props.title === getLabel(543194, "社保基础信息") && _.every(socialBase.items, o => o.items.length > 0)) { return [...pre, cur, ]; + onSameChange={onSameChange} runStatuses={runStatuses}/>]; } else if (cur.props.title === getLabel(543197, "公积金基础信息") && _.every(fundBase.items, o => o.items.length > 0)) { return [...pre, cur, ]; + onSameChange={onSameChange} runStatuses={runStatuses}/>]; } else if (cur.props.title === getLabel(543198, "其他福利基础信息") && _.every(otherBase.items, o => o.items.length > 0)) { return [...pre, cur, ]; + onSameChange={onSameChange} runStatuses={runStatuses}/>]; } return [...pre, cur]; }, []); }; const BenefitBaseComponent = (props) => { - const { dataSource, value, onChange, onSameChange } = props; + const { dataSource, value, onChange, onSameChange, runStatuses } = props; return { _.map(dataSource, item => { @@ -723,12 +724,14 @@ const BenefitBaseComponent = (props) => { min={child.min !== "0.000" ? child.min : -999999999999999} max={child.max !== "0.000" ? child.max : 999999999999999} onChange={v => onChange(getKey(child), v)} + viewAttr={runStatuses === "4,5" ? 1 : 2} /> }))} customComponent={
{getLabel(543195, "各项福利基数一致")} - onSameChange(items, v)}/> + onSameChange(items, v)} + disabled={runStatuses === "4,5"}/>
} title={title} col={2} showGroup className="twoColumns-welfare-info-wrapper" />;