Browse Source

(*)导入人员信息, 人员编号判断

master
wuqun 2 years ago
parent
commit
8ae1c17d32
  1. 6
      web/client/src/sections/humanAffairs/containers/import-members-modal.js
  2. 3
      web/client/src/sections/humanAffairs/containers/personnelFiles.jsx

6
web/client/src/sections/humanAffairs/containers/import-members-modal.js

@ -238,9 +238,9 @@ const ImportMembersModal = props => {
error(`${i + 2}行人员编号为空,请填写`) error(`${i + 2}行人员编号为空,请填写`)
return return
} }
let xqExist = xqMembers.find(m => m.peopleCode == number); let xqExist = xqMembers.find(m => m.userCode == number);
if (!xqExist) { if (!xqExist) {
error(`${i + 2},项企中不存在该人员编号`) error(`${i + 2}的人员编号无对应的员工信息`)
return return
} }
if (postData.some(p => p.number == number)) {//人员编号 唯一 if (postData.some(p => p.number == number)) {//人员编号 唯一
@ -327,7 +327,7 @@ const ImportMembersModal = props => {
return return
} }
postData.push({//人员编号 待办todotodo 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, politicsStatus, phoneNumber, workPlace, graduatedFrom, educationBackground, specialty, graduationDate,
hiredate, turnProbationPeriod, regularDate, dimissionDate, experienceYear, occupationalHistory, hiredate, turnProbationPeriod, regularDate, dimissionDate, experienceYear, occupationalHistory,
del: false, number del: false, number

3
web/client/src/sections/humanAffairs/containers/personnelFiles.jsx

@ -31,6 +31,7 @@ const Rest = (props) => {
}, []) }, [])
function getMemberSearchList () {// function getMemberSearchList () {//
dispatch(humanAffairs.getMemberSearch())
dispatch(humanAffairs.getMemberList()).then((res) => {// dispatch(humanAffairs.getMemberList()).then((res) => {//
if (res.success) { if (res.success) {
console.log('res.success', res.payload.data); console.log('res.success', res.payload.data);
@ -145,7 +146,7 @@ const Rest = (props) => {
</div> </div>
<div style={{ display: 'flex', flexWrap: 'wrap', marginLeft: 30 }}> <div style={{ display: 'flex', flexWrap: 'wrap', marginLeft: 30 }}>
{ {
archivesList.map((item, index) => { archivesList?.rows?.map((item, index) => {
return ( return (
<div key={index} style={{ display: 'flex', width: 368, border: '1px solid #F9F9F9', boxShadow: '0px 0px 4px 1px rgba(0,0,0,0.08)', padding: 10, marginRight: 40, marginBottom: 20 }}> <div key={index} style={{ display: 'flex', width: 368, border: '1px solid #F9F9F9', boxShadow: '0px 0px 4px 1px rgba(0,0,0,0.08)', padding: 10, marginRight: 40, marginBottom: 20 }}>
<div style={{ width: 128, height: 192 }}> <div style={{ width: 128, height: 192 }}>

Loading…
Cancel
Save