diff --git a/web/client/src/sections/humanAffairs/containers/import-members-modal.js b/web/client/src/sections/humanAffairs/containers/import-members-modal.js index 677e213..cf9a00c 100644 --- a/web/client/src/sections/humanAffairs/containers/import-members-modal.js +++ b/web/client/src/sections/humanAffairs/containers/import-members-modal.js @@ -238,9 +238,9 @@ const ImportMembersModal = props => { error(`第${i + 2}行人员编号为空,请填写`) return } - let xqExist = xqMembers.find(m => m.peopleCode == number); + let xqExist = xqMembers.find(m => m.userCode == number); if (!xqExist) { - error(`第${i + 2}行,项企中不存在该人员编号`) + error(`第${i + 2}行的人员编号无对应的员工信息`) return } if (postData.some(p => p.number == number)) {//人员编号 唯一 @@ -327,7 +327,7 @@ const ImportMembersModal = props => { return } postData.push({//人员编号 待办todotodo - pepUserId: xqExist.id, name, idNumber, gender, birthday, nativePlace, marital, + pepUserId: xqExist.pepUserId, name, idNumber, gender, birthday, nativePlace, marital, politicsStatus, phoneNumber, workPlace, graduatedFrom, educationBackground, specialty, graduationDate, hiredate, turnProbationPeriod, regularDate, dimissionDate, experienceYear, occupationalHistory, del: false, number diff --git a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx index 7017c5f..7b3754f 100644 --- a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx +++ b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx @@ -31,6 +31,7 @@ const Rest = (props) => { }, []) function getMemberSearchList () {//搜索项企用户 + dispatch(humanAffairs.getMemberSearch()) dispatch(humanAffairs.getMemberList()).then((res) => {//搜索项企用户 if (res.success) { console.log('res.success', res.payload.data); @@ -145,7 +146,7 @@ const Rest = (props) => {