积分认定

app/common/api/VerifyApi.php

@@ -961,7 +961,7 @@ class VerifyApi {
             $item["study_abroad"] = $study_abroad[$item["study_abroad"]];
             $item["source"] = $source[$item["source"]];
             $item["talent_arrange"] = $talent_arrange[$item["talent_arrange"]];
-            $item["talent_condition"] = $item["talentConditionName"];
+            $item["talent_condition"] = $item["checkState"] == TalentState::CERTIFICATED && !$item["talent_condition"] ? "积分认定" : $item["talentConditionName"];
 
             if (in_array("source_city", $exportFields)) {
                 $item["source_city"] = $un_common_location[$item["source_city"]];
@@ -1077,11 +1077,11 @@ class VerifyApi {
                         if ($log["active"] == 1) {
                             if ($log["new_state"] == 9) {
                                 $verifyDepts[$k] .= "（审核驳回）";
-                                $item["deptReject"] ++;
+                                $item["deptReject"]++;
                             }
                             if ($log["new_state"] == 12) {
                                 $verifyDepts[$k] .= "（审核通过）";
-                                $item["deptPass"] ++;
+                                $item["deptPass"]++;
                             }
                             $deptDescriptions[] = sprintf("%s：%s", $company["name"], $log["description"]);
                         } else {
@@ -1090,7 +1090,7 @@ class VerifyApi {
                                 continue;
                             }
                             $verifyDepts[$k] .= "（待审核）";
-                            $item["deptWait"] ++;
+                            $item["deptWait"]++;
                         }
                     }
                     $item["verifyDepts"] = implode(chr(10), $verifyDepts);

public/static/modular/talentIdentify/talentInfo/talentInfo_library.js

@@ -44,7 +44,14 @@ TalentInfo.initColumn = function () {
         },
         {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', width: '150px', 'class': 'uitd_showTip'},
         {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', width: '100px'},
-        {title: '认定条件', field: 'talentConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px'},
+        {title: '认定条件', field: 'talentConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px',
+            formatter: function (value, row, index) {
+                if (!row.talent_condition) {
+                    return "积分认定";
+                }
+                return value;
+            }
+        },
         {title: '人才证书有效期', field: 'identifyGetTime', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px',
             formatter: function (value, row, index) {
                 return row.certificateGetTime + "至" + row.certificateExpireTime;