Merge remote-tracking branch 'origin/master'

app/admin/controller/Talent.php

@@ -34,6 +34,7 @@ class Talent extends AdminController {
         $request = $this->request;
         $params = $request->param();
         $id = $params["id"];
+        $process = $params["process"];
         $info = VerifyApi::getTalentInfoById($id, true);
         $force = intval($this->request['force'], 0);
         $api_data = ApiData::where('uid', '=', $info['card_number'])->where('action', '=', 'rending')->where('status', '=', 1)->find(); //
@@ -56,7 +57,7 @@ class Talent extends AdminController {
             $content = unserialize($api_data['content']);
             $info['rs'] = $content;
         }
-
+        $info["process"] = $process;
         if (in_array($info["checkState"], [TalentState::BASE_VERIFY_FAIL, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL])) {
             return view("talentInfo_base_check", ["info" => $info]);
         } else {
@@ -1362,6 +1363,7 @@ class Talent extends AdminController {
     public function validateIsCheck() {
         $params = $this->request->param();
         $id = $params["id"];
+        $process = $params["process"];
         $talent_info = VerifyApi::getOne($id);
         $fstLog = TalentLogApi::getFstLog($id, 1);
         $isMix = false;
@@ -1372,191 +1374,162 @@ class Talent extends AdminController {
         $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
         if ($talent_info) {
             $checkState = $talent_info["checkState"];
-// 0正在填写 1保存未提交 2已提交未审核 3已审核 4驳回 5基审复核通过 6基审复核驳回 7基审复核失败 8保存补充材料未提交 9提交补充材料进入初审 10初审通过 11初审驳回 12部门审核通过 13部门审核驳回 14复核通过 15复核驳回 16复核失败
+            if (!$process || ($process == 3 && $checkState != TalentState::SCND_SUBMIT) || ($process == 4 && $checkState != TalentState::FST_VERIFY_PASS) || ($process == 5 && $checkState != TalentState::DEPT_VERIFY_PASS)) {
+                return json(["msg" => "该申报不在审核范围内，无法审核"]);
+            }
             $process = 0;
-            if (in_array($checkState, [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS])) {
-                switch ($checkState) {
-                    case TalentState::FST_SUBMIT:
-                        $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
-                        $field_tmp = [];
-                        foreach ($fields as $key => $field) {
-                            $field_tmp[] = ["key" => $key, "value" => $field];
-                        }
-                        $where[] = ["project", "=", 1];
-                        $where[] = ["step", "=", 1];
-                        $where[] = ["active", "=", 1];
-                        $where[] = ["type", "=", $enterprise["type"]];
-
-                        $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
-                        /* foreach ($files as $key => $file) {
-                          $options = array_filter(explode(",", $file["option"]));
-                          if ($options) {
-                          switch ($file["rel"]) {
-                          case "talent_type":
-                          $allow_tags = array_filter(explode(",", $file["enterprise_tag"]));
-                          if ($allow_tags && !in_array($enterprise["enterpriseTag"], $allow_tags)) {
-                          unset($files[$key]);
-                          break;
-                          }
-                          if (!in_array($talent_info["talent_type"], $options)) {
-                          unset($files[$key]);
-                          break;
-                          }
-                          break;
-                          case "birthday":
-                          $birthYear = substr($talent_info["birthday"], 0, 4);
-                          $currentYear = date("Y");
-                          $age = $currentYear - $birthYear;
-                          if ($age < $options[0]) {
-                          unset($files[$key]);
-                          break;
-                          }
-                          break;
-                          }
-                          }
-                          } */
-                        $process = 1;
-                        break;
-                    case TalentState::BASE_VERIFY_PASS:
-                        $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
-                        $field_tmp = [];
-                        foreach ($fields as $key => $field) {
-                            $field_tmp[] = ["key" => $key, "value" => $field];
-                        }
-                        $where[] = ["project", "=", 1];
-                        $where[] = ["step", "=", 1];
-                        $where[] = ["active", "=", 1];
-                        $where[] = ["type", "=", $enterprise["type"]];
-
-                        $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
-                        $process = 2;
-                        break;
-                    case TalentState::SCND_SUBMIT:
-                        $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
-                        $process = 3;
-                        break;
-                    case TalentState::FST_VERIFY_PASS:
-                        $tc = TalentConditionApi::getOne($talent_info["talent_condition"]);
-                        if ($tc["companyIds"] && $talent_info["pass_dept_check"] != 1) {
-                            $process = 4;
-                            $fields = DictApi::getTalentFields(3, $talent_info["isImport"]);
-                        } else {
-                            $process = 5;
-                            $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
-                        }
-                        break;
-                    case TalentState::DEPT_VERIFY_PASS:
+            switch ($checkState) {
+                case TalentState::FST_SUBMIT:
+                    $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
+                    $field_tmp = [];
+                    foreach ($fields as $key => $field) {
+                        $field_tmp[] = ["key" => $key, "value" => $field];
+                    }
+                    $where[] = ["project", "=", 1];
+                    $where[] = ["step", "=", 1];
+                    $where[] = ["active", "=", 1];
+                    $where[] = ["type", "=", $enterprise["type"]];
+
+                    $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                    $process = 1;
+                    break;
+                case TalentState::BASE_VERIFY_PASS:
+                    $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
+                    $field_tmp = [];
+                    foreach ($fields as $key => $field) {
+                        $field_tmp[] = ["key" => $key, "value" => $field];
+                    }
+                    $where[] = ["project", "=", 1];
+                    $where[] = ["step", "=", 1];
+                    $where[] = ["active", "=", 1];
+                    $where[] = ["type", "=", $enterprise["type"]];
+
+                    $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                    $process = 2;
+                    break;
+                case TalentState::SCND_SUBMIT:
+                    $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
+                    $process = 3;
+                    break;
+                case TalentState::FST_VERIFY_PASS:
+                    $tc = TalentConditionApi::getOne($talent_info["talent_condition"]);
+                    if ($tc["companyIds"] && $talent_info["pass_dept_check"] != 1) {
+                        $process = 4;
+                        $fields = DictApi::getTalentFields(3, $talent_info["isImport"]);
+                    } else {
                         $process = 5;
                         $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
-                        break;
+                    }
+                    break;
+                case TalentState::DEPT_VERIFY_PASS:
+                    $process = 5;
+                    $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
+                    break;
+            }
+            if ($isMix && $process != 4) {
+                if ($enterprise["type"] == 2) {
+                    $fields = DictApi::getTalentFields_IC();
+                } else {
+                    $fields = DictApi::getTalentFields(4, $talent_info["isImport"]);
                 }
-                if ($isMix && $process != 4) {
-                    if ($enterprise["type"] == 2) {
-                        $fields = DictApi::getTalentFields_IC();
-                    } else {
-                        $fields = DictApi::getTalentFields(4, $talent_info["isImport"]);
+            }
+            if ($fields["fst_work_time"] && in_array($enterprise['enterpriseTag'], ['mtdw', 'gyqyh', 'mbfqy', 'jrjg']) && $enterprise["type"] == 1) {
+                $fields["fst_work_time"] = $talent_info['talent_type'] == 1 ? "近三年来晋工作时间" : "近三年（首次）来晋工作时间";
+            }
+            if ($checkState != TalentState::FST_SUBMIT) {
+                //$fields = DictApi::getTalentFields(2);
+                $field_tmp = [];
+                if ($fields) {
+                    foreach ($fields as $key => $field) {
+                        $field_tmp[] = ["key" => $key, "value" => $field];
                     }
                 }
-                if ($fields["fst_work_time"] && in_array($enterprise['enterpriseTag'], ['mtdw', 'gyqyh', 'mbfqy', 'jrjg']) && $enterprise["type"] == 1) {
-                    $fields["fst_work_time"] = $talent_info['talent_type'] == 1 ? "近三年来晋工作时间" : "近三年（首次）来晋工作时间";
+                $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
+                $companys = array_filter(explode(",", $condition["companyIds"]));
+                $_companys = [];
+                foreach ($companys as $companyId) {
+                    $company = CompanyApi::getOne($companyId);
+                    $_companys[] = $company;
                 }
-                if ($checkState != TalentState::FST_SUBMIT) {
-                    //$fields = DictApi::getTalentFields(2);
-                    $field_tmp = [];
-                    if ($fields) {
-                        foreach ($fields as $key => $field) {
-                            $field_tmp[] = ["key" => $key, "value" => $field];
+                if ($process == 4 && $enterprise["type"] == 1) {
+                    $where = [];
+                    $where[] = ["delete", "=", 0];
+                    $cwfts = explode(";", $condition["companyWithFileType"]);
+                    foreach ($cwfts as $cwft) {
+                        $_company_setting = explode(":", $cwft);
+                        if ($_company_setting[0] == $this->user["companyId"]) {
+                            $where[] = ["id", "in", explode(",", $_company_setting[1])];
+                            break;
                         }
                     }
-                    $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
-                    $companys = array_filter(explode(",", $condition["companyIds"]));
-                    $_companys = [];
-                    foreach ($companys as $companyId) {
-                        $company = CompanyApi::getOne($companyId);
-                        $_companys[] = $company;
+                    if ($where) {
+                        $files = \think\facade\Db::table("new_common_filetype")->where($where)->order("sn asc")->select();
+                    } else {
+                        $files = [];
                     }
-                    if ($process == 4 && $enterprise["type"] == 1) {
-                        $where = [];
-                        $where[] = ["delete", "=", 0];
-                        $cwfts = explode(";", $condition["companyWithFileType"]);
-                        foreach ($cwfts as $cwft) {
-                            $_company_setting = explode(":", $cwft);
-                            if ($_company_setting[0] == $this->user["companyId"]) {
-                                $where[] = ["id", "in", explode(",", $_company_setting[1])];
-                                break;
-                            }
-                        }
-                        if ($where) {
-                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->order("sn asc")->select();
-                        } else {
-                            $files = [];
-                        }
+                } else {
+                    $where = [];
+                    $whr = [];
+                    if (!$isMix) {
+                        $where[] = ["step", "=", 2];
+                    }
+                    $where[] = ["project", "=", 1];
+                    $where[] = ["active", "=", 1];
+                    $where[] = ["type", "=", $enterprise["type"]];
+                    $where[] = ["isConditionFile", "<>", 1];
+                    $where[] = ["delete", "=", 0];
+                    if ($condition && $condition["bindFileTypes"]) {
+                        $whr[] = ["id", "in", explode(",", $condition["bindFileTypes"])];
+                        $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->order("sn asc")->select();
                     } else {
-                        $where = [];
-                        $whr = [];
-                        if (!$isMix) {
-                            $where[] = ["step", "=", 2];
-                        }
-                        $where[] = ["project", "=", 1];
-                        $where[] = ["active", "=", 1];
-                        $where[] = ["type", "=", $enterprise["type"]];
-                        $where[] = ["isConditionFile", "<>", 1];
-                        $where[] = ["delete", "=", 0];
-                        if ($condition && $condition["bindFileTypes"]) {
-                            $whr[] = ["id", "in", explode(",", $condition["bindFileTypes"])];
-                            $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->order("sn asc")->select();
-                        } else {
-                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->order("sn asc")->select();
-                        }
+                        $files = \think\facade\Db::table("new_common_filetype")->where($where)->order("sn asc")->select();
                     }
                 }
-                $talent_info["files"] = array_filter(explode(",", $talent_info["modify_files"]));
-                $talent_info["fields"] = array_filter(explode(",", $talent_info["modify_fields"]));
+            }
+            $talent_info["files"] = array_filter(explode(",", $talent_info["modify_files"]));
+            $talent_info["fields"] = array_filter(explode(",", $talent_info["modify_fields"]));
 
-                /* 保存的审核内容start */
-                $last_log = TalentLogApi::getLastLog($id, ProjectState::TALENT, 0, ["active", "=", 0]);
-                if ($last_log["step"] == 3 && $last_log["companyId"] != $this->user["companyId"]) {
-                    $last_log = TalentLogApi::getLastLog($id, ProjectState::TALENT, $this->user["companyId"], ["active", "=", 0]);
-                }
-                $check = ["msg" => $last_log["description"]];
-                if ($last_log["state"] == TalentState::FST_VERIFY_PASS && $last_log["new_state"] == TalentState::FST_VERIFY_PASS) {
-                    if ($talent_info["pass_dept_check"] == 1) {
-                        if ($talent_info["isImport"] && $talent_info["isMatchZhiren"]) {
-                            $check["checkState"] = 3; //初审通过
-                        } else {
-                            $check["checkState"] = 4; //初审通过(跳过部门并审)
-                        }
+            /* 保存的审核内容start */
+            $last_log = TalentLogApi::getLastLog($id, ProjectState::TALENT, 0, ["active", "=", 0]);
+            if ($last_log["step"] == 3 && $last_log["companyId"] != $this->user["companyId"]) {
+                $last_log = TalentLogApi::getLastLog($id, ProjectState::TALENT, $this->user["companyId"], ["active", "=", 0]);
+            }
+            $check = ["msg" => $last_log["description"]];
+            if ($last_log["state"] == TalentState::FST_VERIFY_PASS && $last_log["new_state"] == TalentState::FST_VERIFY_PASS) {
+                if ($talent_info["pass_dept_check"] == 1) {
+                    if ($talent_info["isImport"] && $talent_info["isMatchZhiren"]) {
+                        $check["checkState"] = 3; //初审通过
                     } else {
-                        if ($talent_info["re_check_companys"] && $talent_info["highProcess"] >= 4) {
-                            $check["checkState"] = 5; //初审通过(需要再次部门并审)
-                        } else {
-                            $check["checkState"] = 3; //初审通过
-                        }
+                        $check["checkState"] = 4; //初审通过(跳过部门并审)
+                    }
+                } else {
+                    if ($talent_info["re_check_companys"] && $talent_info["highProcess"] >= 4) {
+                        $check["checkState"] = 5; //初审通过(需要再次部门并审)
+                    } else {
+                        $check["checkState"] = 3; //初审通过
                     }
                 }
-                if ($last_log["state"] == TalentState::FST_VERIFY_REJECT && $last_log["new_state"] == TalentState::SCND_SAVE) {
-                    $check["checkState"] = 2; //初审驳回
-                }
-                if ($last_log["state"] == TalentState::FST_VERIFY_PASS && $last_log["new_state"] == TalentState::DEPT_VERIFY_PASS) {
-                    $check["checkState"] = 3; //部门通过
-                }
-                if ($last_log["state"] == TalentState::FST_VERIFY_PASS && $last_log["new_state"] == TalentState::SCND_SUBMIT) {
-                    $check["checkState"] = 2; //部门驳回
-                }
-                if ($last_log["state"] == TalentState::REVERIFY_PASS && $last_log["new_state"] == TalentState::REVERIFY_PASS) {
-                    $check["checkState"] = 3; //复审通过
-                }
-                if ($last_log["state"] == TalentState::REVERIFY_REJECT && $last_log["new_state"] == TalentState::SCND_SUBMIT) {
-                    $check["checkState"] = 2; //复审驳回
-                }
-                if ($last_log["state"] == TalentState::REVERIFY_FAIL && $last_log["new_state"] == TalentState::REVERIFY_FAIL) {
-                    $check["checkState"] = -1; //复审失败
-                }
-                /* 保存的审核内容end */
-                return json(["code" => 200, "obj" => ["process" => $process, "talentInfo" => $talent_info, "check" => $check, "fieldList" => $field_tmp, "fileList" => $files, "companys" => $_companys]]);
-            } else {
-                return json(["msg" => "该申报不在审核范围内，无法审核"]);
             }
+            if ($last_log["state"] == TalentState::FST_VERIFY_REJECT && $last_log["new_state"] == TalentState::SCND_SAVE) {
+                $check["checkState"] = 2; //初审驳回
+            }
+            if ($last_log["state"] == TalentState::FST_VERIFY_PASS && $last_log["new_state"] == TalentState::DEPT_VERIFY_PASS) {
+                $check["checkState"] = 3; //部门通过
+            }
+            if ($last_log["state"] == TalentState::FST_VERIFY_PASS && $last_log["new_state"] == TalentState::SCND_SUBMIT) {
+                $check["checkState"] = 2; //部门驳回
+            }
+            if ($last_log["state"] == TalentState::REVERIFY_PASS && $last_log["new_state"] == TalentState::REVERIFY_PASS) {
+                $check["checkState"] = 3; //复审通过
+            }
+            if ($last_log["state"] == TalentState::REVERIFY_REJECT && $last_log["new_state"] == TalentState::SCND_SUBMIT) {
+                $check["checkState"] = 2; //复审驳回
+            }
+            if ($last_log["state"] == TalentState::REVERIFY_FAIL && $last_log["new_state"] == TalentState::REVERIFY_FAIL) {
+                $check["checkState"] = -1; //复审失败
+            }
+            /* 保存的审核内容end */
+            return json(["code" => 200, "obj" => ["process" => $process, "talentInfo" => $talent_info, "check" => $check, "fieldList" => $field_tmp, "fileList" => $files, "companys" => $_companys]]);
         }
     }
 
@@ -1678,7 +1651,7 @@ class Talent extends AdminController {
         $fields = $params["export"];
         if (!$fields)
             return json(["msg" => "请选择要导出的数据"]);
-        $names = DictApi::getTalentFields(4);
+        $names = DictApi::getTalentFields(4, in_array("isMatchZhiren", $fields));
         $names["industryFieldNew"] = "产业领域";
         $names["enterpriseName"] = "单位名称";
         $names["enterpriseTag"] = "单位标签";

app/admin/view/talent/dept_verify.html

@@ -324,8 +324,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -340,17 +343,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/fst_verify.html

@@ -402,8 +402,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -418,17 +421,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/library.html

@@ -402,8 +402,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -418,17 +421,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/pre_list.html

@@ -612,8 +612,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -628,17 +631,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/re_verify.html

@@ -329,8 +329,11 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="tax_insurance_month"><span>在我市缴交社保或个税月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="labor_contract_rangetime"><span>劳动合同起止时间</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_way"><span>工资发放渠道</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="salary_pay_month"><span>工资发放月份</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fst_work_time"><span>来晋时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pre_import_type"><span>预引进类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="return"><span>流出晋江满3年后又返回晋江的</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
@@ -345,17 +348,19 @@
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="isMatchZhiren"><span>是否直认人才</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
+                                <!--<li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>-->
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="identifyGetTime"><span>认定条件取得时间</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>

app/admin/view/talent/talentInfo_common_check.html

@@ -68,8 +68,8 @@
     }
 </style>
 <script>
-    $(function(){
-        $("#force_refresh").on('click',function(){
+    $(function () {
+        $("#force_refresh").on('click', function () {
             window.location.href = "/admin/talent/common_check?force=1&id={$info.id}";
         });
     })
@@ -99,6 +99,7 @@
                                     <div class="panel-body">
                                         <input type="hidden" name="id" id="id" value="{$info.id}">
                                         <input type="hidden" name="type" id="type" value="1">
+                                        <input type="hidden" name="process" id="process" value="{$info.process}">
                                         <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
                                         <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$info.enterpriseTag}">
                                         <input type="hidden" name="import" id="import" value="{$info.isImport}"/>
@@ -503,13 +504,13 @@
                                             </td>
                                             <td>
                                                 <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["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="{$info.abroad_school}"/>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["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="{$info.abroad_major}"/>
                                                 </div>
                                             </td>
@@ -588,7 +589,7 @@
                                                 <div class="rowGroup col-sm-12 zhiren word-wrap-no-width" style="font-weight:bold;">
                                                     <label class="control-label spacing td-label" style="border-bottom:2px solid red;"><span style="color: red">*</span>是否符合<span style="font-size:16px;color:red;">人才直认</span>条件</label>                                                        
                                                     <input type="radio" name="isMatchZhiren" disabled value="1" {eq name="info.isMatchZhiren" value="1"}checked{/eq}/>是&nbsp;&nbsp;
-                                                           <input type="radio" name="isMatchZhiren"  disabled value="0" {if condition="!$info['isMatchZhiren']"}checked{/if}/>否
+                                                    <input type="radio" name="isMatchZhiren"  disabled value="0" {if condition="!$info['isMatchZhiren']"}checked{/if}/>否
                                                 </div>
                                                 {/if}
                                                 <div class="rowGroup col-sm-9">
@@ -597,11 +598,11 @@
                                                 </div>
                                                 {if condition="$info['source_city'] || $info['source_county']"}
                                                 <div class="rowGroup col-sm-3" {if condition="!$info['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>
                                                     <input type="text" class="form-control" id="source_city" name="source_city" value="{$info.sourceCityName}"/>
                                                 </div>
                                                 <div class="rowGroup col-sm-3" {if condition="!$info['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>
                                                     <input type="text" class="form-control" id="source_county" name="source_county" value="{$info.sourceCountyName}"/>
                                                 </div>
                                                 {/if}

app/admin/view/talent/talentInfo_common_checkIC.html

@@ -62,6 +62,7 @@
                                             <div class="col-sm-12 form-group-sm">
                                                 <input type="hidden" name="id" id="id" value="{$info.id}">
                                                 <input type="hidden" name="type" id="type" value="{$info.enterpriseType}">
+                                                <input type="hidden" name="process" id="process" value="{$info.process}">
                                                 <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
                                                 <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$info.enterpriseTag}">
                                                 <div class="row">

app/command/ExpireVerifyChecker.php

@@ -29,11 +29,14 @@ class ExpireVerifyChecker extends Command {
     }
 
     protected function execute(Input $input, Output $output) {
+        $data["id"] = 2;
+        $data["updateTime"] = date("Y-m-d H:i:s");
+        Db::table("new_schedule")->save($data);exit();
         $where = [];
-        $where[] = ["active","=",1];
-        $where[] = ["type","=", \app\common\state\ProjectState::TALENT];
+        $where[] = ["active", "=", 1];
+        $where[] = ["type", "=", \app\common\state\ProjectState::TALENT];
         $batch = \app\common\model\Batch::where($where)->find();
-        if($batch && $batch["submitEndTime"] && strtotime($batch["submitEndTime"]) < time()){
+        if ($batch && $batch["submitEndTime"] && strtotime($batch["submitEndTime"]) < time()) {
             //存在激活的批次，并且有设置提交截止时间,且已经超过截止时间，则检查此批次的申报是否存在尚在审批的申请（不包括通过复审的申请），全部以失败处置
         }
 

app/common/api/VerifyApi.php

@@ -129,7 +129,7 @@ class VerifyApi {
                                     $timetype = "years";
                                     break;
                             }
-                            $fj_talent_info[2] = implode("：", [$tmp2, date("Y-m-d", strtotime("+{$validval} {$timetype}", strtotime($timeStart)))]);
+                            $fj_talent_info[2] = implode("：", [$tmp2, date("Y-m-d", strtotime("+{$validval} {$timetype} -1 days", strtotime($timeStart)))]);
                         }
                     }
                 }
@@ -508,6 +508,9 @@ class VerifyApi {
         $sex = [1 => "男", 2 => "女"];
         $pre_import_type = [1 => "意向合同", 2 => "创业企业名称预核准"];
         $study_abroad = [1 => "是", 2 => "否"];
+        $salary_pay_way = [1 => "本单位", 2 => "本单位所属集团公司及权属公司"];
+        $return = [1 => "是", 2 => "否"];
+        $isMatchZhiren = [0 => "否", 1 => "是"];
 
         $where = [];
         $where[] = ["e.type", "=", session("user")["type"]];
@@ -556,7 +559,10 @@ class VerifyApi {
             $item["sex"] = $sex[$item["sex"]];
             $item["highest_degree"] = $highest_degree[$item["highest_degree"]];
             $item["import_way"] = $import_way[$item["import_way"]];
+            $item["salary_pay_way"] = $salary_pay_way[$item["salary_pay_way"]];
             $item["pre_import_type"] = $pre_import_type[$item["pre_import_type"]];
+            $item["return"] = $return[$item["return"]];
+            $item["isMatchZhiren"] = $isMatchZhiren[$item["isMatchZhiren"]];
             $item["study_abroad"] = $study_abroad[$item["study_abroad"]];
             $item["source"] = $source[$item["source"]];
             $item["talent_arrange"] = $talent_arrange[$item["talent_arrange"]];

app/enterprise/api/TalentApi.php

@@ -22,7 +22,7 @@ class TalentApi {
      */
     public static function checkIsEditable($id) {
         $info = Talent::findOrEmpty($id)->toArray();
-        if (!$info || $info["delete"] == 1 || !in_array($info["checkState"], [0, TalentState::FST_SAVE, TalentState::BASE_REVERIFY_PASS, TalentState::SCND_SAVE]))
+        if ($info["delete"] == 1 || !in_array($info["checkState"], [0, TalentState::FST_SAVE, TalentState::BASE_REVERIFY_PASS, TalentState::SCND_SAVE]))
             return false;
         return true;
     }

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

@@ -1175,7 +1175,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
     if (realState == 11) {
         $("#photoImg").removeAttr("onclick");
         $("input,textarea").each(function () {
-            $(this).attr("readonly", "readonly").attr("style", "pointer-events:none;");
+            $(this).attr("readonly", "readonly").css("pointer-events", "none");
         });
         $("select,input[type=radio]").each(function () {
             $(this).attr("disabled", "disabled");
@@ -1194,10 +1194,10 @@ TalentInfoInfoDlg.setNoChangeField = function () {
                     if (name == 'select' || name == 'SELECT') {
                         $("#" + arr[key]).removeAttr("disabled");
                     } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                        $("#" + arr[key]).removeAttr("readonly").removeAttr("style");
+                        $("#" + arr[key]).removeAttr("readonly").css("pointer-events", "initial");
                     } else {
                         if (typeof name == "undefined") {
-                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly").removeAttr("style");
+                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly").css("pointer-events", "initial");
                         }
                     }
                 }

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

@@ -154,6 +154,7 @@ TalentInfo.check = function () {
 
 TalentInfo.openCheckTalentInfo = function () {
     var title = $("#title").val();
+    var process = $("#process").val();
     if (this.check()) {
         var index = layer.open({
             type: 2,
@@ -162,7 +163,7 @@ TalentInfo.openCheckTalentInfo = function () {
             fix: false, //不固定
             maxmin: true,
             shade: 0,
-            content: '/admin/talent/common_check/id/' + TalentInfo.seItem.id + '/1',
+            content: '/admin/talent/common_check/id/' + TalentInfo.seItem.id + '/process/' + process,
             btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             btn1: function (index, layero) {

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

@@ -458,7 +458,7 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
     }, function (data) {
         Feng.error("校验失败!" + data.responseJSON.message + "!");
     });
-    ajax.setData({"id": $("#id").val(), "companyId": $("#companyId").val()})
+    ajax.setData({"id": $("#id").val(), "process": $("#process").val(), "companyId": $("#companyId").val()})
     ajax.start();
 }