Эх сурвалжийг харах

津补贴修改(考勤天数判断,津补贴交叉判断)

sugangqiang 1 жил өмнө
parent
commit
b08bcb9e15

+ 1 - 1
app/admin/controller/TalentAllowance.php

@@ -1328,7 +1328,7 @@ class TalentAllowance extends AdminController {
                 $set = $tmp;
             }
         }
-        if ($info["recommendAllowanceType"] == 1 && (!$set || count($set) < 6)) {
+        if ($info["recommendAllowanceType"] == 1 && (!$set || count($set) < 6) && in_array($sort, ["①", "②", "③"])) {
             $info["recommendAllowanceType"] = 2;
             $info["recommendAllowanceMsg"] = $info["recommendAllowanceMsg"] . $sort . $name . "不足6个月,无法享受工作津贴(×)";
         }

+ 1 - 1
app/common/api/TalentAllowanceApi.php

@@ -324,7 +324,7 @@ class TalentAllowanceApi {
                 $set = $tmp;
             }
         }
-        if ($info["recommendAllowanceType"] == 1 && (!$set || count($set) < 6)) {
+        if ($info["recommendAllowanceType"] == 1 && (!$set || count($set) < 6) && in_array($sort, ["①", "②", "③"])) {
             $info["recommendAllowanceType"] = 2;
             $info["recommendAllowanceMsg"][] = $sort . $name . "不足6个月,无法享受工作津贴(×)";
         }

+ 1 - 0
public/static/modular/gate/talentAllowance/common/talentAllowance_info.js

@@ -366,6 +366,7 @@ TalentAllowanceInfoDlg.saveProjectData = function (id, project, allowanceType) {
             if (isNaN(days)) {
                 error = error + num + "月的考勤天数不是数字;";
             } else {
+                days = parseInt(days);
                 if (days < 0 || days > max) {
                     error = error + num + "月的考勤天数不在范围内(1-" + max + ");";
                 }