1

app/admin/controller/Talent.php

@@ -30,7 +30,7 @@ class Talent extends AdminController {
         $params = $request->param();
         $id = $params["id"];
         $info = VerifyApi::getTalentInfoById($id);
-        if (in_array($info["checkState"], [-1, 2])) {
+        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 {
             return view("talentInfo_common_check", ["info" => $info]);
@@ -76,6 +76,16 @@ class Talent extends AdminController {
         return json(VerifyApi::getList($params));
     }
 
+    public function base_reverify() {
+        $enterprises = EnterpriseApi::getSimpleList();
+        return view("", ["enterprises" => $enterprises]);
+    }
+
+    public function base_reverify_list() {
+        $params = $this->request->param();
+        return json(VerifyApi::getList($params));
+    }
+
     /**
      * 部门初审
      * @auth {{/talentInfo/gotoIndex/-1}}
@@ -673,7 +683,7 @@ class Talent extends AdminController {
         $params = $request->param();
         if ($params["checkState"] == 3) {
 //审核成功
-            $log_checkState = $checkState = TalentState::BASE_VERIFY_PASS; //初审成功
+            $log_checkState = $checkState = TalentState::BASE_VERIFY_PASS; //基础信息审核成功
         } else {
 //审核驳回并记录需要修改的字段和上传文件
             $checkState = TalentState::FST_SAVE; //退回提交材料阶段
@@ -703,6 +713,49 @@ class Talent extends AdminController {
         return $this->commonSubmitCheck($talent_info, 1);
     }
 
+    /**
+     * 基本条件复审-提交未保存
+     * @param \think\Request $request
+     * @param type $talent_info
+     * @return type json
+     */
+    private function baseReCheck(\think\Request $request, $talent_info) {
+        $params = $request->param();
+
+        if ($params["checkState"] == 3) {
+//审核成功
+            $log_checkState = $checkState = TalentState::BASE_REVERIFY_PASS; //基础信息复审成功
+        } else if ($params["checkState"] == 2) {
+//审核驳回并记录需要修改的字段和上传文件
+            $checkState = TalentState::FST_SUBMIT; //退回待基础审核状态
+            $log_checkState = TalentState::BASE_REVERIFY_REJECT; //日志记录拒绝状态
+        } else {
+            $log_checkState = $checkState = TalentState::BASE_REVERIFY_FAIL; //审核失败
+        }
+        $log = TalentLogApi::getLastLog($talent_info["id"], 1);
+        if (!$log)
+            return json(["msg" => "日志数据异常,保存失败"]);
+        if ($log["active"] == 0) {
+            TalentLogApi::rewrite($log["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        } else {
+            TalentLogApi::write(1, $talent_info["id"], [$log_checkState, $checkState], $params["checkMsg"]);
+        }
+        $data["id"] = $talent_info["id"];
+        $data["modify_files"] = $params["files"];
+        $data["modify_fields"] = $params["fields"];
+        TalentModel::update($data);
+        return json(["code" => 200, "msg" => "保存成功"]);
+    }
+
+    /**
+     * 基本条件复审-提交审核
+     * @param type $talent_info
+     * @return type json
+     */
+    private function baseReSubmitCheck($talent_info) {
+        return $this->commonSubmitCheck($talent_info, 2);
+    }
+
     /**
      * 初审-提交未保存
      * @param \think\Request $request
@@ -716,11 +769,11 @@ class Talent extends AdminController {
             $log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
             $data["pass_dept_check"] = 0;
         } else if ($params["checkState"] == 4) {
-            if ($talent_info["highProcess"] < 3)
+            if ($talent_info["highProcess"] < 4)
                 return json(["msg" => "只有曾经通过部门并审，初审时才可以选择直接跳过部门并审阶段"]);
 //审核成功,并设置越过部门并审。附加条件：最高进度曾经通过部门并审3（包含部门并审）
             $log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
-            $data["pass_dept_check"] = $talent_info["highProcess"] >= 3 ? 1 : 0;
+            $data["pass_dept_check"] = $talent_info["highProcess"] >= 4 ? 1 : 0;
         } else {
 //审核驳回并记录需要修改的字段和上传文件
             $checkState = TalentState::SCND_SAVE; //退回材料编辑状态
@@ -747,7 +800,7 @@ class Talent extends AdminController {
      * @return type json
      */
     private function fstSubmitCheck($talent_info) {
-        $nowProcess = 2;
+        $nowProcess = 3;
         $log = TalentLogApi::getLastLog($talent_info["id"], 1);
         if (!$log || $log["active"] == 1)
             return json(["msg" => "请先保存审核状态，再提交审核"]);
@@ -873,7 +926,7 @@ class Talent extends AdminController {
 
         $over = $pass_companyIds ? count($pass_companyIds) : 0; //完成度,如果重审之前已有通过审核的部门，不用再审，直接按通过算
         $error = 0; //失败数
-        $nowProcess = 3;
+        $nowProcess = 4;
         if (!$dept_log)
             return json(["msg" => "未匹配日志，审核失败"]);
         if ($dept_log["state"] == $dept_log["new_state"])
@@ -965,14 +1018,14 @@ class Talent extends AdminController {
      * @return type json
      */
     private function reSubmitCheck($talent_info) {
-        return $this->commonSubmitCheck($talent_info, 4);
+        return $this->commonSubmitCheck($talent_info, 5);
     }
 
     private function commonSubmitCheck($talent_info, $nowProcess) {
         $log = TalentLogApi::getLastLog($talent_info["id"], 1);
         if (!$log || $log["active"] == 1)
             return json(["msg" => "请先保存审核状态，再提交审核"]);
-        if (in_array($log["new_state"], [TalentState::BASE_VERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::REVERIFY_PASS])) {
+        if (in_array($log["new_state"], [TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::REVERIFY_PASS])) {
             $data["highProcess"] = $nowProcess > $talent_info["highProcess"] ? $nowProcess : $talent_info["highProcess"];
         }
 
@@ -1118,6 +1171,8 @@ class Talent extends AdminController {
         }
         if ($checkState == TalentState::FST_SUBMIT) {
             return $this->baseCheck($request, $talent_info);
+        } else if ($checkState == TalentState::BASE_VERIFY_PASS) {
+            return $this->baseReCheck($request, $talent_info);
         } else if ($checkState == TalentState::SCND_SUBMIT) {
             return $this->fstCheck($request, $talent_info);
         } else if ($checkState == TalentState::FST_VERIFY_PASS) {
@@ -1147,6 +1202,8 @@ class Talent extends AdminController {
         }
         if ($checkState == TalentState::FST_SUBMIT) {
             return $this->baseSubmitCheck($talent_info);
+        } else if ($checkState == TalentState::BASE_VERIFY_PASS) {
+            return $this->baseReSubmitCheck($talent_info);
         } else if ($checkState == TalentState::SCND_SUBMIT) {
             return $this->fstSubmitCheck($talent_info);
         } else if ($checkState == TalentState::FST_VERIFY_PASS) {
@@ -1172,11 +1229,11 @@ class Talent extends AdminController {
         $talent_info = VerifyApi::getOne($id);
         if ($talent_info) {
             $checkState = $talent_info["checkState"];
-// 0正在填写 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
+// 0正在填写 1保存未提交 2已提交未审核 3已审核 4驳回 5基审复核通过 6基审复核驳回 7基审复核失败 8保存补充材料未提交 9提交补充材料进入初审 10初审通过 11初审驳回 12部门审核通过 13部门审核驳回 14复核通过 15复核驳回 16复核失败
             $process = 0;
-            if (in_array($checkState, [2, 6, 7, 9])) {
+            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 2:
+                    case TalentState::FST_SUBMIT:
                         $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
                         $fields = DictApi::getTalentFields(1);
                         $field_tmp = [];
@@ -1191,26 +1248,41 @@ class Talent extends AdminController {
                         $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
                         $process = 1;
                         break;
-                    case 6:
-                        $fields = DictApi::getTalentFields(2);
+                    case TalentState::BASE_VERIFY_PASS:
+                        $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
+                        $fields = DictApi::getTalentFields(1);
+                        $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 7:
+                    case TalentState::SCND_SUBMIT:
+                        $fields = DictApi::getTalentFields(2);
+                        $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 = 3;
+                            $process = 4;
                             $fields = DictApi::getTalentFields(3);
                         } else {
-                            $process = 4;
+                            $process = 5;
                             $fields = DictApi::getTalentFields(2);
                         }
                         break;
-                    case 9:
-                        $process = 4;
+                    case TalentState::DEPT_VERIFY_PASS:
+                        $process = 5;
                         $fields = DictApi::getTalentFields(2);
                         break;
                 }
-                if ($checkState != 2) {
+                if ($checkState != TalentState::FST_SUBMIT) {
                     $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
                     //$fields = DictApi::getTalentFields(2);
                     $field_tmp = [];
@@ -1227,7 +1299,7 @@ class Talent extends AdminController {
                     $where[] = ["active", "=", 1];
                     $where[] = ["type", "=", $enterprise["type"]];
                     $where[] = ["isConditionFile", "<>", 1];
-                    if ($process == 3) {
+                    if ($process == 4) {
                         $where = [];
                         $cwfts = explode(";", $condition["companyWithFileType"]);
                         foreach ($cwfts as $cwft) {
@@ -1269,19 +1341,19 @@ class Talent extends AdminController {
     }
 
     public function fstVerifyListExport() {
-        $this->commonExport(2);
+        $this->commonExport(3);
     }
 
     public function deptVerifyListExport() {
-        $this->commonExport(3);
+        $this->commonExport(4);
     }
 
     public function reVerifyListExport() {
-        $this->commonExport(4);
+        $this->commonExport(5);
     }
 
     public function preListExport() {
-        $this->commonExport(5);
+        $this->commonExport(6);
     }
 
     private function commonExport($process) {

app/admin/view/talent/base_reverify.html

@@ -0,0 +1,276 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
+    ul li{
+        list-style: none;
+        display:inline-block;
+        margin-bottom: 5px;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-top:1px;
+    }
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>人才认定申报 - 基础信息复审</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <input type="hidden" id="type" value="${user.type}">
+                            <input type="hidden" id="process" value="2">
+                            <input type="hidden" id="title" value="基本信息复审">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">姓名</button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="card_number" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="sex">
+                                        <option value=""></option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            民族
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nation">
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row highSearch" style="display: none">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            国籍/地区
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nationality">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            籍贯省
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="province">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            政治面貌
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="politics">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            单位名称
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="enterprise_id">
+                                        {volist name="enterprises" id="item"}
+                                        <option value="{$item.id}">{$item.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            所属街道
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="street">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            产业领域
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="industry_field">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才类型
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talent_type">
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-12" style="text-align: center">
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
+                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
+                                        $('.highSearch').hide();
+                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
+                            <if condition="chkCommission('/admin/talent/base_verify','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openCheckTalentInfo()" id="">
+                                    <i class="fa fa-check"></i>&nbsp;审核
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_export','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(1)" id="">
+                                    <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_download','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                    <i class="fa fa-download"></i>&nbsp;下载
+                                </button>
+                            </if>
+                            <!--<if condition="chkCommission('/admin/talent/modify_reject_fields','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.updateFieldsAndFiles()" id="">
+                                    <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                                </button>
+                            </if>-->
+                            <if condition="chkCommission('/admin/talent/setNotPass','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.setNotPass()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;审核不通过
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getPhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getPhones()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;获取人才手机号
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getEnterprisePhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getEnterprisePhones()" id="">
+                                    <i class="fa fa-phone"></i>&nbsp;获取人才联络员手机号
+                                </button>
+                            </if>
+                        </div>
+                        <table id="TalentInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--导出模态框-->
+<div class="modal fade " id="commonExportModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog modal-lg" role="document" style="min-width: 1000px">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="firstModalLabel">导出</h4>
+            </div>
+            <div class="modal-body">
+                <form id="exportForm" action="/admin/talent/publicExport" target="hiddenIframe" class="form-horizontal">
+                    <div class="form-group" id="field">
+                        <div id="field_info">
+                            <ul>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="name"><span>姓名</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="card_type"><span>证件类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="card_number"><span>证件号码</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="sex"><span>性别</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="birthday"><span>出生日期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="nation"><span>民族</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="politics"><span>政治面貌</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="nationality"><span>国籍/地区</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="province"><span>籍贯省</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="city"><span>籍贯市</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="county"><span>籍贯县</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="enterpriseTag"><span>单位标签</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="enterpriseName"><span>单位名称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="street"><span>所属镇街</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="industryFieldNew"><span>产业领域</span></li>
+                                <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="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="checkState"><span>审核状态</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="checkMsg"><span>审核意见</span></li>
+                            </ul>
+                        </div>
+                        <div class="form-group" style="text-align: center">
+                            <button type="button" class="btn btn-primary" onclick="TalentInfo.checkAll()">全选</button>
+                            <button type="button" class="btn btn-success" onclick="TalentInfo.unCheckAll()">反选</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_base.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/admin/view/talent/dept_verify.html

@@ -27,7 +27,7 @@
                     <div class="col-sm-12">
                         <div class="row">
                             <input type="hidden" id="type" value="${user.type}">
-                            <input type="hidden" id="process" value="3">
+                            <input type="hidden" id="process" value="4">
                             <input type="hidden" id="title" value="部门审核">
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">

app/admin/view/talent/fst_verify.html

@@ -27,7 +27,7 @@
                     <div class="col-sm-12">
                         <div class="row">
                             <input type="hidden" id="type" value="${user.type}">
-                            <input type="hidden" id="process" value="2">
+                            <input type="hidden" id="process" value="3">
                             <input type="hidden" id="title" value="初级审核">
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">

app/admin/view/talent/pre_list.html

@@ -25,7 +25,7 @@
                 <div class="row row-lg">
                     <div class="col-sm-12">
                         <input type="hidden" id="usertype" value="${user.type}">
-                        <input type="hidden" id="process" value="5">
+                        <input type="hidden" id="process" value="6">
                         <input type="hidden" id="title" value="预备人才库">
                         <div class="row">
                             <div class="col-sm-3">

app/admin/view/talent/re_verify.html

@@ -27,7 +27,7 @@
                     <div class="col-sm-12">
                         <div class="row">
                             <input type="hidden" id="type" value="${user.type}">
-                            <input type="hidden" id="process" value="4">
+                            <input type="hidden" id="process" value="5">
                             <input type="hidden" id="title" value="复审">
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">

app/admin/view/talent/talentInfo_base_check.html

@@ -86,7 +86,7 @@
                                                     </div>
                                                 </td>
                                                 <td rowspan="5" style="width: 200%">
-                                                    <img id="photoImg" onclick="Feng.showImg(this)" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <img id="photoImg" onclick="Feng.showImg(this)" src="{$info.headimgurl|getStoragePath}"  style="height:147px;width:105px;margin:0 auto;display:block;">
                                                     <hr />
                                                     <table class="fileTable"></table>
                                                 </td>

app/admin/view/talent/talentInfo_common_check.html

@@ -100,7 +100,7 @@
                                                     </div>
                                                 </td>
                                                 <td rowspan="5" style="width: 200%">
-                                                    <img id="photoImg" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <img id="photoImg" src="{$info.headimgurl|getStoragePath}"  style="height:147px;width:105px;margin:0 auto;display:block;">
                                                     <hr />
                                                     附件：
                                                     <table class="fileTable"></table>

app/common/api/DictApi.php

@@ -212,24 +212,29 @@ class DictApi {
             case 4:
                 $stepName = '<span class="label label-primary">基础条件审核</span>';
                 break;
-            case -2:
+            case 5:
+            case 6:
             case 7:
-            case 8:
+                $stepName = '<span class="label label-primary">基础条件复审</span>';
+                break;
+            case -2:
+            case 10:
+            case 11:
                 if ($step == 3) {
                     $stepName = '<span class="label label-primary">部门审核</span>';
                 } else {
                     $stepName = '<span class="label label-primary">初级审核</span>';
                 }
                 break;
-            case 9:
-            case 10:
+            case 12:
+            case 13:
                 $stepName = '<span class="label label-primary">部门审核</span>';
                 break;
-            case 11:
-            case 12:
+            case 14:
+            case 15:
                 $stepName = '<span class="label label-info">复核</span>';
                 break;
-            case 13:
+            case 16:
                 $stepName = '<span class="label label-danger">审核不通过</span>';
                 break;
             case 21:
@@ -262,13 +267,13 @@ class DictApi {
                 $str = '<span class="label label-danger">初审失败</span>';
                 break;
             case -1:
-                $str = '<span class="label label-danger">基础信息审核失败</span>';
+                $str = '<span class="label label-danger">基础条件审核失败</span>';
                 break;
             case 1:
                 if ($last_state > $state) {
-                    $str = '<span class="label label-danger">基审驳回</span>';
+                    $str = '<span class="label label-danger">基础条件审核驳回</span>';
                 } else {
-                    $str = '<span class="label">待提交基础信息</span>';
+                    $str = '<span class="label">待提交基础条件</span>';
                 }
                 break;
             case 2:
@@ -279,64 +284,73 @@ class DictApi {
                 }
                 break;
             case 3:
-                $str = '<span class="label label-primary">基审通过</span>';
+                $str = '<span class="label label-primary">基础条件审核通过</span>';
                 break;
             case 4:
-                $str = '<span class="label">再提交基础信息</span>';
+                $str = '<span class="label">再提交基础条件</span>';
                 break;
             case 5:
+                $str = '<span class="label label-primary">基础条件复审通过</span>';
+                break;
+            case 6:
+                $str = '<span class="label label-danger">基础条件复审驳回</span>';
+                break;
+            case 7:
+                $str = '<span class="label label-danger">基础条件复审失败</span>';
+                break;
+            case 8:
                 if ($last_state > $state) {
                     $str = '<span class="label label-danger">初审驳回</span>';
                 } else {
                     $str = '<span class="label">待提交认定材料</span>';
                 }
                 break;
-            case 6:
+            case 9:
                 if ($step == 3) {
                     $str = '<span class="label label-danger">部门驳回</span>';
                 } else {
-                    if ($last_state == 8) {
+                    if ($last_state == 11) {
                         $str = '<span class="label label-success">待重审</span>';
-                    } else if ($last_state == 7) {
+                    } else if ($last_state == 10) {
                         $str = '<span class="label label-danger">部门驳回</span>';
-                    } else if ($last_state == 9) {
+                    } else if ($last_state == 12) {
                         $str = '<span class="label label-danger">复核驳回</span>';
                     } else {
                         $str = '<span class="label label-success">待初审</span>';
                     }
                 }
                 break;
-            case 7:
+            case 10:
                 if ($step == 3) {
                     $str = '<span class="label label-success">待部门审核</span>';
                 } else {
                     $str = '<span class="label label-success">待复核</span>';
                 }
                 break;
-            case 8:
+            case 11:
                 $str = '<span class="label">再提交认定材料</span>';
                 break;
-            case 9:
+            case 12:
                 if ($step == 3) {
                     $str = '<span class="label label-primary">部门通过</span>';
                 } else {
                     $str = '<span class="label label-success">待复核</span>';
                 }
                 break;
-            case 10:
+            case 13:
                 if ($step == 3) {
                     $str = '<span class="label label-danger">部门驳回</span>';
                 } else {
                     $str = '<span class="label label-success">待初审</span>';
                 }
                 break;
-            case 11:
+            case 14:
                 $str = '<span class="label label-success">待核查征信</span>';
                 break;
-            case 12:
+            case 15:
                 $str = '<span class="label label-danger">待重新审核</span>';
                 break;
-            case 13:
+            case 16:
                 $str = '<span class="label label-danger">复核不通过</span>';
                 break;
             case 22:

app/common/api/TalentState.php

@@ -13,15 +13,18 @@ class TalentState {
     public const FST_SUBMIT = 2; //已提交未审核
     public const BASE_VERIFY_PASS = 3; //已审核
     public const BASE_REJECT = 4; //驳回
-    public const SCND_SAVE = 5; //保存补充材料未提交
-    public const SCND_SUBMIT = 6; //提交补充材料进入初审
-    public const FST_VERIFY_PASS = 7; //初审通过
-    public const FST_VERIFY_REJECT = 8; //初审驳回
-    public const DEPT_VERIFY_PASS = 9; //部门审核通过
-    public const DEPT_VERIFY_REJECT = 10; //部门审核驳回
-    public const REVERIFY_PASS = 11; //复核通过
-    public const REVERIFY_REJECT = 12; //复核驳回
-    public const REVERIFY_FAIL = 13; //复核失败
+    public const BASE_REVERIFY_PASS = 5;
+    public const BASE_REVERIFY_REJECT = 6;
+    public const BASE_REVERIFY_FAIL = 7;
+    public const SCND_SAVE = 8; //旧：5，保存补充材料未提交
+    public const SCND_SUBMIT = 9; //旧：6，提交补充材料进入初审
+    public const FST_VERIFY_PASS = 10; //旧：7，初审通过
+    public const FST_VERIFY_REJECT = 11; //旧：8初审驳回
+    public const DEPT_VERIFY_PASS = 12; //旧：9部门审核通过
+    public const DEPT_VERIFY_REJECT = 13; //旧：10部门审核驳回
+    public const REVERIFY_PASS = 14; //旧：11复核通过
+    public const REVERIFY_REJECT = 15; //旧：12复核驳回
+    public const REVERIFY_FAIL = 16; //旧：13复核失败
     public const ZX_PASS = 21; //征信通过|待公示
     public const ZX_FAIL = 22; //征信失信|审核不通过
     public const ANNOUNCED = 23; //已公示
@@ -54,22 +57,28 @@ class TalentState {
             case 4:
                 return "基础审核驳回";
             case 5:
-                return "保存未提交";
+                return "基础复核通过";
             case 6:
+                return "基础复核驳回";
+            case7:
+                return "基础复核失败";
+            case 8:
+                return "保存未提交";
+            case 9:
                 return "待初审";
-            case 7:
+            case 10:
                 return "初审通过";
-            case 8:
+            case 11:
                 return "初审驳回";
-            case 9:
+            case 12:
                 return "部门并审通过";
-            case 10:
+            case 13:
                 return "部门并审驳回";
-            case 11:
+            case 14:
                 return "复核成功";
-            case 12:
+            case 15:
                 return "复核驳回";
-            case 13:
+            case 16:
                 return "复核不通过";
             case -1:
                 return "基础审核不通过";

app/common/api/VerifyApi.php

@@ -54,9 +54,6 @@ class VerifyApi {
             if ($enterprise["enterpriseTag"]) {
                 $info["enterpriseTagName"] = DictApi::selectByParentCode("enterprise_tag")[$enterprise["enterpriseTag"]];
             }
-            if ($info["headimgurl"]) {
-                $info["headimgurl"] = getStoragePath($info["headimgurl"]);
-            }
             if ($info["talent_arrange"]) {
                 $info["talentArrangeName"] = DictApi::selectByParentCode("talent_arrange")[$info["talent_arrange"]];
             }
@@ -240,7 +237,7 @@ class VerifyApi {
         }
 
         $process = $params["process"];
-        if ($process == 3) {
+        if ($process == 4) {
             switch ($params["checkState"]) {
                 case 5:
                     $_where = [];
@@ -252,25 +249,25 @@ class VerifyApi {
                     if ($mainIds) {
                         $where[] = ["ti.id", "in", $mainIds];
                     } else {
-                        $where[] = ["ti.checkState", "=", 7];
+                        $where[] = ["ti.checkState", "=", TalentState::FST_VERIFY_PASS];
                         $where[] = ["ti.pass_dept_check", "=", 0];
                     }
                     break;
                 default:
-                    $where[] = ["ti.checkState", "=", 7];
+                    $where[] = ["ti.checkState", "=", TalentState::FST_VERIFY_PASS];
                     $where[] = ["ti.pass_dept_check", "=", 0];
                     break;
             }
             return self::getDeptList($params, $where);
         }
-        if ($process == 4) {
+        if ($process == 5) {
             $whereRaw = sprintf("(ti.checkState in (11,12,13)) or (ti.checkState=9 and ti.pass_dept_check=0) or (ti.checkState=7 and ti.pass_dept_check=1) or (ti.checkState=7 and (tc.companyIds is null or tc.companyIds = ''))");
             switch ($params["checkState"]) {
                 case 1:
-                    $where[] = ["ti.checkState", "in", [7, 9]];
+                    $where[] = ["ti.checkState", "in", [TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS]];
                     break;
                 case -1:
-                    $where[] = ["ti.checkState", "=", 13];
+                    $where[] = ["ti.checkState", "=", TalentState::REVERIFY_FAIL];
                     break;
             }
             $count = Talent::alias("ti")
@@ -291,24 +288,28 @@ class VerifyApi {
         } else {
             switch ($process) {
                 case 1:
-                    $where[] = ["ti.checkState", "in", [2, -1]];
+                    $where[] = ["ti.checkState", "in", [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
                     break;
                 case 2:
+                    //等完善
+                    $where[] = ["ti.checkState", "in", [TalentState::BASE_VERIFY_PASS]];
+                    break;
+                case 3:
                     switch ($params["checkState"]) {
                         case 1://待审核
-                            $where[] = ["ti.checkState", "=", 6];
-                            $where[] = ["tl.state", "=", 6];
+                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.state", "=", TalentState::SCND_SUBMIT];
                             break;
                         case 2://驳回
-                            $where[] = ["ti.checkState", "=", 6];
-                            $where[] = ["tl.state", "in", [10, 12]];
+                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.state", "in", [TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
                             break;
                         default:
-                            $where[] = ["ti.checkState", "in", [6, -2]];
+                            $where[] = ["ti.checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_FAIL]];
                     }
                     break;
-                case 5:
-                    $where[] = ["ti.checkState", ">=", 11];
+                case 6:
+                    $where[] = ["ti.checkState", ">=", TalentState::REVERIFY_PASS];
                     if ($params["checkState"]) {
                         $where[] = ["ti.checkState", "=", $params["checkState"]];
                     }
@@ -406,20 +407,23 @@ class VerifyApi {
         $where = [];
         switch ($process) {
             case 1:
-                $where = "ti.checkState in (2,-1)";
+                $where = "ti.checkState in (" . TalentState::FST_SUBMIT . "," . TalentState::BASE_VERIFY_FAIL . ")";
                 break;
             case 2:
-                $where = "ti.checkState in (6,-2)";
+                //待完善
                 break;
             case 3:
-                $companyId = session("user")["companyId"];
-                $where = "ti.checkState = 7 and ti.pass_dept_check=0 and find_in_set({$companyId},tc.companyIds)";
+                $where = "ti.checkState in (" . TalentState::SCND_SUBMIT . "," . TalentState::FST_VERIFY_FAIL . ")";
                 break;
             case 4:
-                $where = sprintf("(ti.checkState in (11,12,13)) or (ti.checkState=9 and ti.pass_dept_check=0) or (ti.checkState=7 and ti.pass_dept_check=1) or (ti.checkState=7 and (tc.companyIds is null or tc.companyIds = ''))");
+                $companyId = session("user")["companyId"];
+                $where = "ti.checkState = " . TalentState::FST_VERIFY_PASS . " and ti.pass_dept_check=0 and find_in_set({$companyId},tc.companyIds)";
                 break;
             case 5:
-                $where = "ti.checkState >= 11";
+                $where = sprintf("(ti.checkState in (%d,%d,%d)) or (ti.checkState=%d and ti.pass_dept_check=0) or (ti.checkState=%d and ti.pass_dept_check=1) or (ti.checkState=%d and (tc.companyIds is null or tc.companyIds = ''))", TalentState::REVERIFY_PASS, TalentState::REVERIFY_REJECT, TalentState::REVERIFY_FAIL, TalentState::DEPT_VERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::FST_VERIFY_PASS);
+                break;
+            case 6:
+                $where = "ti.checkState >= " . TalentState::REVERIFY_PASS;
                 break;
         }
         $list = Talent::alias("ti")
@@ -470,10 +474,13 @@ class VerifyApi {
     public static function getListByProcess($process) {
         switch ($process) {
             case 1:
-                $where[] = ["ti.checkState", "in", [2, -1]];
+                $where[] = ["ti.checkState", "in", [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
                 break;
             case 2:
-                $where[] = ["ti.checkState", "in", [6, -2]];
+                //待完善
+                break;
+            case 3:
+                $where[] = ["ti.checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_FAIL]];
                 break;
             default:
                 return null;

app/common/controller/Api.php

@@ -175,7 +175,7 @@ class Api extends BaseController {
                     } else if ($item["state"] == 0) {
                         $new_item["stateName"] = '<span class="label">添加附件</span>';
                     } else {
-                        if (($item["last_state"] == 4 && $item["state"] == 2) || ($item["last_state"] == 8 && $item["state"] == 6)) {
+                        if (($item["last_state"] == TalentState::BASE_REJECT && $item["state"] == TalentState::FST_SUBMIT) || ($item["last_state"] == TalentState::FST_VERIFY_REJECT && $item["state"] == TalentState::SCND_SUBMIT)) {
                             $new_item["stateName"] = '<span class="label label-success">待审核（重新提交）</span>';
                         } else {
                             $new_item["stateName"] = '<span class="label label-success">待审核</span>';

app/enterprise/api/TalentApi.php

@@ -22,7 +22,7 @@ class TalentApi {
      */
     public static function checkIsEditable($id) {
         $info = Talent::findOrEmpty($id);
-        if (!$info || !in_array($info["checkState"], [0, 1, 3, 5]))
+        if (!$info || !in_array($info["checkState"], [0, TalentState::FST_SAVE, TalentState::BASE_REVERIFY_PASS, TalentState::SCND_SAVE]))
             return false;
         return true;
     }
@@ -59,24 +59,24 @@ class TalentApi {
         if ($step) {
             switch ($step) {
                 case 1:
-                    $where[] = ["checkState", "in", [TalentState::FST_SAVE, TalentState::BASE_REJECT, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
+                    $where[] = ["checkState", "in", [TalentState::FST_SAVE, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL, TalentState::BASE_REJECT, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
                     switch ($checkState) {
                         case -1:
-                            $where[] = ["checkState", "=", TalentState::BASE_VERIFY_FAIL];
+                            $where[] = ["checkState", "in", [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL]];
                             break;
                         case 1:
                             $where[] = ["checkState", "=", TalentState::FST_SAVE];
                             break;
                         case 2:
-                            $where[] = ["checkState", "=", TalentState::BASE_REJECT];
+                            $where[] = ["checkState", "in", [TalentState::BASE_REJECT, TalentState::BASE_REVERIFY_REJECT]];
                             break;
                         case 3:
-                            $where[] = ["checkState", "=", TalentState::FST_SUBMIT];
+                            $where[] = ["checkState", "in", [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS]];
                             break;
                     }
                     break;
                 case 2:
-                    $where[] = ["checkState", "not in", [TalentState::FST_SAVE, TalentState::BASE_REJECT, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
+                    $where[] = ["checkState", "not in", [TalentState::FST_SAVE, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL, TalentState::BASE_REJECT, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
                     switch ($checkState) {
                         case -1:
                             $where[] = ["checkState", "in", [TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL]];

app/enterprise/controller/Base.php

@@ -49,18 +49,23 @@ class Base extends EnterpriseController {
         if ($info) {
             $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
         }
-        if ($info && in_array($info["checkState"], [TalentState::BASE_VERIFY_PASS, TalentState::SCND_SAVE])) {
-            $res = ["msg" => "错误的访问方式"];
-            echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
-            exit;
-        }
         if ($info && in_array($info["checkState"], [TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS, TalentState::REVERIFY_PASS, TalentState::REVERIFY_FAIL])) {
             return $this->view($request);
             exit();
         }
         if ($request->isPost()) {
-            $this->save($info, $request, TalentState::FST_SAVE);
-            exit();
+            $checkState = $info["checkState"] ?: 0;
+            if ($checkState == TalentState::FST_SAVE || $checkState == 0) {
+                $this->save($info, $request, TalentState::FST_SAVE);
+                exit();
+            } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL])) {
+                $res = ["msg" => "审核失败，不能再保存"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+            $res = ["msg" => "已提交审核，请耐心等待"];
+            echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+            exit;
         }
         $checkState = $info["checkState"] ?: 0;
 
@@ -78,7 +83,7 @@ class Base extends EnterpriseController {
     // 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
     public function submit() {
         $param = $this->request->param();
-        $id = $param["id"];        
+        $id = $param["id"];
         $info = TalentApi::chkIsOwner($id, $this->user["uid"]);
         $checkState = $info["checkState"] ?: 0;
         if ($checkState == TalentState::FST_SAVE || $checkState == 0) {
@@ -156,7 +161,7 @@ class Base extends EnterpriseController {
 
             $this->save($info, $this->request, TalentState::FST_SUBMIT);
             //初次提交材料
-        } else if ($checkState == TalentState::REVERIFY_FAIL) {
+        } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL])) {
             $res = ["msg" => "审核失败，不能再提交审核"];
             echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
             exit;
@@ -181,12 +186,6 @@ class Base extends EnterpriseController {
                 if (!$info) {
                     throw new ValidateException("没有对应的人才认定申报信息");
                 }
-                if ($info["checkState"] == TalentState::REVERIFY_FAIL) {
-                    throw new ValidateException("审核失败，不能再修改");
-                }
-                if (!in_array($info["checkState"], [TalentState::FST_SAVE, 0])) {
-                    throw new ValidateException("审核中，不能修改");
-                }
             }
             $files = $param["uploadFiles"];
             $data["headimgurl"] = $info["headimgurl"];

app/enterprise/controller/Talent.php

@@ -34,15 +34,25 @@ class Talent extends EnterpriseController {
         $params = $request->param();
         $id = $params["id"];
         $info = \app\common\api\VerifyApi::getTalentInfoById($id);
-        if (!$info || $info["enterprise_id"] != $this->user["uid"]) {
-            $res = ["msg" => "错误的访问方式"];
-            echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
-            exit;
-        }
         $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
         if ($request->isPost()) {
-            $this->save($info, $request, TalentState::SCND_SAVE);
-            exit();
+            if (!$info || $info["enterprise_id"] != $this->user["uid"]) {
+                $res = ["msg" => "没有对应的人才认定申报信息"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+            $checkState = $info["checkState"];
+            if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::BASE_REVERIFY_PASS) {
+                $this->save($info, $request, TalentState::SCND_SAVE);
+                exit();
+            } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL])) {
+                $res = ["msg" => "审核失败，不能再保存"];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit;
+            }
+            $res = ["msg" => "已提交审核，请耐心等待"];
+            echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+            exit;
         }
         $enterprise_info = \app\common\model\Enterprise::find($this->user["uid"]);
         $info["enterprise"] = $enterprise_info;
@@ -60,10 +70,13 @@ class Talent extends EnterpriseController {
     public function submit() {
         $params = $this->request->param();
         $id = $params["id"];
-        if (!$info = TalentApi::chkIsOwner($id, $this->user["uid"]))
-            return json(["msg" => "没有对应的人才认定申报信息"]);
+        if (!$info = TalentApi::chkIsOwner($id, $this->user["uid"])) {
+            $res = ["msg" => "没有对应的人才认定申报信息"];
+            echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
+            exit;
+        }
         $checkState = $info["checkState"];
-        if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::BASE_VERIFY_PASS) {
+        if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::BASE_REVERIFY_PASS) {
             $field_dict = \app\common\api\DictApi::getTalentFields(2);
 
             $no_empty = ["talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "bank", "bank_number", "bank_branch_name",
@@ -159,7 +172,7 @@ class Talent extends EnterpriseController {
             }
 
             $this->save($info, $this->request, TalentState::SCND_SUBMIT);
-        } else if ($checkState == TalentState::REVERIFY_FAIL) {
+        } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL])) {
             $res = ["msg" => "审核失败，不能再提交审核"];
             echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
             exit;

app/enterprise/view/talent/view.html

@@ -95,7 +95,7 @@
                                                     </div>
                                                 </td>
                                                 <td rowspan="5" style="width: 200%">
-                                                    <img id="photoImg" src="{$row.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <img id="photoImg" src="{$row.headimgurl|getStoragePath}"  style="height:147px;width:105px;margin:0 auto;display:block;">
                                                     <hr />
                                                     附件：
                                                     <table class="fileTable"></table>

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

@@ -48,16 +48,19 @@ 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:
+                        case 6:
+                            return "<span class='label label-danger'>基础信息复审驳回</span>";
+                            break;
+                        case 11:
                             return "<span class='label label-danger'>初审驳回</span>";
                             break;
-                        case 10:
+                        case 13:
                             return "<span class='label label-danger'>部门驳回</span>";
                             break;
-                        case 12:
-                            return "<span class='label label-danger'>复核驳回</span>";
+                        case 15:
+                            return "<span class='label label-danger'>复审驳回</span>";
                             break;
 
                     }
@@ -69,6 +72,9 @@ TalentInfo.initColumn = function () {
                         case - 1:
                             return "<span class='label label-danger'>基础信息审核失败</span>";
                             break;
+                        case 7:
+                            return "<span class='label label-danger'>基础信息复审失败</span>";
+                            break;
                         case 1:
                             return "<span class='label'>保存未提交</span>";
                             break;
@@ -79,31 +85,34 @@ TalentInfo.initColumn = function () {
                             return "<span class='label label-success'>待审核</span>";
                             break;
                         case 3:
-                            return "<span class='label'>待详细填报</span>";
+                            return "<span class='label label-success'>待基础条件复审</span>";
                             break;
                         case 5:
+                            return "<span class='label'>待详细填报</span>";
+                            break;
+                        case 8:
                             return "<span class='label'>保存未提交(II)</span>";
                             break;
-                        case 6:
-                            if (row.last_state == 8) {
+                        case 9:
+                            if (row.last_state == 11) {
                                 return "<span class='label label-success'>待初审（重新提交）</span>";
                             }
                             return "<span class='label label-success'>待初审</span>";
                             break;
-                        case 7:
+                        case 10:
                             if (row.companyIds) {
                                 return "<span class='label label-success'>待部门审核</span>";
                             } else {
                                 return "<span class='label label-success'>待复审</span>";
                             }
                             break;
-                        case 9:
+                        case 12:
                             return "<span class='label label-success'>待复审</span>";
                             break;
-                        case 11:
+                        case 14:
                             return "<span class='label label-primary'>认定通过</span>";
                             break;
-                        case 13:
+                        case 16:
                             return "<span class='label label-danger'>复审失败</span>";
                             break;
                     }

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

@@ -714,7 +714,7 @@ TalentInfoInfoDlg.checkFile = function (content, fileTypeId, fileId, tableIndex,
     if (!TalentInfoInfoDlg.validateIsEdit())
         return;
     $("#upload_file").unbind("change");
-    $("#upload_file").change(function () {        
+    $("#upload_file").change(function () {
         if (!Feng.chkFileInvalid(this.files[0], 5, 10))
             return;
         TalentInfoInfoDlg.upload(fileTypeId, fileId, tableIndex, trIndex);
@@ -837,14 +837,14 @@ TalentInfoInfoDlg.submitCallback = function (data) {
  */
 TalentInfoInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
-    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 5) {
-        if (checkState == 13) {
+    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 8) {
+        if (checkState == 16 || checkState == -1 || checkState == -2 || checkState == 7) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
         } else if (checkState == 28) {
             Feng.error("申报已完成");
             return false;
-        } else if (checkState == 11) {
+        } else if (checkState == 14) {
             Feng.error("您的申报已审核通过，无法再修改");
             return false;
         } else if (checkState == 22 || checkState == 25 || checkState == 27) {
@@ -870,8 +870,8 @@ TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableI
     files = files.split(",");
     var checkState = $("#checkState").val();
     var realState = $("#realState").val();
-    if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 1 && realState != 4) || checkState == 3 || checkState == 5 || (realState == 4 && files.indexOf(fileTypeId.toString()) != -1)) {
-        if ((checkState == 3 || checkState == 5))
+    if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 1 && realState != 4) || checkState == 3 || checkState == 8 || (realState == 4 && files.indexOf(fileTypeId.toString()) != -1)) {
+        if ((checkState == 3 || checkState == 8))
             return "";
         if (type == 1) {          //上传
             return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +

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

@@ -49,16 +49,19 @@ 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:
+                        case 6:
+                            return "<span class='label label-danger'>基础信息复审驳回</span>";
+                            break;
+                        case 11:
                             return "<span class='label label-danger'>初审驳回</span>";
                             break;
-                        case 10:
+                        case 13:
                             return "<span class='label label-danger'>部门驳回</span>";
                             break;
-                        case 12:
-                            return "<span class='label label-danger'>复核驳回</span>";
+                        case 15:
+                            return "<span class='label label-danger'>复审驳回</span>";
                             break;
 
                     }
@@ -70,6 +73,9 @@ TalentInfo.initColumn = function () {
                         case - 1:
                             return "<span class='label label-danger'>基础信息审核失败</span>";
                             break;
+                        case 7:
+                            return "<span class='label label-danger'>基础信息复审失败</span>";
+                            break;
                         case 1:
                             return "<span class='label'>保存未提交</span>";
                             break;
@@ -80,31 +86,34 @@ TalentInfo.initColumn = function () {
                             return "<span class='label label-success'>待审核</span>";
                             break;
                         case 3:
-                            return "<span class='label'>待详细填报</span>";
+                            return "<span class='label label-success'>待基础条件复审</span>";
                             break;
                         case 5:
+                            return "<span class='label'>待详细填报</span>";
+                            break;
+                        case 8:
                             return "<span class='label'>保存未提交(II)</span>";
                             break;
-                        case 6:
-                            if (row.last_state == 8) {
+                        case 9:
+                            if (row.last_state == 11) {
                                 return "<span class='label label-success'>待初审（重新提交）</span>";
                             }
                             return "<span class='label label-success'>待初审</span>";
                             break;
-                        case 7:
+                        case 10:
                             if (row.companyIds) {
                                 return "<span class='label label-success'>待部门审核</span>";
                             } else {
                                 return "<span class='label label-success'>待复审</span>";
                             }
                             break;
-                        case 9:
+                        case 12:
                             return "<span class='label label-success'>待复审</span>";
                             break;
-                        case 11:
+                        case 14:
                             return "<span class='label label-primary'>复审通过待核查征信</span>";
                             break;
-                        case 13:
+                        case 16:
                             return "<span class='label label-danger'>复审失败</span>";
                             break;
                         case 21:

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

@@ -790,14 +790,14 @@ TalentInfoInfoDlg.submitCallback = function (data) {
  */
 TalentInfoInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
-    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 5) {
-        if (checkState == 13) {
+    if (checkState != 0 && checkState != 1 && checkState != 3 && checkState != 8) {
+        if (checkState == 16 || checkState == -1 || checkState == -2 || checkState == 7) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
         } else if (checkState == 28) {
             Feng.error("申报已完成");
             return false;
-        } else if (checkState == 11) {
+        } else if (checkState == 14) {
             Feng.error("您的申报已审核通过，无法再修改");
             return false;
         } else if (checkState == 22 || checkState == 25 || checkState == 27) {
@@ -822,7 +822,7 @@ TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableI
     files = files.split(",");
     var checkState = $("#checkState").val();
     var realState = $("#realState").val();
-    if (Feng.isEmptyStr(checkState) || checkState == 0 || checkState == 1 || checkState == 3 || (checkState == 5 && realState != 8) || (realState == 8 && files.indexOf(fileTypeId.toString()) != -1)) {
+    if (Feng.isEmptyStr(checkState) || checkState == 0 || checkState == 1 || checkState == 3 || (checkState == 8 && realState != 11) || (realState == 8 && files.indexOf(fileTypeId.toString()) != -1)) {
         if (type == 1) {          //上传
             return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-upload\"></i>上传" +

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

@@ -39,10 +39,10 @@ TalentInfo.initColumn = function () {
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
                 if (typeof row.deptCheckState != "undefined") {
-                    if (row.deptCheckState == 9) {
+                    if (row.deptCheckState == 12) {
                         return "<span class='label label-primary'>部门已通过</span>"
-                    } else if (row.deptCheckState == 6) {
-                        if (row.lastState == 10) {
+                    } else if (row.deptCheckState == 9) {
+                        if (row.lastState == 13) {
                             return "<span class='label label-success'>待重新审核</span>"
                         } else {
                             return "<span class='label label-danger'>部门已驳回</span>"
@@ -57,22 +57,25 @@ TalentInfo.initColumn = function () {
                         }
                         return "<span class='label label-success'>待审核</span>"
                     }
-                    if (value == 7) {
+                    if (value == 5) {
+                        return "<span class='label label-success'>复审通过</span>"
+                    }
+                    if (value == 10) {
                         return "<span class='label label-success'>待审核</span>"
                     }
-                    if (value == 6) {
-                        if (row.realState == 10) {
+                    if (value == 9) {
+                        if (row.realState == 13) {
                             return "<span class='label label-danger'>部门驳回</span>"
-                        } else if (row.realState == 12) {
+                        } else if (row.realState == 15) {
                             return "<span class='label label-danger'>复核驳回</span>"
                         } else {
-                            if (row.lastState == 8) {
+                            if (row.lastState == 11) {
                                 return "<span class='label label-success'>待审核（重新提交）</span>"
                             }
                             return "<span class='label label-success'>待审核</span>"
                         }
                     }
-                    if (value == 13 || value == -1 || value == -2) {
+                    if (value == 16 || value == -1 || value == -2) {
                         return "<span class='label label-danger'>审核不通过</span>"
                     }
                     if (value == 4) {
@@ -82,28 +85,28 @@ TalentInfo.initColumn = function () {
                             return "<span class='label label-success'>待审核</span>"
                         }
                     }
-                    if (value == 8) {
-                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 2) {
+                    if (value == 11) {
+                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 3) {
                             return "<span class='label label-success'>上级驳回</span>"
                         } else {
                             return "<span class='label label-success'>待审核</span>"
                         }
                     }
-                    if (value == 9) {
+                    if (value == 12) {
                         return "<span class='label label-success'>待复审</span>"
                     }
-                    if (value == 10) {
-                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 3) {
+                    if (value == 13) {
+                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 4) {
                             return "<span class='label label-danger'>上级驳回</span>"
                         } else {
                             return "<span class='label label-success'>待审核</span>"
                         }
                     }
-                    if (value == 11) {
+                    if (value == 14) {
                         return "<span class='label label-primary'>已通过</span>"
                     }
-                    if (value == 12) {
-                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 4) {
+                    if (value == 15) {
+                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 5) {
                             return "<span class='label label-success'>上级驳回</span>"
                         } else {
                             return "<span class='label label-success'>待审核</span>"

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

@@ -162,15 +162,18 @@ TalentInfo.export = function (process) {
             commonExport = "baseVerifyListExport";
             break;
         case 2:
-            commonExport = "fstVerifyListExport";
+            commonExport = "baseReverifyListExport";
             break;
         case 3:
-            commonExport = "deptVerifyListExport";
+            commonExport = "fstVerifyListExport";
             break;
         case 4:
-            commonExport = "reVerifyListExport";
+            commonExport = "deptVerifyListExport";
             break;
         case 5:
+            commonExport = "reVerifyListExport";
+            break;
+        case 6:
             commonExport = "preListExport";
             break;
     }

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

@@ -248,7 +248,7 @@ TalentInfoInfoDlg.showCommonCheckModal = function () {
                     layer.setTop(layero);
                     $("#commonCheckForm")[0].reset();
                     var process = $("#process").val();
-                    if (process == 2) {
+                    if (process == 3) {
                         var html = '<option value=""></option>\n' +
                                 '                            <option value="3">审核通过</option>\n' +
                                 '                            <option value="2">审核驳回</option>';
@@ -308,13 +308,13 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     $("#field_info ul").empty().append(html1);
                     $("#field_file").empty().append(html2);
                     var optionHtml = "";
-                    if (process <= 3) {
+                    if (process <= 4 && process != 2) {
                         optionHtml = '<option value="">请选择</option>\n' +
                                 '                            <option value="3">审核通过</option>\n' +
                                 (obj.highProcess >= 3 && process == 2 ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
                                 '                            <option value="2">审核驳回</option>\n';
                     }
-                    if (process == 4) {
+                    if (process == 5 || process == 2) {
                         optionHtml = '<option value="">请选择</option>\n' +
                                 '                            <option value="3">审核通过</option>\n' +
                                 '                            <option value="2">审核驳回</option>\n' +