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

app/enterprise/api/TalentApi.php

@@ -4,7 +4,7 @@ namespace app\enterprise\api;
 
 use app\enterprise\model\Talent;
 use app\common\api\DictApi;
-
+use app\common\api\TalentConditionApi;
 /**
  * Description of TalentApi
  *
@@ -39,7 +39,7 @@ class TalentApi {
         $nationality = trim($request->param("nationality"));
         $talentArrange = trim($request->param("talent_arrange"));
         $checkState = trim($request->param("checkState"));
-
+        $type = session("user")["type"];
         $where = [];
         $where[] = ["delete", "=", 0];
         if (session("user")["usertype"] == 2) {
@@ -87,13 +87,15 @@ class TalentApi {
         }
         $count = Talent::where($where)->count();
         $list = Talent::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
-        $talentTypeList = DictApi::selectByParentCode("enterprise_tag"); //人才标签
+        $talentTagList = DictApi::selectByParentCode("enterprise_tag"); //单位标签
         $talentArangeList = DictApi::selectByParentCode("talent_arrange"); //人才层次
-        //$talentTypeNameList = DictApi::selectByParentCode("un_talentLevel");//认定条件
+        $enterprise = \app\common\model\Enterprise::find(session("user")["uid"]);
         //DictApi::selectByParentCode($code);
         foreach ($list as $key => $item) {
             $list[$key]["talentArrangeName"] = isset($talentArangeList[$item["talent_arrange"]]) ? $talentArangeList[$item["talent_arrange"]] : "";
-            $list[$key]["identifyConditionText"] = "";
+            $list[$key]["identifyConditionText"] = TalentConditionApi::getOne($item["talent_condition"])["name"];
+            $list[$key]["type"] = $enterprise["type"];
+            $list[$key]["enterpriseTagName"] = $talentTagList[$enterprise["enterpriseTag"]];
         }
         return ["total" => $count, "rows" => $list];
     }

app/enterprise/controller/Talent.php

@@ -273,6 +273,7 @@ class Talent extends EnterpriseController {
 
             $data["id"] = $id;
             $data["checkState"] = $change_state;
+            $data["first_submit_time"] = date("Y-m-d H:i:s");
             $data["active"] = 1;
             TalentModel::update($data);
             TalentLogApi::write(1, $id, $change_state, "提交基础判定材料待审核", 1);
@@ -282,6 +283,7 @@ class Talent extends EnterpriseController {
             $data["id"] = $id;
             $data["checkState"] = $change_state;
             $data["active"] = 1;
+            $data["new_submit_time"] = date("Y-m-d H:i:s");
             TalentModel::update($data);
             TalentLogApi::write(1, $id, $change_state, "确认提交审核", 1);
             return json(["code" => 200, "msg" => "提交成功"]);

app/enterprise/view/talent/index.html

@@ -76,7 +76,7 @@
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
                                         <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            人才标签
+                                            单位标签
                                         </button>
                                     </div>
                                     <select class="form-control" id="enterprise_tag">

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

@@ -18,7 +18,7 @@ TalentInfo.initColumn = function () {
     }
     return [
         {field: 'selectItem', radio: true},
-        {title: '申报年度', field: 'year', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '申报年度', field: 'apply_year', visible: true, align: 'center', valign: 'middle', width: '80px'},
         {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
                 if (row.sex == 1) {
@@ -40,29 +40,39 @@ TalentInfo.initColumn = function () {
             }
         },
         {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px", },
-        {title: '人才标签', field: 'talentTypeName', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},
-        {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
+        {title: '单位标签', field: 'enterpriseTagName', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},
+        {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
-        {title: '认定条件名称', field: 'identifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
-        {title: '认定条件证书取得时间', field: 'identifyGetTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
-                if (value == 1) {
-                    return "<span class='label'>待提交</span>"
-                } else if (value == 10 || value == 5) {
-                    return "<span class='label label-danger'>已驳回</span>"
-                } else {
-                    if (row.isPublic >= 5) {
-                        if (value == -1) {
-                            return "<span class='label label-danger'>审核不通过</span>"
-                        } else if (value == 35) {
-                            return "<span class='label label-primary'>认定通过</span>"
-                        } else {
-                            return "<span class='label label-success'>审核中</span>"
-                        }
-                    } else {
-                        return "<span class='label label-success'>审核中</span>"
-                    }
+                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:
+                        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;
                 }
             }
         },