增加复核撤销

app/admin/controller/Talent.php

@@ -1534,6 +1534,48 @@ class Talent extends AdminController {
         }
     }
 
+    /**
+     * 撤销复核
+     * @auth {{/talentInfo/cancleThirdCheck}}
+     */
+    public function cancleThirdCheck() {
+        $returnObj = new \stdClass();
+        $returnObj->code = 500;
+        $id = \StrUtil::getRequestDecodeParam($this->request, "id");
+        $msg = \StrUtil::getRequestDecodeParam($this->request, "checkMsg");
+        $old = VerifyApi::getOne($id);
+        if (!$old) {
+            $returnObj->msg = "请选择需要撤销的对象";
+            return json($returnObj);
+        }
+        if ($old["checkState"] != TalentState::REVERIFY_PASS) {
+            $returnObj->msg = "当前对象不是复核通过状态，无法撤销";
+            return json($returnObj);
+        }
+        $lastLog = TalentLogApi::getLastLog($id, ProjectState::TALENT, 0, ["active", "=", 1]);
+        if (!in_array($lastLog["last_state"], [TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS]) || $lastLog["state"] != TalentState::REVERIFY_PASS) {
+            $returnObj->msg = "当前对象不是复核通过状态，无法撤销";
+            return json($returnObj);
+        }
+        if ($old["isPublic"] != 1) {
+            $returnObj->msg = "当前对象已核查征信，无法撤销";
+            return json($returnObj);
+        }
+        try {
+            $upd["id"] = $id;
+            $upd["checkState"] = $lastLog["last_state"];
+            if (TalentModel::update($upd)) {
+                TalentLogApi::write(ProjectState::TALENT, $id, $lastLog["last_state"], "撤销原因：" . $msg, 1);
+            }
+            $returnObj->msg = "撤销成功";
+            $returnObj->code = 200;
+            return json($returnObj);
+        } catch (\think\db\exception\DbException $e) {
+            $responseObj->msg = $e->getMessage();
+            return json($responseObj);
+        }
+    }
+
     public function validateIsCheck() {
         $params = $this->request->param();
         $id = $params["id"];

app/admin/view/company/index.html

@@ -36,26 +36,26 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="CompanyTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/company/add','/company/add')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Company.openAddCompany()">
-                                    <i class="fa fa-plus"></i>&nbsp;添加
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/company/edit','/company/update')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Company.openCompanyDetail()">
-                                    <i class="fa fa-edit"></i>&nbsp;修改
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/company/view','/company/select')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Company.select()">
-                                    <i class="fa fa-book"></i>&nbsp;查看
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/company/delete','/company/delete')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Company.delete()">
-                                    <i class="fa fa-remove"></i>&nbsp;删除
-                                </button>
-                            </if>
+                            {if condition="chkCommission('/admin/company/add','/company/add')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Company.openAddCompany()">
+                                <i class="fa fa-plus"></i>&nbsp;添加
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/company/edit','/company/update')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Company.openCompanyDetail()">
+                                <i class="fa fa-edit"></i>&nbsp;修改
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/company/view','/company/select')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Company.select()">
+                                <i class="fa fa-book"></i>&nbsp;查看
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/company/delete','/company/delete')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Company.delete()">
+                                <i class="fa fa-remove"></i>&nbsp;删除
+                            </button>
+                            {/if}
                         </div>
                         <table id="CompanyTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
                             <thead>

app/admin/view/file_type/index.html

@@ -20,20 +20,20 @@
                                     <input type="text" class="form-control" id="name"/>
                                 </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="type">-->
-<!--                                        <option value="">-&#45;&#45;请选择-&#45;&#45;</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="type">-->
+                            <!--                                        <option value="">-&#45;&#45;请选择-&#45;&#45;</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">
@@ -87,21 +87,21 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="UnCommonFiletypeTableToolbar" role="group">                            
-                            <if condition="chkCommission('/admin/file_type/add','/unCommonFiletype/add')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="UnCommonFiletype.openAddUnCommonFiletype()">
-                                    <i class="fa fa-plus"></i>添加
-                                </button>
-                            </if>                            
-                            <if condition="chkCommission('/admin/filetype/edit','/unCommonFiletype/update')">                                
-                                <button type="button" class="btn btn-sm btn-primary " onclick="UnCommonFiletype.openUnCommonFiletypeDetail()">
-                                    <i class="fa fa-edit"></i>修改
-                                </button>
-                            </if>                            
-                            <if condition="chkCommission('/admin/filetype/delete','/unCommonFiletype/delete')">                                
-                                <button type="button" class="btn btn-sm btn-primary " onclick="UnCommonFiletype.delete()">
-                                    <i class="fa fa-remove"></i>删除
-                                </button>
-                            </if>
+                            {if condition="chkCommission('/admin/file_type/add','/unCommonFiletype/add')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="UnCommonFiletype.openAddUnCommonFiletype()">
+                                <i class="fa fa-plus"></i>添加
+                            </button>
+                            {/if}                            
+                            {if condition="chkCommission('/admin/filetype/edit','/unCommonFiletype/update')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="UnCommonFiletype.openUnCommonFiletypeDetail()">
+                                <i class="fa fa-edit"></i>修改
+                            </button>
+                            {/if}                            
+                            {if condition="chkCommission('/admin/filetype/delete','/unCommonFiletype/delete')"}                             
+                            <button type="button" class="btn btn-sm btn-primary " onclick="UnCommonFiletype.delete()">
+                                <i class="fa fa-remove"></i>删除
+                            </button>
+                            {/if}
                         </div>
                         <table id="UnCommonFiletypeTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
                             <thead>

app/admin/view/role/index.html

@@ -25,26 +25,26 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="roleTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/role/add','/role/add')">                                
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Role.openAddRole()">
-                                    <i class="fa fa-plus"></i>添加
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/role/edit','/role/edit')"> 
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Role.openChangeRole()">
-                                    <i class="fa fa-edit"></i>修改
-                                </button>  
-                            </if>
-                            <if condition="chkCommission('/admin/role/remove','/role/remove')">   
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Role.delRole()">
-                                    <i class="fa fa-delete"></i>删除
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/role/setAuthority','/role/setAuthority')">   
-                                <button type="button" class="btn btn-sm btn-primary " onclick="Role.assign()">
-                                    <i class="fa fa-user-secret"></i>权限配置
-                                </button>
-                            </if>
+                            {if condition="chkCommission('/admin/role/add','/role/add')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Role.openAddRole()">
+                                <i class="fa fa-plus"></i>添加
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/role/edit','/role/edit')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Role.openChangeRole()">
+                                <i class="fa fa-edit"></i>修改
+                            </button>  
+                            {/if}
+                            {if condition="chkCommission('/admin/role/remove','/role/remove')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Role.delRole()">
+                                <i class="fa fa-delete"></i>删除
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/role/setAuthority','/role/setAuthority')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="Role.assign()">
+                                <i class="fa fa-user-secret"></i>权限配置
+                            </button>
+                            {/if}
                         </div>
                         <table id="roleTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
                             <thead>

app/admin/view/talent/base_reverify.html

@@ -166,41 +166,41 @@
                             </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','')">
+                            {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>
+                            {/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>

app/admin/view/talent/base_verify.html

@@ -166,41 +166,41 @@
                             </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','')">
+                            {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>
+                            {/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>

app/admin/view/talent/dept_verify.html

@@ -336,21 +336,21 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/talent/deptCheck','/talentInfo/depCheck')">
-                                <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/depExport','/talentInfo/depExport')">
-                                <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/depDownloadZip','/talentInfo/depDownload')">
-                                <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/deptCheck','/talentInfo/depCheck')"}
+                            <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/depExport','/talentInfo/depExport')"}
+                            <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/depDownloadZip','/talentInfo/depDownload')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                <i class="fa fa-download"></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>

app/admin/view/talent/re_verify.html

@@ -323,26 +323,26 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/talent/re_verify','/talentInfo/thirdCheck')">
+                            {if condition="chkCommission('/admin/talent/re_verify','/talentInfo/thirdCheck')"}
                                 <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/return_verify','/talentInfo/cancleThirdCheck')">
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/cancelThirdCheck','/talentInfo/cancleThirdCheck')"}
                                 <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.cancleThirdCheck()" id="">
                                     <i class="fa fa-file-excel-o"></i>&nbsp;撤销复核
                                 </button>
-                            </if>-->
-                            <if condition="chkCommission('/admin/talent/reVerifyExport','/talentInfo/thirdExport')">
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/reVerifyExport','/talentInfo/thirdExport')"}
                                 <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(3)" id="">
                                     <i class="fa fa-file-excel-o"></i>&nbsp;导出
                                 </button>
-                            </if>
-                            <if condition="chkCommission('/admin/talent/download','/talentInfo/thirdDownload')">
+                            {/if}
+                            {if condition="chkCommission('/admin/talent/download','/talentInfo/thirdDownload')"}
                                 <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
                                     <i class="fa fa-download"></i>&nbsp;下载
                                 </button>
-                            </if>
+                            {/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>

app/admin/view/talent_condition/index.html

@@ -20,21 +20,21 @@
                                     <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>-->
-<!--                                    <select class="form-control" id="type">-->
-<!--                                        <option value=""></option>-->
-<!--                                        <option value="1">晋江市现代产业体系人才</option>-->
-<!--                                        <option value="2">集成电路优秀人才</option>-->
+                            <!--                            <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="type">-->
+                            <!--                                        <option value=""></option>-->
+                            <!--                                        <option value="1">晋江市现代产业体系人才</option>-->
+                            <!--                                        <option value="2">集成电路优秀人才</option>-->
 
-<!--                                    </select>-->
-<!--                                </div>-->
-<!--                            </div>-->
+                            <!--                                    </select>-->
+                            <!--                                </div>-->
+                            <!--                            </div>-->
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -72,31 +72,31 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="IdentifyConditionTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/talent_condition/add','/identifyCondition/add')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.openAddIdentifyCondition()">
-                                    <i class="fa fa-plus"></i>&nbsp;添加
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/talent_condition/add','/identifyCondition/update')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.openIdentifyConditionDetail()">
-                                    <i class="fa fa-edit"></i>&nbsp;修改
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/talent_condition/delete','/identifyCondition/delete')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.delete()">
-                                    <i class="fa fa-remove"></i>&nbsp;删除
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/talent_condition/exportTemplate','/identifyCondition/importTemplate')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.download()">
-                                    <i class="fa fa-file-excel-o"></i>&nbsp;导入模板
-                                </button>
-                            </if>
-                            <if condition="chkCommission('/admin/talent_condition/import','/identifyCondition/import')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.import()">
-                                    <i class="fa fa-external-link"></i>&nbsp;导入
-                                </button>
-                            </if>
+                            {if condition="chkCommission('/admin/talent_condition/add','/identifyCondition/add')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.openAddIdentifyCondition()">
+                                <i class="fa fa-plus"></i>&nbsp;添加
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent_condition/add','/identifyCondition/update')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.openIdentifyConditionDetail()">
+                                <i class="fa fa-edit"></i>&nbsp;修改
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent_condition/delete','/identifyCondition/delete')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.delete()">
+                                <i class="fa fa-remove"></i>&nbsp;删除
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent_condition/exportTemplate','/identifyCondition/importTemplate')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.download()">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导入模板
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talent_condition/import','/identifyCondition/import')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="IdentifyCondition.import()">
+                                <i class="fa fa-external-link"></i>&nbsp;导入
+                            </button>
+                            {/if}
                         </div>
                         <table id="IdentifyConditionTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
                             <thead>

app/common/api/DictApi.php

@@ -292,6 +292,7 @@ class DictApi {
             case 13:
                 $stepName = '<span class="label label-primary">部门审核</span>';
                 break;
+            case -14:
             case 14:
             case 15:
                 $stepName = '<span class="label label-info">复核</span>';

app/common/api/TalentState.php

@@ -35,6 +35,7 @@ class TalentState {
     public const CERTIFICATED = 28; //已发放人才码
     public const BASE_VERIFY_FAIL = -1; //条件验证失败
     public const FST_VERIFY_FAIL = -2; //初审失败
+    public const REVERIFY_CANCEL = -14; //复审撤销
     public const RCRD_BASIC_SAVE = -2;
     public const RCRD_BASIC_NOTPASS = -1;
     public const RCRD_BASIC_NEED = 1;

app/common/controller/Api.php

@@ -244,6 +244,8 @@ class Api extends BaseController {
                         $new_item["stateName"] = '<span class="label label-primary">审核通过</span>';
                     } else if (in_array($item["state"], [TalentState::FST_SAVE, TalentState::SCND_SAVE])) {
                         $new_item["stateName"] = '<span class="label">保存未提交</span>';
+                    } else if (in_array($item["state"], [TalentState::REVERIFY_CANCEL])) {
+                        $new_item["stateName"] = '<span class="label label-primary">撤销审核</span>';
                     } else if (!$item["state"]) {
                         if ($item["typeFileId"]) {
                             $new_item["stateName"] = '<span class="label">添加附件</span>';

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

@@ -266,6 +266,51 @@ TalentInfo.openTalentInfoDetail = function () {
     }
 };
 
+TalentInfo.cancleThirdCheck = function () {
+    if (this.check()) {
+        var index = layer.open({
+            type: 1,
+            title: '撤销复核',
+            area: ['800px', '420px'], //宽高
+            fix: false, //不固定
+            maxmin: true,
+            content: '<form >\n' +
+                    '                    <div class="form-group" style="margin: 10px;">\n' +
+                    '                        <label for="checkMsg" class="control-label">撤销原因</label>\n' +
+                    '                        <textarea class="form-control" id="msg" rows="6"></textarea>\n' +
+                    '                    </div>\n' +
+                    '                </form>',
+            btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            yes: function (index, layero) {
+                var cancleMsg = $("#msg").val();
+                if (Feng.isEmptyStr(cancleMsg)) {
+                    Feng.error("撤销原因不能为空");
+                    return;
+                }
+                var operation = function () {
+                    var ajax = new $ax(Feng.ctxPath + "/admin/talent/cancleThirdCheck", function (data) {
+                        if (data.code == 200) {
+                            Feng.success(data.msg);
+                            TalentInfo.table.refresh();
+                            layer.close(index);
+                        } else {
+                            Feng.error(data.msg);
+                        }
+                        locked = false;
+                    }, function (data) {
+                        Feng.error("撤销复核失败!" + data.responseJSON.message + "!");
+                        locked = false;
+                    });
+                    ajax.setData({"id": TalentInfo.seItem.id, "checkMsg": cancleMsg})
+                    ajax.start();
+                };
+                Feng.confirm("一旦提交无法修改，确定要撤销吗?", operation);
+            }
+        });
+    }
+}
+
+
 /**
  * 修改驳回的字段及附件
  */