Signed-off-by: sugangqiang <sugangqiang@foxmail.com>

app/enterprise/api/TalentApi.php

@@ -5,6 +5,7 @@ namespace app\enterprise\api;
 use app\enterprise\model\Talent;
 use app\common\api\DictApi;
 use app\common\api\TalentConditionApi;
+use app\common\api\TalentLogApi;
 
 /**
  * Description of TalentApi
@@ -99,6 +100,8 @@ class TalentApi {
             $list[$key]["companyIds"] = $condition["companyIds"];
             $list[$key]["type"] = $enterprise["type"];
             $list[$key]["enterpriseTagName"] = $talentTagList[$enterprise["enterpriseTag"]];
+            $last_log = TalentLogApi::getLastLog($item["id"], 1);
+            $list[$key]["real_state"] = $last_log["state"];
         }
         return ["total" => $count, "rows" => $list];
     }

public/static/modular/gate/talentInfo/talentInfo.js

@@ -45,39 +45,56 @@ TalentInfo.initColumn = function () {
         {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
-                switch (value) {
-                    case 1:
-                        return "<span class='label'>保存未提交</span>";
-                        break;
-                    case 2:
-                        return "<span class='label label-success'>待审核</span>";
-                        break;
-                    case 3:
-                        return "<span class='label'>待详细填报</span>";
-                        break;
-                    case 5:
-                        return "<span class='label'>保存未提交(II)</span>";
-                        break;
-                    case 6:
-                        return "<span class='label label-success'>待初审</span>";
-                        break;
-                    case 7:
-                        console.log(row);
-                        if (row.companyIds) {
-                            return "<span class='label label-success'>待部门审核</span>";
-                        } else {
+                if (row.real_state != row.checkState) {
+                    switch (row.real_state) {
+                        case 4:
+                            return "<span class='label label-danger'>预审驳回</span>";
+                            break;
+                        case 8:
+                            return "<span class='label label-danger'>初审驳回</span>";
+                            break;
+                        case 10:
+                            return "<span class='label label-danger'>部门驳回</span>";
+                            break;
+                        case 12:
+                            return "<span class='label label-danger'>复审驳回</span>";
+                            break;
+
+                    }
+                } else {
+                    switch (value) {
+                        case 1:
+                            return "<span class='label'>保存未提交</span>";
+                            break;
+                        case 2:
+                            return "<span class='label label-success'>待审核</span>";
+                            break;
+                        case 3:
+                            return "<span class='label'>待详细填报</span>";
+                            break;
+                        case 5:
+                            return "<span class='label'>保存未提交(II)</span>";
+                            break;
+                        case 6:
+                            return "<span class='label label-success'>待初审</span>";
+                            break;
+                        case 7:
+                            if (row.companyIds) {
+                                return "<span class='label label-success'>待部门审核</span>";
+                            } else {
+                                return "<span class='label label-success'>待复审</span>";
+                            }
+                            break;
+                        case 9:
                             return "<span class='label label-success'>待复审</span>";
-                        }
-                        break;
-                    case 9:
-                        return "<span class='label label-success'>待复审</span>";
-                        break;
-                    case 11:
-                        return "<span class='label label-primary'>认定通过</span>";
-                        break;
-                    case 13:
-                        return "<span class='label label-danger'>复审失败</span>";
-                        break;
+                            break;
+                        case 11:
+                            return "<span class='label label-primary'>认定通过</span>";
+                            break;
+                        case 13:
+                            return "<span class='label label-danger'>复审失败</span>";
+                            break;
+                    }
                 }
             }
         },