From b5832953ce04f346d8b5449eedb813f2f12d4d6d Mon Sep 17 00:00:00 2001
From: zhouxin <zhou.xin@free-sun.com.cn>
Date: Fri, 30 Dec 2022 16:51:06 +0800
Subject: [PATCH] =?UTF-8?q?(fixed)7628=20=E8=AF=84=E7=BA=A7=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=AF=BC=E5=85=A5=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../humanAffairs/components/importPositionRating.jsx  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/client/src/sections/humanAffairs/components/importPositionRating.jsx b/web/client/src/sections/humanAffairs/components/importPositionRating.jsx
index 7c5f93f..c186d40 100644
--- a/web/client/src/sections/humanAffairs/components/importPositionRating.jsx
+++ b/web/client/src/sections/humanAffairs/components/importPositionRating.jsx
@@ -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;
                                             }
                                         }