Browse Source

问题修改

master
deartibers 2 years ago
parent
commit
560a2a2984
  1. 4
      web/client/src/sections/humanAffairs/components/personnelModal.jsx
  2. 6
      web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx

4
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('-') || ""}
>
</Form.Cascader>
</div>
@ -371,7 +371,7 @@ function pushModal (props) {
field='workPlace'
label='工作地点:'
showClear
initValue={editObj?.workPlace.split('-') || ""}
initValue={editObj?.workPlace?.split('-') || ""}
style={{ width: 184 }}
>
</Form.Cascader>

6
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) => {
试用期
</div>
<div style={{ color: '#4A4A4A', fontSize: 13 }}>
{pepObj.regularDate ? moment(pepObj.regularDate).diff(pepObj.hiredate, 'months', true) + '个月' : '暂无'}
{pepObj.regularDate ? moment(pepObj.regularDate).diff(pepObj.hiredate, 'months', true).toFixed(1) + '个月' : '暂无'}
</div>
</div>
{
@ -701,7 +701,7 @@ const Rest = (props) => {
</div>
</div>
<div style={{ borderRight: '1px solid #DCDEE0', margin: '-16px 0px -20px 0px' }}></div>
<div style={{ marginLeft: 30, marginTop: 8, paddingRight: 30 }}>
<div style={{ marginLeft: 30, marginTop: 8, paddingRight: 30, width: '38%' }}>
<div style={{ color: '#4A4A4A', fontSize: 14 }}>
/她的历史工作经历与职务
</div>

Loading…
Cancel
Save