先提交一下

app/admin/controller/Talent.php

@@ -775,7 +775,7 @@ class Talent extends AdminController {
                 $roleIds = SysRelation::where($where)->group("roleid")->having("count(*)=" . count($privs))->column("roleid");
                 $where = [];
                 $where[] = ["status", "=", 1];
-                $where[] = ["companyId","in",$unpass_companyIds];
+                $where[] = ["companyId", "in", $unpass_companyIds];
                 $where[] = ["roleid", "in", $roleIds];
                 $where[] = ["roleid", "<>", 1];
                 $userIds = User::where($where)->column("id");

app/admin/view/talent/dept_verify.html

@@ -110,6 +110,7 @@
                                     <select class="form-control" id="checkState">
                                         <option value="">---请选择---</option>
                                         <option value="1">待审核</option>
+                                        <option value="5">已审核</option>
                                     </select>
                                 </div>                            
                             </div>

app/admin/view/talent/talentInfo_base_check.html

@@ -189,7 +189,7 @@
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <label class=" control-label spacing td-label">人才类型说明</label>
                                                     <div class="word-wrap" id="typeTips">
                                                         {switch name="info.talent_type"}
                                                         {case value="1"}含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
@@ -223,6 +223,12 @@
                                                         <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
                                                     </div>
                                                 </td>
+                                                <td id="come_in_jin_str">
+                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                    <div class="word-wrap">
+                                                        如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
+                                                    </div>
+                                                </td>
                                             </tr> 
                                             {/if}
                                             {/if}

app/admin/view/talent/talentInfo_common_check.html

@@ -46,6 +46,20 @@
         word-wrap:break-word;
         word-break:break-all;
     }
+    .control-symbol{
+        display: inline-block;
+        position:absolute;
+        right:0;
+        top:50%;
+        font-style:normal;
+        margin-top: -16px;
+        height:32px;
+        width:32px;
+        line-height:32px;
+        text-align:center;
+        border-left:1px solid #ddd;
+    }
+    #annual_salary{padding-right:32px;}
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -196,7 +210,7 @@
                                             </td>
                                             <td>
                                                 <div class="rowGroup">
-                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <label class=" control-label spacing td-label">人才类型说明</label>
                                                     <div class="word-wrap" id="typeTips">                                                    
                                                         {switch name="info.talent_type"}
                                                         {case value="1"}含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
@@ -211,9 +225,11 @@
                                         <tr>
                                             <td>
                                                 <div class="rowGroup ">
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 1"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 2"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
                                                     <input type="text" class="form-control" value="{$info.tax_insurance_month}" id="tax_insurance_month"/>
                                                 </div>
+                                            </td>
+                                            <td>
                                                 <div class="rowGroup">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
                                                     <input type="text" class="form-control" value="{$info.labor_contract_rangetime}" id="labor_contract_rangetime"/>
@@ -228,6 +244,14 @@
                                                     <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
                                                 </div>
                                             </td>
+                                            {if condition="$info['talent_type'] eq 1"}
+                                            <td id="come_in_jin_str">
+                                                <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                <div class="word-wrap">
+                                                    如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
+                                                </div>
+                                            </td>
+                                            {/if}
                                         </tr>
                                         {/if}
                                         {/if}
@@ -478,16 +502,21 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan="3" style="overflow: inherit">
+                                            <td colspan="2" style="overflow: inherit">
                                                 <div class="rowGroup col-sm-9">
                                                     <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                     <select class="form-control" id="talent_condition">
                                                         <option value="{$info.talent_condition}">{$info.talentConditionName}</option>
                                                     </select>
                                                 </div>
-                                                <div class="rowGroup col-sm-12" {if condition='!$info["annual_salary"]'}style="display:none;"{/if}>
-                                                    <label class="control-label spacing"><span style="color: red">*</span>年薪</label>
-                                                    <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$info.annual_salary}"/>
+                                            </td>
+                                            <td {if condition='!$info["annual_salary"]'}style="display:none;"{/if}>
+                                                <div class="rowGroup col-sm-12">
+                                                    <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪（元）</label>
+                                                    <div style="position:relative;">
+                                                        <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$info.annual_salary}"/>
+                                                        <i class="control-symbol">元</i>
+                                                    </div>
                                                 </div>
                                             </td>
                                         </tr>
@@ -519,7 +548,7 @@
                                             </td>
                                             <td>
                                                 <div class="rowGroup">
-                                                    <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                    <label class="control-label spacing"><span style="color: red">*</span>个人银行账号</label>
                                                     <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$info.bank_account}"/>
                                                 </div>
                                             </td>

app/common/api/ChuanglanSmsApi.php

@@ -2,17 +2,15 @@
 
 namespace app\common\api;
 
-class ChuanglanSmsApi{
-    //参数的配置请登录zz.253.com获取以下API信息↓↓↓↓↓↓↓
-    const API_SEND_URL='http://smssh1.253.com/msg/send/json'; //创蓝发送短信接口URL
-
+class ChuanglanSmsApi {
 
+    //参数的配置请登录zz.253.com获取以下API信息↓↓↓↓↓↓↓
+    const API_SEND_URL = 'http://smssh1.253.com/msg/send/json'; //创蓝发送短信接口URL
     const API_ACCOUNT = 'N7450217'; //创蓝API账号
-    const API_PASSWORD = 'wS5gE4GQszb46f';//创蓝API密码
+    const API_PASSWORD = 'wS5gE4GQszb46f'; //创蓝API密码
 
     private $verification;
 
-
     /**
      * 发送短信
      *
@@ -20,21 +18,23 @@ class ChuanglanSmsApi{
      * @param string $msg 			短信内容
      * @param string $needstatus 	是否需要状态报告
      */
-    public function sendSMS( $mobile, $msg, $needstatus = 'true') {
+    public function sendSMS($mobile, $msg, $needstatus = 'true') {
 
         //创蓝接口参数
-        $postArr = array (
-            'account'  =>  self::API_ACCOUNT,
+        $postArr = array(
+            'account' => self::API_ACCOUNT,
             'password' => self::API_PASSWORD,
             'msg' => urlencode($msg),
             'phone' => $mobile,
             'report' => $needstatus,
         );
-        $result = $this->curlPost( self::API_SEND_URL, $postArr);
+        $deny_list = ["jjrcw.test"]; //拒绝短信名单
+        if (in_array($_SERVER["HTTP_HOST"], $deny_list))
+            return false; //测试不发送信息
+        $result = $this->curlPost(self::API_SEND_URL, $postArr);
         return $result;
     }
 
-
     /**
      * 通过CURL发送HTTP请求
      * @param string $url  //请求URL
@@ -42,33 +42,34 @@ class ChuanglanSmsApi{
      * @return mixed
      *
      */
-    private function curlPost($url,$postFields){
+    private function curlPost($url, $postFields) {
         $postFields = json_encode($postFields);
-        $ch = curl_init ();
-        curl_setopt( $ch, CURLOPT_URL, $url );
-        curl_setopt( $ch, CURLOPT_HTTPHEADER, array(
-                'Content-Type: application/json; charset=utf-8'   //json版本需要填写  Content-Type: application/json;
-            )
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+            'Content-Type: application/json; charset=utf-8'   //json版本需要填写  Content-Type: application/json;
+                )
         );
         curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); //若果报错 name lookup timed out 报错时添加这一行代码
-        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-        curl_setopt( $ch, CURLOPT_POST, 1 );
-        curl_setopt( $ch, CURLOPT_POSTFIELDS, $postFields);
-        curl_setopt( $ch, CURLOPT_TIMEOUT,60);
-        curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, 0);
-        $ret = curl_exec ( $ch );
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 60);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+        $ret = curl_exec($ch);
         if (false == $ret) {
-            $result = curl_error(  $ch);
+            $result = curl_error($ch);
         } else {
-            $rsp = curl_getinfo( $ch, CURLINFO_HTTP_CODE);
+            $rsp = curl_getinfo($ch, CURLINFO_HTTP_CODE);
             if (200 != $rsp) {
-                $result = "请求状态 ". $rsp . " " . curl_error($ch);
+                $result = "请求状态 " . $rsp . " " . curl_error($ch);
             } else {
                 $result = $ret;
             }
         }
-        curl_close ( $ch );
+        curl_close($ch);
         return $result;
     }
+
 }

app/common/api/DictApi.php

@@ -189,7 +189,7 @@ class DictApi {
             "fujian_highcert_exptime" => "福建省高层次人才证书有效期",
             "quanzhou_highcert_pubtime" => "泉州高层次人才证书发证日期",
             "quanzhou_highcert_exptime" => "泉州高层次人才证书有效期",
-            "annual_salary" => "年薪"
+            "annual_salary" => "上一年度年薪（元）"
         ];
         if ($step == 1) {
             return $dict1;

app/common/api/TalentLogApi.php

@@ -45,6 +45,16 @@ class TalentLogApi {
         return $last_log;
     }
 
+    public static function getCompanyNewestCheckedLog($mainId, $companyId) {
+        $where = [];
+        $where[] = ["mainId", "=", $mainId];
+        $where[] = ["step", "=", 3];
+        $where[] = ["companyId", "=", $companyId];
+        $where[] = ["active", "=", 1];
+        $one = TalentLog::where($where)->order("createTime desc")->findOrEmpty();
+        return $one;
+    }
+
     public static function getLogByCompanyId($mainId, $companyId, $fst_dept_check_time) {
         $where = [];
         $where[] = ["mainId", "=", $mainId];

app/common/api/VerifyApi.php

@@ -112,6 +112,8 @@ class VerifyApi {
         foreach ($list as &$item) {
             $item["talent_type"] = $item["enterprise_type"] == 1 ? "晋江优秀人才" : "集成电路优秀人才";
             $item["enterprise_tag"] = $enterprise_tag_kvs[$item["enterpriseTag"]];
+            $lastCheckLog = TalentLogApi::getCompanyNewestCheckedLog($item["id"], $companyId);
+            $item["deptCheckState"] = $lastCheckLog["new_state"];
         }unset($item);
         return ["total" => $count, "rows" => $list];
     }
@@ -238,6 +240,19 @@ class VerifyApi {
         $process = $params["process"];
         if ($process == 3) {
             switch ($params["checkState"]) {
+                case 5:
+                    $_where = [];
+                    $_where[] = ["type", "=", 1];
+                    $_where[] = ["active", "=", 1];
+                    $_where[] = ["companyId", "=", session("user")["companyId"]];
+                    $mainIds = \app\common\model\TalentChecklog::where($_where)->group("mainId")->order("createTime desc")->column("mainId");
+                    if ($mainIds) {
+                        $where[] = ["ti.id", "in", $mainIds];
+                    } else {
+                        $where[] = ["ti.checkState", "=", 7];
+                        $where[] = ["ti.pass_dept_check", "=", 0];
+                    }
+                    break;
                 default:
                     $where[] = ["ti.checkState", "=", 7];
                     $where[] = ["ti.pass_dept_check", "=", 0];

app/common/controller/Api.php

@@ -150,10 +150,14 @@ class Api extends BaseController {
                         $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
                     } else if (in_array($item["state"], [TalentState::FST_SAVE])) {
                         $new_item["stateName"] = '<span class="label">保存未提交</span>';
-                    } else if($item["state"] == 0){
+                    } else if ($item["state"] == 0) {
                         $new_item["stateName"] = '<span class="label">添加附件</span>';
-                    }else {
-                        $new_item["stateName"] = '<span class="label label-success">待审核</span>';
+                    } else {
+                        if (($item["last_state"] == 4 && $item["state"] == 2) || ($item["last_state"] == 8 && $item["state"] == 6)) {
+                            $new_item["stateName"] = '<span class="label label-success">待审核（重新提交）</span>';
+                        } else {
+                            $new_item["stateName"] = '<span class="label label-success">待审核</span>';
+                        }
                     }
                     if ($item["step"] == 3) {
                         $company = CompanyApi::getOne($item["companyId"]);

app/enterprise/api/TalentApi.php

@@ -123,6 +123,7 @@ class TalentApi {
                 $list[$key]["enterpriseTagName"] = $talentTagList[$enterprise["enterpriseTag"]];
                 $last_log = TalentLogApi::getLastLog($item["id"], 1);
                 $list[$key]["real_state"] = $last_log["state"];
+                $list[$key]["last_state"] = $last_log["last_state"];
             }
             return ["total" => $count, "rows" => $list];
         }

app/enterprise/controller/Base.php

@@ -75,15 +75,20 @@ class Base extends EnterpriseController {
 
     // 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
     public function submit() {
-        $checkState = $info["checkState"];
+        $param = $this->request->param();
+        $id = $param["id"];
+        $info = self::chkIsOwner($id, $this->user["uid"]);
+        $checkState = $info["checkState"] ?: 0;
         if ($checkState == TalentState::FST_SAVE || $checkState == 0) {
-            $param = $this->request->param();
-            $id = $param["id"];
-            $info = self::chkIsOwner($id, $this->user["uid"]);
 
             $filed_dict = \app\common\api\DictApi::getTalentFields(1);
             $no_empty = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "county", "nation", "politics", "experience", "education"];
 
+            $birthday = $param["birthday"];
+            $birthdayYear = substr($birthday, 0, 4);
+            $currentYear = date("Y");
+            $age = $currentYear - $birthdayYear;
+
             if (in_array($param["talent_type"], [1, 2])) {
                 $no_empty[] = "tax_insurance_month";
                 $no_empty[] = "labor_contract_rangetime";
@@ -115,11 +120,18 @@ class Base extends EnterpriseController {
             $ft_ids = [];
             foreach ($filetypes as $ft) {
                 if ($ft["option"]) {
-                    $selectVal = $info[$ft["rel"]];
-                    $conditions = array_filter(explode(",", $ft["option"]));
-                    if (!in_array($selectVal, $conditions)) {
-                        $deletes[] = $ft["id"];
-                        continue;
+                    if ($ft["rel"] == "birthday") {
+                        if ($age < $ft["option"]) {
+                            $deletes[] = $ft["id"];
+                            continue;
+                        }
+                    } else {
+                        $selectVal = $param[$ft["rel"]];
+                        $conditions = array_filter(explode(",", $ft["option"]));
+                        if (!in_array($selectVal, $conditions)) {
+                            $deletes[] = $ft["id"];
+                            continue;
+                        }
                     }
                 }
                 $ft_ids[] = $ft["id"];
@@ -206,17 +218,28 @@ class Base extends EnterpriseController {
             $where[] = ["active", "=", 1];
             $where[] = ["delete", "=", 0];
             $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
-
+            
+            $birthday = $param["birthday"];
+            $birthdayYear = substr($birthday, 0, 4);
+            $currentYear = date("Y");
+            $age = $currentYear - $birthdayYear;
 
             $ft_ids = [];
             $deletes = [];
             foreach ($filetypes as $ft) {
                 if ($ft["option"]) {
-                    $selectVal = $param[$ft["rel"]];
-                    $conditions = array_filter(explode(",", $ft["option"]));
-                    if (!in_array($selectVal, $conditions)) {
-                        $deletes[] = $ft["id"];
-                        continue;
+                    if ($ft["rel"] == "birthday") {
+                        if ($age < $ft["option"]) {
+                            $deletes[] = $ft["id"];
+                            continue;
+                        }
+                    } else {
+                        $selectVal = $param[$ft["rel"]];
+                        $conditions = array_filter(explode(",", $ft["option"]));
+                        if (!in_array($selectVal, $conditions)) {
+                            $deletes[] = $ft["id"];
+                            continue;
+                        }
                     }
                 }
                 $ft_ids[] = $ft["id"];

app/enterprise/view/base/first.html

@@ -228,7 +228,7 @@
                                                     </div>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <label class=" control-label spacing td-label">人才类型说明</label>
                                                     <div class="word-wrap" id="typeTips">
 
                                                     </div>
@@ -271,7 +271,7 @@
                                                     </div>
                                                 </td>
                                                 <td id="come_in_jin_str">
-                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
                                                     <div class="word-wrap">
                                                         如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
                                                     </div>

app/enterprise/view/base/view.html

@@ -137,7 +137,7 @@
                                                         </select>
                                                     </div>
                                                     <div class="rowGroup col-sm-9" id="tipsBlock">
-                                                        <label class=" control-label spacing">说明</label>
+                                                        <label class=" control-label spacing">人才类型说明</label>
                                                         {switch name="row.talent_type"}
                                                         {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
                                                         {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}

app/enterprise/view/talent/second.html

@@ -49,6 +49,20 @@
     ul{
         padding: 0;
     }
+    .control-symbol{
+        display: inline-block;
+        position:absolute;
+        right:0;
+        top:50%;
+        font-style:normal;
+        margin-top: -16px;
+        height:32px;
+        width:32px;
+        line-height:32px;
+        text-align:center;
+        border-left:1px solid #ddd;
+    }
+    #annual_salary{padding-right:32px;}
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -195,7 +209,7 @@
                                         </td>
                                         <td>
                                             <div class="rowGroup">
-                                                <label class=" control-label spacing td-label">说明</label>
+                                                <label class=" control-label spacing td-label">人才类型说明</label>
                                                 <div class="word-wrap" id="typeTips">                                                    
                                                 {switch name="row.talent_type"}
                                                 {case value="1"}含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
@@ -210,9 +224,11 @@
                                         <tr>
                                             <td>
                                                 <div class="rowGroup ">
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 1"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 2"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
                                                     <input type="text" class="form-control" value="{$row.tax_insurance_month}"  readonly disabled id="tax_insurance_month"/>
                                                 </div>
+                                            </td>
+                                            <td>
                                                 <div class="rowGroup">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
                                                     <input type="text" class="form-control" value="{$row.labor_contract_rangetime}"  readonly disabled id="labor_contract_rangetime"/>
@@ -227,6 +243,14 @@
                                                     <input type="text" class="form-control date" id="fst_work_time" value="{$row.fst_work_time}"  readonly disabled/>
                                                 </div>
                                             </td>
+                                            {if condition="$row['talent_type'] eq 1"}
+                                                <td id="come_in_jin_str">
+                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                    <div class="word-wrap">
+                                                        如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
+                                                    </div>
+                                                </td>
+                                            {/if}
                                         </tr>
                                         {/if}
                                     {/if}
@@ -469,14 +493,19 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td colspan="3" style="overflow: inherit">
+                                        <td colspan="2" style="overflow: inherit">
                                             <div class="rowGroup col-sm-9">
                                                 <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                 <select class="chosen" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.getIdentifyNeedsFileTypes()" value="{$row.talent_condition}" style="width: 80%"></select>
                                             </div>
-                                            <div class="rowGroup col-sm-12" {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
-                                                <label class="control-label spacing"><span style="color: red">*</span>年薪</label>
-                                                <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
+                                        </td>
+                                        <td {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
+                                            <div class="rowGroup col-sm-12">
+                                                <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪（元）</label>
+                                                <div style="position:relative;">
+                                                    <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
+                                                    <i class="control-symbol">元</i>
+                                                </div>
                                             </div>
                                         </td>
                                     </tr>
@@ -508,7 +537,7 @@
                                         </td>
                                         <td>
                                             <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                <label class="control-label spacing"><span style="color: red">*</span>个人银行账号</label>
                                                 <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
                                             </div>
                                         </td>

app/enterprise/view/talent/view.html

@@ -49,6 +49,20 @@
     ul{
         padding: 0;
     }
+    .control-symbol{
+        display: inline-block;
+        position:absolute;
+        right:0;
+        top:50%;
+        font-style:normal;
+        margin-top: -16px;
+        height:32px;
+        width:32px;
+        line-height:32px;
+        text-align:center;
+        border-left:1px solid #ddd;
+    }
+    #annual_salary{padding-right:32px;}
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -191,7 +205,7 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label">说明</label>
+                                                        <label class=" control-label spacing td-label">人才类型说明</label>
                                                         <div class="word-wrap" id="typeTips">                                                    
                                                             {switch name="row.talent_type"}
                                                             {case value="1"}含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
@@ -206,9 +220,11 @@
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup ">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 1"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 2"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
                                                         <input type="text" class="form-control" value="{$row.tax_insurance_month}"  readonly disabled id="tax_insurance_month"/>
                                                     </div>
+                                                </td>
+                                                <td>
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
                                                         <input type="text" class="form-control" value="{$row.labor_contract_rangetime}"  readonly disabled id="labor_contract_rangetime"/>
@@ -223,6 +239,14 @@
                                                         <input type="text" class="form-control date" id="fst_work_time" value="{$row.fst_work_time}"  readonly disabled/>
                                                     </div>
                                                 </td>
+                                                {if condition="$row['talent_type'] eq 1"}
+                                                <td id="come_in_jin_str">
+                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                    <div class="word-wrap">
+                                                        如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
+                                                    </div>
+                                                </td>
+                                                {/if}
                                             </tr>
                                             {/if}
                                             {/if}
@@ -324,13 +348,13 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
                                                         <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
                                                         <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
                                                     </div>
                                                 </td>
@@ -420,13 +444,13 @@
                                             <tr>
                                                 <td colspan="3">
                                                     <div class="rowGroup col-sm-6" {if condition="!$row['source_city']"}style="display:none;"{/if}>
-                                                         <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
                                                         <select class="form-control" id="source_city" name="source_city">
                                                             <option value="">{$row.sourceCityName}</option>
                                                         </select>
                                                     </div>
                                                     <div class="rowGroup col-sm-6" {if condition="!$row['source_county']"}style="display:none;"{/if}>
-                                                         <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
                                                         <select class="form-control" id="source_county" name="source_county">
                                                             <option value="">{$row.sourceCountyName}</option>
                                                         </select>
@@ -479,15 +503,20 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td colspan="3">
+                                                <td colspan="2">
                                                     <div class="rowGroup col-sm-9">
                                                         <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                         <input type='hidden' name='talent_condition' id='talent_condition' value='{$row.talent_condition}'>
                                                         <div class='form-control' style='border: none;background:#eee;'>{$row.talentConditionName}</div>
                                                     </div>
-                                                    <div class="rowGroup col-sm-12" {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
-                                                         <label class="control-label spacing"><span style="color: red">*</span>年薪</label>
-                                                        <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
+                                                </td>
+                                                <td {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
+                                                    <div class="rowGroup col-sm-12">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪（元）</label>
+                                                        <div style="position:relative;">
+                                                            <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
+                                                            <i class="control-symbol">元</i>
+                                                        </div>
                                                     </div>
                                                 </td>
                                             </tr>
@@ -519,7 +548,7 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                        <label class="control-label spacing"><span style="color: red">*</span>个人银行账号</label>
                                                         <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
                                                     </div>
                                                 </td>

public/static/modular/gate/talentBase/talentBase.js

@@ -48,7 +48,7 @@ TalentInfo.initColumn = function () {
                 if (row.real_state != row.checkState) {
                     switch (row.real_state) {
                         case 4:
-                            return "<span class='label label-danger'>预审驳回</span>";
+                            return "<span class='label label-danger'>基审驳回</span>";
                             break;
                         case 8:
                             return "<span class='label label-danger'>初审驳回</span>";
@@ -73,6 +73,9 @@ TalentInfo.initColumn = function () {
                             return "<span class='label'>保存未提交</span>";
                             break;
                         case 2:
+                            if (row.last_state == 4) {
+                                return "<span class='label label-success'>待审核（重新提交）</span>";
+                            }
                             return "<span class='label label-success'>待审核</span>";
                             break;
                         case 3:
@@ -82,6 +85,9 @@ TalentInfo.initColumn = function () {
                             return "<span class='label'>保存未提交(II)</span>";
                             break;
                         case 6:
+                            if (row.last_state == 8) {
+                                return "<span class='label label-success'>待初审（重新提交）</span>";
+                            }
                             return "<span class='label label-success'>待初审</span>";
                             break;
                         case 7:

public/static/modular/gate/talentBase/talentInfo_info.js

@@ -363,6 +363,42 @@ TalentInfoInfoDlg.afterSelectCity = function () {
         "url": Feng.ctxPath + "/common/tool/findCountyByCitySelect/code/" + city
     });
 }
+TalentInfoInfoDlg.isAgeChecked = false;
+TalentInfoInfoDlg.birthdayChange = function () {
+    let birthday = parseInt($("#birthday").val().substring(0, 4));
+    let currentYear = parseInt(new Date().getFullYear());
+    let age = currentYear - (isNaN(birthday) ? 0 : birthday);
+    let option = $("[data-rel=birthday]");
+    let limitAge = option.data("option");
+    if (age >= limitAge) {
+        option.css("display", "table-row");
+        option.next("tr.detail-view").css("display", "table-row");
+        if (!TalentInfoInfoDlg.isAgeChecked) {
+            layer.alert("由于您的年龄大于70岁（含），要求提供人社局的允许申报的批文，请线下前往人社局办理。如已办理，请将该批文作为附件上传至对应附件栏中。");
+            TalentInfoInfoDlg.isAgeChecked = true;
+            return false;
+        }
+    } else {
+        TalentInfoInfoDlg.isAgeChecked = false;
+        option.css("display", "none");
+        option.next("tr.detail-view").css("display", "none");
+    }
+    return true;
+}
+TalentInfoInfoDlg.initBirthday = function () {
+    let birthday = parseInt($("#birthday").val().substring(0, 4));
+    let currentYear = parseInt(new Date().getFullYear());
+    let age = currentYear - (isNaN(birthday) ? 0 : birthday);
+    let option = $("[data-rel=birthday]");
+    let isFileExists = option.next("tr.detail-view").find("ul.imgs").find("li").length > 3 ? true : false;
+    let limitAge = option.data("option");
+    if (!isNaN(birthday)) {
+        if (age >= limitAge && isFileExists) {
+            TalentInfoInfoDlg.isAgeChecked = true;
+        }
+        TalentInfoInfoDlg.birthdayChange();
+    }
+}
 
 TalentInfoInfoDlg.talentTypeChange = function () {
     var talent_type = $("#talent_type").val();
@@ -573,10 +609,18 @@ TalentInfoInfoDlg.initFile = function () {
                 datas[tableIndex].push(data["rows"][k]);
                 if (data["rows"][k].option) {
                     //指定了选项
-                    let selectVal = $("#" + rel).val();
-                    let options = data["rows"][k].option.split(",");
-                    if (options.indexOf(selectVal) == -1) {
-                        data["rows"][k].hidden = true;
+                    if (rel == "birthday") {
+                        let birthday = parseInt($("#" + rel).val().substring(0, 4));
+                        let currentYear = parseInt(new Date().getFullYear());
+                        let age = currentYear - (isNaN(birthday) ? 0 : birthday);
+                        if (isNaN(birthday) || (!isNaN(birthday) && age < data["rows"][k].option))
+                            data["rows"][k].hidden = true;
+                    } else {
+                        let selectVal = $("#" + rel).val();
+                        let options = data["rows"][k].option.split(",");
+                        if (options.indexOf(selectVal) == -1) {
+                            data["rows"][k].hidden = true;
+                        }
                     }
                 }
             } else {
@@ -725,6 +769,8 @@ TalentInfoInfoDlg.submitToCheck = function () {
     /*if (!TalentInfoInfoDlg.validate()) {
      return;
      }*/
+    if (!TalentInfoInfoDlg.birthdayChange())
+        return;
     var id = $("#id").val();
     /*if (id == null || id == "") {
      Feng.info("请先填写基础信息并上传附件");
@@ -1054,6 +1100,9 @@ $(function () {
             , trigger: 'click'
         });
     });
+    laydate.render({
+        elem: "#birthday"
+    })
     $(".rangedate").each(function () {
         laydate.render({
             elem: this,
@@ -1120,6 +1169,7 @@ $(function () {
         rtl: true
     });
     TalentInfoInfoDlg.initFile();
+    TalentInfoInfoDlg.initBirthday();
 });
 
 

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

@@ -49,7 +49,7 @@ TalentInfo.initColumn = function () {
                 if (row.real_state != row.checkState) {
                     switch (row.real_state) {
                         case 4:
-                            return "<span class='label label-danger'>预审驳回</span>";
+                            return "<span class='label label-danger'>基审驳回</span>";
                             break;
                         case 8:
                             return "<span class='label label-danger'>初审驳回</span>";
@@ -64,16 +64,19 @@ TalentInfo.initColumn = function () {
                     }
                 } else {
                     switch (value) {
-                        case -2:
+                        case - 2:
                             return "<span class='label label-danger'>初审失败</span>";
                             break;
-                        case -1:
+                        case - 1:
                             return "<span class='label label-danger'>基础信息审核失败</span>";
                             break;
                         case 1:
                             return "<span class='label'>保存未提交</span>";
                             break;
                         case 2:
+                            if (row.last_state == 4) {
+                                return "<span class='label label-success'>待审核（重新提交）</span>";
+                            }
                             return "<span class='label label-success'>待审核</span>";
                             break;
                         case 3:
@@ -83,6 +86,9 @@ TalentInfo.initColumn = function () {
                             return "<span class='label'>保存未提交(II)</span>";
                             break;
                         case 6:
+                            if (row.last_state == 8) {
+                                return "<span class='label label-success'>待初审（重新提交）</span>";
+                            }
                             return "<span class='label label-success'>待初审</span>";
                             break;
                         case 7:

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

@@ -289,10 +289,18 @@ TalentInfoInfoDlg.initFileTable = function () {
                 datas[tableIndex].push(data["rows"][k]);
                 if (data["rows"][k].option) {
                     //指定了选项
-                    let selectVal = $("#" + rel).data("value").toString();
-                    let options = data["rows"][k].option.split(",");
-                    if (options.indexOf(selectVal) == -1) {
-                        data["rows"][k].hidden = true;
+                    if (rel == "birthday") {
+                        let birthday = parseInt($("#" + rel).val().substring(0, 4));
+                        let currentYear = parseInt(new Date().getFullYear());
+                        let age = currentYear - (isNaN(birthday) ? 0 : birthday);
+                        if (isNaN(birthday) || (!isNaN(birthday) && age < data["rows"][k].option))
+                            data["rows"][k].hidden = true;
+                    } else {
+                        let selectVal = $("#" + rel).data("value").toString();
+                        let options = data["rows"][k].option.split(",");
+                        if (options.indexOf(selectVal) == -1) {
+                            data["rows"][k].hidden = true;
+                        }
                     }
                 }
             } else {
@@ -421,7 +429,7 @@ TalentInfoInfoDlg.infoCallback = function (data) {
 TalentInfoInfoDlg.getLayerCatdByLayer = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#talent_condition").html("<option>---请选择---</option>");
-    $("#annual_salary").parents(".rowGroup").css("display", "none");
+    $("#annual_salary").parents("td").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
 
     var level = $("#talent_arrange").val();
@@ -440,7 +448,7 @@ TalentInfoInfoDlg.getLayerCatdByLayer = function () {
  */
 TalentInfoInfoDlg.getIdentifyCondition = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    $("#annual_salary").parents(".rowGroup").css("display", "none");
+    $("#annual_salary").parents("td").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
     var level = $("#talent_arrange").val();
     var cat = $("#talent_arrange_category").val();
@@ -457,7 +465,7 @@ TalentInfoInfoDlg.getIdentifyCondition = function () {
 
 TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
-    $("#annual_salary").parents(".rowGroup").css("display", "none");
+    $("#annual_salary").parents("td").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
 
     var source = $("#source").val();
@@ -477,7 +485,7 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
                 return;
             }
             if (typeof data.info != "undefined" && data.info.isSalary == 1) {
-                $("#annual_salary").parents(".rowGroup").css("display", "block");
+                $("#annual_salary").parents("td").css("display", "table-cell");
                 $('#talentInfoForm').bootstrapValidator('addField', "annual_salary", {validators: {
                         notEmpty: {message: '年薪不能放空'},
                         callback: {
@@ -1089,7 +1097,7 @@ $(function () {
         rtl: true
     });
     if ($("#annual_salary").val() != "") {
-        $("#annual_salary").parents(".rowGroup").css("display", "block");
+        $("#annual_salary").parents("td").css("display", "table-cell");
         $('#talentInfoForm').bootstrapValidator('addField', "annual_salary", {validators: {
                 notEmpty: {message: '年薪不能放空'},
                 callback: {

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

@@ -67,10 +67,18 @@ TalentInfoInfoDlg.initFileTable = function () {
                 datas[tableIndex].push(data["rows"][k]);
                 if (data["rows"][k].option) {
                     //指定了选项
-                    let selectVal = $("#" + rel).data("value").toString();
-                    let options = data["rows"][k].option.split(",");
-                    if (options.indexOf(selectVal) == -1) {
-                        data["rows"][k].hidden = true;
+                    if (rel == "birthday") {
+                        let birthday = parseInt($("#" + rel).val().substring(0, 4));
+                        let currentYear = parseInt(new Date().getFullYear());
+                        let age = currentYear - (isNaN(birthday) ? 0 : birthday);
+                        if (isNaN(birthday) || (!isNaN(birthday) && age < data["rows"][k].option))
+                            data["rows"][k].hidden = true;
+                    } else {
+                        let selectVal = $("#" + rel).data("value").toString();
+                        let options = data["rows"][k].option.split(",");
+                        if (options.indexOf(selectVal) == -1) {
+                            data["rows"][k].hidden = true;
+                        }
                     }
                 }
             } else {

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

@@ -38,53 +38,72 @@ TalentInfo.initColumn = function () {
         {title: '最新提交时间', field: 'new_submit_time', 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 == 2 || value == 7) {
-                    return "<span class='label label-success'>待审核</span>"
-                }
-                if (value == 6) {
-                    if (row.realState == 10) {
-                        return "<span class='label label-danger'>部门驳回</span>"
-                    } else if (row.realState == 12) {
-                        return "<span class='label label-danger'>复核驳回</span>"
+                if (typeof row.deptCheckState != "undefined") {
+                    if (row.deptCheckState == 9) {
+                        return "<span class='label label-primary'>部门已通过</span>"
+                    }else if(row.deptCheckState == 6){
+                        return "<span class='label label-danger'>部门已驳回</span>"
                     } else {
                         return "<span class='label label-success'>待审核</span>"
                     }
-                }
-                if (value == 13 || value == -1 || value == -2) {
-                    return "<span class='label label-danger'>审核不通过</span>"
-                }
-                if (value == 4) {
-                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 1) {
-                        return "<span class='label label-success'>上级驳回</span>"
-                    } else {
+                } else {
+                    if (value == 2) {
+                        if (row.lastState == 4) {
+                            return "<span class='label label-success'>待审核（重新提交）</span>"
+                        }
                         return "<span class='label label-success'>待审核</span>"
                     }
-                }
-                if (value == 8) {
-                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 2) {
-                        return "<span class='label label-success'>上级驳回</span>"
-                    } else {
+                    if (value == 7) {
                         return "<span class='label label-success'>待审核</span>"
                     }
-                }
-                if (value == 9) {
-                    return "<span class='label label-success'>待复审</span>"
-                }
-                if (value == 10) {
-                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 3) {
-                        return "<span class='label label-danger'>上级驳回</span>"
-                    } else {
-                        return "<span class='label label-success'>待审核</span>"
+                    if (value == 6) {
+                        if (row.realState == 10) {
+                            return "<span class='label label-danger'>部门驳回</span>"
+                        } else if (row.realState == 12) {
+                            return "<span class='label label-danger'>复核驳回</span>"
+                        } else {
+                            if (row.lastState == 8) {
+                                return "<span class='label label-success'>待审核（重新提交）</span>"
+                            }
+                            return "<span class='label label-success'>待审核</span>"
+                        }
                     }
-                }
-                if (value == 11) {
-                    return "<span class='label label-primary'>已通过</span>"
-                }
-                if (value == 12) {
-                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 4) {
-                        return "<span class='label label-success'>上级驳回</span>"
-                    } else {
-                        return "<span class='label label-success'>待审核</span>"
+                    if (value == 13 || value == -1 || value == -2) {
+                        return "<span class='label label-danger'>审核不通过</span>"
+                    }
+                    if (value == 4) {
+                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 1) {
+                            return "<span class='label label-success'>上级驳回</span>"
+                        } else {
+                            return "<span class='label label-success'>待审核</span>"
+                        }
+                    }
+                    if (value == 8) {
+                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 2) {
+                            return "<span class='label label-success'>上级驳回</span>"
+                        } else {
+                            return "<span class='label label-success'>待审核</span>"
+                        }
+                    }
+                    if (value == 9) {
+                        return "<span class='label label-success'>待复审</span>"
+                    }
+                    if (value == 10) {
+                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 3) {
+                            return "<span class='label label-danger'>上级驳回</span>"
+                        } else {
+                            return "<span class='label label-success'>待审核</span>"
+                        }
+                    }
+                    if (value == 11) {
+                        return "<span class='label label-primary'>已通过</span>"
+                    }
+                    if (value == 12) {
+                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 4) {
+                            return "<span class='label label-success'>上级驳回</span>"
+                        } else {
+                            return "<span class='label label-success'>待审核</span>"
+                        }
                     }
                 }
             }

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

@@ -70,10 +70,18 @@ TalentInfoInfoDlg.initFileTable = function () {
                 datas[tableIndex].push(data["rows"][k]);
                 if (data["rows"][k].option) {
                     //指定了选项
-                    let selectVal = $("#" + rel).data("value").toString();
-                    let options = data["rows"][k].option.split(",");
-                    if (options.indexOf(selectVal) == -1) {
-                        data["rows"][k].hidden = true;
+                    if (rel == "birthday") {
+                        let birthday = parseInt($("#" + rel).val().substring(0, 4));
+                        let currentYear = parseInt(new Date().getFullYear());
+                        let age = currentYear - (isNaN(birthday) ? 0 : birthday);
+                        if (isNaN(birthday) || (!isNaN(birthday) && age < data["rows"][k].option))
+                            data["rows"][k].hidden = true;
+                    } else {
+                        let selectVal = $("#" + rel).data("value").toString();
+                        let options = data["rows"][k].option.split(",");
+                        if (options.indexOf(selectVal) == -1) {
+                            data["rows"][k].hidden = true;
+                        }
                     }
                 }
             } else {