Browse Source

(*)删除的员工再次导入,del改为false

master
wuqun 3 years ago
parent
commit
400d02eb10
  1. 5
      api/app/lib/controllers/member/index.js
  2. 2
      web/client/src/sections/humanAffairs/containers/import-members-modal.js

5
api/app/lib/controllers/member/index.js

@ -706,7 +706,7 @@ async function addMembersBulk (ctx) {
for (let i in editMembers) {
let { pepUserId, name, idNumber, gender, birthday, nativePlace, marital,
politicsStatus, phoneNumber, workPlace, graduatedFrom, educationBackground, specialty, graduationDate,
hiredate, turnProbationPeriod, regularDate, dimissionDate, experienceYear, occupationalHistory } = editMembers[i];
hiredate, turnProbationPeriod, regularDate, dimissionDate, experienceYear, occupationalHistory, del } = editMembers[i];
let dataToUpdate = {
name,
@ -727,7 +727,8 @@ async function addMembersBulk (ctx) {
regularDate,
dimissionDate,
experienceYear,
occupationalHistory
occupationalHistory,
del
}
await models.Member.update(dataToUpdate, { where: { pepUserId: pepUserId } });
}

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

@ -104,7 +104,7 @@ const ImportMembersModal = props => {
const workbook = XLSX.read(result, {
type: "binary",
cellDates: true,//设为true,将天数的时间戳转为时间格式
codepage: 936
codepage: 936//解决了乱码问题
});
let data = []; // 存储获取到的数据
// 遍历每张工作表进行读取(这里默认只读取第一张表)

Loading…
Cancel
Save