From 8c061711903a2df4469def091864793ce2bfa8e7 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, 14 Dec 2023 09:54:27 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.10.2312.02-=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E5=9F=BA=E6=95=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../socialSecurityBenefits/welfareArchive/config.js  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
index 641b282e..162a6af1 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
@@ -696,8 +696,8 @@ 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,
-        <BenefitBaseComponent dataSource={socialBase.items} value={payload} onChange={onExtraChange}
-                              onSameChange={onSameChange} runStatuses={runStatuses}/>];
+        <BenefitBaseComponent dataSource={socialBase.items} dataSourceCom={socialBase.comItems} value={payload}
+                              onChange={onExtraChange} onSameChange={onSameChange} runStatuses={runStatuses}/>];
     } else if (cur.props.title === getLabel(543197, "公积金基础信息") && _.every(fundBase.items, o => o.items.length > 0)) {
       return [...pre, cur,
         <BenefitBaseComponent dataSource={fundBase.items} value={payload} onChange={onExtraChange}
@@ -712,7 +712,13 @@ export const getWelfareSearchsForm = (form, condition, onChange = () => void (0)
 };
 
 const BenefitBaseComponent = (props) => {
-  const { dataSource, value, onChange, onSameChange, runStatuses } = props;
+  const { dataSource, dataSourceCom, value, onChange, onSameChange, runStatuses } = props;
+  const [comFields] = dataSourceCom || [];
+  const list = !_.isNil(comFields) ? _.map(dataSource, o => ({
+    ...o,
+    items: [...o.items, ...comFields.items]
+  })) : dataSource;
+  console.log(list);
   return <React.Fragment>
     {
       _.map(dataSource, item => {