From 02e754b8ebfc728b654a29fa8a88be403e77dbb1 Mon Sep 17 00:00:00 2001
From: deartibers <947466799@qq.com>
Date: Fri, 21 Oct 2022 17:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E8=81=8C=E5=B9=B4=E9=99=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/humanAffairs/containers/employeeInformation.jsx  | 2 +-
 .../src/sections/humanAffairs/containers/personnelFiles.jsx   | 4 ++--
 .../sections/humanAffairs/containers/personnelFilesDetail.jsx | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/client/src/sections/humanAffairs/containers/employeeInformation.jsx b/web/client/src/sections/humanAffairs/containers/employeeInformation.jsx
index 12c193a..d923548 100644
--- a/web/client/src/sections/humanAffairs/containers/employeeInformation.jsx
+++ b/web/client/src/sections/humanAffairs/containers/employeeInformation.jsx
@@ -380,7 +380,7 @@ const employeeInformation = (props) => {
                 key: "employmentLife",
                 sorter: (a, b) => { },
                 render: (_, r, index) => {
-                    return (r.hiredate ? <span style={{ color: '#1890FF' }}>{moment(new Date()).diff(r.hiredate, 'years') + '年'}</span> : '-')
+                    return (r.hiredate ? <span style={{ color: '#1890FF' }}>{String(moment(new Date()).diff(r.hiredate, 'years', true)).substring(0, 3) + '年'}</span> : '-')
                 },
             }, {
                 title: '试用期时间',
diff --git a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx
index 33379d3..56f6e6e 100644
--- a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx
+++ b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx
@@ -241,7 +241,7 @@ const Rest = (props) => {
                                                                 return (
                                                                     <div key={idx} style={{ display: 'flex', alignItems: 'center' }}>
                                                                         {idx == 0 ?
-                                                                            (ite.name.substring(0,6)) : ('')
+                                                                            (ite.name.substring(0, 6)) : ('')
                                                                         }
                                                                         {
                                                                             item.role.length > 1 && idx == 1 ? (
@@ -268,7 +268,7 @@ const Rest = (props) => {
                                                         <img src="/assets/images/hrImg/year.png" alt="" style={{ width: '100%', height: '100%' }} />
                                                     </div>
                                                     <div style={{ fontSize: 14, color: '#282828', marginLeft: 12, marginRight: 9 }}>
-                                                        {item.hiredate ? '入职' + moment(new Date()).diff(item.hiredate, 'years') + '年' : '暂无'}
+                                                        {item.hiredate ? '入职' + String(moment(new Date()).diff(item.hiredate, 'years', true)).substring(0, 3) + '年' : '暂无'}
                                                     </div>
                                                 </div>
                                                 <div style={{ color: 'rgba(0,0,0,0.65)', fontSize: 12 }}>
diff --git a/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx b/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx
index e3a6e13..825ba93 100644
--- a/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx
+++ b/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx
@@ -719,7 +719,7 @@ const Rest = (props) => {
                                             入职年限：
                                         </div>
                                         <div style={{ color: '#4A4A4A', fontSize: 13 }}>
-                                            {pepObj.hiredate ? moment(new Date()).diff(pepObj.hiredate, 'years') + '年' : '暂无'}
+                                            {pepObj.hiredate ? String(moment(new Date()).diff(pepObj.hiredate, 'years',true)).substring(0,3) + '年' : '暂无'}
                                         </div>
                                     </div>
                                     <div style={{ marginTop: 9, display: 'flex', width: '39.4%' }}>