From 5d9154b36dcfe7f7ef4ae121df05bbbf483a3082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 21 Aug 2023 11:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=89=BE=E5=BF=97=E5=B7=A5=E4=B8=9A-=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E5=88=86=E7=B1=BB=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/salaryFile/saralyFileViewSlide.js          | 12 +++++++++++-
 .../socialSecurityBenefits/archives/baseForm.js      |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
index 32a53167..0837dfa9 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
@@ -47,6 +47,15 @@ const baseInfolist = [
         value: "taxAgent"
       }
     ]
+  },
+  {
+    id: 3,
+    items: [
+      {
+        label: "人员分类",
+        value: "ryfl"
+      }
+    ]
   }
 ];
 
@@ -115,7 +124,8 @@ export default class SalaryFileViewSlide extends React.Component {
                       const { label, value } = it;
                       return <React.Fragment>
                         <th className="descriptions-label">{label}</th>
-                        <td className="descriptions-value">{baseInfo && baseInfo["employee"][value]}</td>
+                        <td className="descriptions-value"
+                            colSpan={items.length === 1 ? 5 : 1}>{baseInfo && baseInfo["employee"][value]}</td>
                       </React.Fragment>;
                     })
                   }
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
index daaf7f03..44c6256c 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
@@ -13,7 +13,7 @@ export default class BaseForm extends React.Component {
 
   render() {
     const { archivesStore: { baseFormData }, record } = this.props;
-    const { username, department, position, telephone, hiredate, dimissionDate } = baseFormData;
+    const { username, department, position, telephone, hiredate, dimissionDate, ryfl } = baseFormData;
     const { paymentOrganizationName } = record;
     const baseItems = [
       { com: Input("姓名", username) },
@@ -21,6 +21,7 @@ export default class BaseForm extends React.Component {
       { com: Input("岗位", position) },
       { com: Input("手机号", telephone) },
       { com: Input("入职日期", hiredate) },
+      { com: Input("人员分类", ryfl) }
       // { com: Input("合同到期日期", dimissionDate) }
     ];
     const taxagentItems = [