diff --git a/web/client/src/sections/humanAffairs/components/personnelModal.jsx b/web/client/src/sections/humanAffairs/components/personnelModal.jsx index b8760bc..485e7b7 100644 --- a/web/client/src/sections/humanAffairs/components/personnelModal.jsx +++ b/web/client/src/sections/humanAffairs/components/personnelModal.jsx @@ -328,7 +328,7 @@ function pushModal (props) { label='籍贯:' showClear style={{ width: 184 }} - initValue={editObj?.nativePlace.split('-') || ""} + initValue={editObj?.nativePlace?.split('-') || ""} > @@ -371,7 +371,7 @@ function pushModal (props) { field='workPlace' label='工作地点:' showClear - initValue={editObj?.workPlace.split('-') || ""} + initValue={editObj?.workPlace?.split('-') || ""} style={{ width: 184 }} > diff --git a/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx b/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx index 2bc385d..ce73865 100644 --- a/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx +++ b/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx @@ -181,7 +181,7 @@ const Rest = (props) => { } } - console.log('textdate',textdate); + console.log('textdate', textdate); for (let l = 0; l < textdate.length; l++) { if (textdate[l].compensate == '调休') { showdate.push([textdate[l].time, textdate[l].num]) @@ -682,7 +682,7 @@ const Rest = (props) => { 试用期:
- {pepObj.regularDate ? moment(pepObj.regularDate).diff(pepObj.hiredate, 'months', true) + '个月' : '暂无'} + {pepObj.regularDate ? moment(pepObj.regularDate).diff(pepObj.hiredate, 'months', true).toFixed(1) + '个月' : '暂无'}
{ @@ -701,7 +701,7 @@ const Rest = (props) => {
-
+
他/她的历史工作经历与职务