浏览代码

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

sugangqiang 2 年之前
父节点
当前提交
fd6ac16e3b
共有 2 个文件被更改,包括 11 次插入3 次删除
  1. 4 1
      app/enterprise/api/TalentApi.php
  2. 7 2
      public/static/modular/gate/talentInfo/talentInfo.js

+ 4 - 1
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;
+
 /**
  * Description of TalentApi
  *
@@ -92,8 +93,10 @@ class TalentApi {
         $enterprise = \app\common\model\Enterprise::find(session("user")["uid"]);
         //DictApi::selectByParentCode($code);
         foreach ($list as $key => $item) {
+            $condition = TalentConditionApi::getOne($item["talent_condition"]);
             $list[$key]["talentArrangeName"] = isset($talentArangeList[$item["talent_arrange"]]) ? $talentArangeList[$item["talent_arrange"]] : "";
-            $list[$key]["identifyConditionText"] = TalentConditionApi::getOne($item["talent_condition"])["name"];
+            $list[$key]["identifyConditionText"] = $condition["name"];
+            $list[$key]["companyIds"] = $condition["companyIds"];
             $list[$key]["type"] = $enterprise["type"];
             $list[$key]["enterpriseTagName"] = $talentTagList[$enterprise["enterpriseTag"]];
         }

+ 7 - 2
public/static/modular/gate/talentInfo/talentInfo.js

@@ -45,7 +45,7 @@ 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){
+                switch (value) {
                     case 1:
                         return "<span class='label'>保存未提交</span>";
                         break;
@@ -62,7 +62,12 @@ TalentInfo.initColumn = function () {
                         return "<span class='label label-success'>待初审</span>";
                         break;
                     case 7:
-                        return "<span class='label label-success'>待复审</span>";
+                        console.log(row);
+                        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>";