free-sun
/
HumanResource
18
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

(fixed)7628 评级时间显示与导入模板不一致

master
周沫沫历险记 2 years ago
parent
320a2251fc
commit
b5832953ce
1 changed files with 6 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      web/client/src/sections/humanAffairs/components/importPositionRating.jsx

11
web/client/src/sections/humanAffairs/components/importPositionRating.jsx
View File

@ -89,7 +89,8 @@ const ImportPositionRatingModal = props => {
//如2020/8/1，xlsx会解析成 Fri Jul 31 2020 23:59:17 GMT+0800 小了43秒
let a = new Date(v);
a.setTime(a.getTime() + 43 * 1000);
return a.getFullYear() + '-' + a.getMonth() + '-' + a.getDay();
return a;
// return a.getFullYear() + '-' + a.getMonth() + '-' + a.getDay();
}
return (
@ -162,7 +163,7 @@ const ImportPositionRatingModal = props => {
}
else if (["theoryPassed", "totalRatingPassed"].includes(item)) {
if (!["是", "否"].includes(obj[item])) {
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合法，请修改`;
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合规，请修改`;
break;
} else {
obj[item] = "是" == obj[item] ? true : false;
@ -175,17 +176,17 @@ const ImportPositionRatingModal = props => {
}
else {
if (!obj.ratingTime.toString().match(/^(\d{1,4})(-|.|\/)(\d{1,2})\2(\d{1,2})$/)) {
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合法，请将单元格更改为时间格式`;
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合规，请将单元格更改为时间格式`;
break;
}
}
} else {
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合法，请修改`;
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合规，请修改`;
break;
}
} else if (["theoryBasicScore", "totalScore"].includes(item)) {
if (isNaN(obj[item])) {
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合法，请修改`;
errmsg = `第${i + 2}行【${IMPORT_FIELD[item].label}】不合规，请修改`;
break;
}
}

Write Preview
Loading…
Cancel
Save