积分继续完善

app/admin/controller/IntegralVerify.php

@@ -105,7 +105,7 @@ class IntegralVerify extends AdminController {
 
     public function selectNeedCheckData() {
         $params = $this->request->param();
-        return json(["code" => 200, "obj" => VerifyApi::getPublicList($params)]);
+        return json(["code" => 200, "obj" => IntegralRecordApi::getPublicList($params)]);
     }
 
     /**
@@ -884,15 +884,15 @@ class IntegralVerify extends AdminController {
     }
 
     public function fstVerifyListExport() {
-        $this->commonExport(3);
+        $this->commonExport(1);
     }
 
     public function reVerifyListExport() {
-        $this->commonExport(5);
+        $this->commonExport(2);
     }
 
     public function preListExport() {
-        $this->commonExport(6);
+        $this->commonExport(3);
     }
 
     private function commonExport($process) {
@@ -900,14 +900,13 @@ class IntegralVerify extends AdminController {
         $fields = $params["export"];
         if (!$fields)
             return json(["msg" => "请选择要导出的数据"]);
-        $names = DictApi::getTalentFields(4);
-        $names["industryFieldNew"] = "产业领域";
+        $names = DictApi::getIntegralFields();
         $names["enterpriseName"] = "单位名称";
-        $names["enterpriseTag"] = "单位标签";
         $names["street"] = "所属镇街";
+        $names["project"] = "申报项目";
         $names["checkState"] = "审核状态";
         $names["checkMsg"] = "审核意见";
-        $list = VerifyApi::getExportDatas($process, $fields);
+        $list = IntegralRecordApi::getExportDatas($process, $fields);
         foreach ($fields as $field) {
             $columns[] = $names[$field];
         }

app/admin/view/integral_verify/fst_verify.html

@@ -6,6 +6,15 @@
         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">
@@ -22,67 +31,49 @@
                             <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="name" placeholder="">
-                                </div>
+                                    <input type="text" class="form-control" id="apply_year" 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 data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="card_number" placeholder="">
+                                    <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 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>
+                                    <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="nation">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">                         
+                            <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">手机
                                         </button>
                                     </div>
-                                    <select class="form-control" id="nationality">
-                                    </select>
-                                </div>
+                                    <input type="text" class="form-control" id="phone" placeholder="">
+                                </div>                            
                             </div>
-                            <div class="col-sm-3">                        
+                            <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">电子邮箱
                                         </button>
                                     </div>
-                                    <select class="form-control" id="talent_arrange">
-                                    </select>
-                                </div>
+                                    <input type="text" class="form-control" id="email" placeholder="">
+                                </div>                            
                             </div>
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
@@ -109,6 +100,7 @@
                                         <option value="">---请选择---</option>
                                         <option value="1">待审核</option>
                                         <option value="2">审核驳回</option>
+                                        <option value="3">审核失败</option>
                                     </select>
                                 </div>
                             </div>
@@ -122,31 +114,31 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="IntegralVerifyTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/talent/base_verify','')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.openCheckIntegralVerify()" 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="IntegralVerify.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="IntegralVerify.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="IntegralVerify.openCheckIntegralVerify()" 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="IntegralVerify.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="IntegralVerify.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="IntegralVerify.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="IntegralVerify.setNotPass()" id="">
-                                    <i class="fa fa-mobile"></i>&nbsp;审核不通过
-                                </button>
-                            </if>
+                            {/if}-->
+                            {if condition="chkCommission('/admin/talent/setNotPass','')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.setNotPass()" id="">
+                                <i class="fa fa-mobile"></i>&nbsp;审核不通过
+                            </button>
+                            {/if}
                         </div>
                         <table id="IntegralVerifyTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
                             <thead>
@@ -161,6 +153,48 @@
         </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="/talentInfoExport/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="phone"><span>手机号码</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="email"><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="shareholder"><span>是否股东</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="year"><span>申报年度</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="project"><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="IntegralVerify.checkAll()">全选</button>
+                            <button type="button" class="btn btn-success" onclick="IntegralVerify.unCheckAll()">反选</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="IntegralVerify.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 type="text/javascript">
     document.write('<script src="/static/modular/talentIdentify/integralMgr/IntegralVerify.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');

app/admin/view/integral_verify/pre_list.html

@@ -24,64 +24,39 @@
             <div class="ibox-content">
                 <div class="row row-lg">
                     <div class="col-sm-12">
-                        <input type="hidden" id="usertype" value="${user.type}">
+                        <input type="hidden" id="usertype" value="{$type}">
                         <input type="hidden" id="process" value="3">
                         <input type="hidden" id="title" value="人才积分库">
                         <div class="row">
                             <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="name" placeholder="" />
-                                </div>
+                                    <input type="text" class="form-control" id="apply_year" 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">
-                                            性别
+                                                type="button">姓名
                                         </button>
                                     </div>
-                                    <select class="form-control" id="sex">
-                                        <option value=""></option>
-                                        <option value="1">男</option>
-                                        <option value="2">女</option>
-                                    </select>
+                                    <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">证件号码
                                         </button>
                                     </div>
-                                    <select class="form-control" id="nation">
-                                    </select>
+                                    <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>
-                                    <input type="text" class="form-control" id="apply_year" placeholder="">
-                                </div>                            
-                            </div>
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -126,9 +101,8 @@
                                         <option value="21">待公示</option>
                                         <option value="23">公示中</option>
                                         <option value="24">待公布</option>
-                                        <option value="26">待发放人才码</option>
-                                        <option value="28">已发放人才码</option>
-                                        <option value="13">复核不通过</option>
+                                        <option value="26">待发放积分</option>
+                                        <option value="28">积分已到账</option>
                                         <option value="22">征信不通过</option>
                                         <option value="25">公示审核不通过</option>
                                         <option value="27">公布不通过</option>
@@ -207,7 +181,7 @@
                             {/if}
                             {if condition="chkCommission('/admin/integralVerify/prepareCertification','')"}
                             <button type="button" class="btn btn-sm btn-primary" onclick="IntegralInfo.showDataCheckModal(6)">
-                                <i class="fa fa-newspaper-o"></i>&nbsp;发放人才码
+                                <i class="fa fa-newspaper-o"></i>&nbsp;发放积分
                             </button>
                             {/if}
                             {if condition="chkCommission('/admin/integralVerify/prepareExport','')"}
@@ -474,66 +448,26 @@
                                 <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="apply_year"><span>申报年度</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="phone"><span>手机号码</span></li>
                                 <li style="width:24%"><input type="checkbox" name="export[]" value="email"><span>电子邮箱</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="highest_degree"><span>最高学历</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="graduate_school"><span>毕业院校</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="major"><span>专业</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="study_abroad"><span>是否有留学经历</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="abroad_school"><span>留学毕业院校</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="abroad_major"><span>留学专业</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="import_way"><span>引进方式</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="cur_entry_time"><span>本单位入职时间</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="position"><span>本单位现任职务</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="pro_qua"><span>职业资格</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="professional"><span>专业技术职称</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_batch"><span>入选名单的文件号及批次</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_pubtime"><span>福建省高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="fujian_highcert_exptime"><span>福建省高层次人才证书有效期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_pubtime"><span>泉州高层次人才证书发证日期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="quanzhou_highcert_exptime"><span>泉州高层次人才证书有效期</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_city"><span>入选来源地级市</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="source_county"><span>入选来源县市区</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange"><span>人才层次</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_arrange_category"><span>人才条款</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_condition"><span>认定条件</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="annual_salary"><span>年薪</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank"><span>开户银行</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank_number"><span>银行行号</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank_branch_name"><span>开户银行网点</span></li>
-                                <li style="width:24%"><input type="checkbox" name="export[]" value="bank_account"><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="shareholder"><span>是否股东</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="year"><span>申报年度</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="project"><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="IntegralInfo.checkAll()">全选</button>
-                            <button type="button" class="btn btn-success" onclick="IntegralInfo.unCheckAll()">反选</button>
+                            <button type="button" class="btn btn-primary" onclick="IntegralVerify.checkAll()">全选</button>
+                            <button type="button" class="btn btn-success" onclick="IntegralVerify.unCheckAll()">反选</button>
                         </div>
                     </div>
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="IntegralInfo.export(4)">导出</button>
+                <button type="button" class="btn btn-primary" onclick="IntegralVerify.export(3)">导出</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
             </div>
         </div>

app/admin/view/integral_verify/re_verify.html

@@ -6,6 +6,15 @@
         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">
@@ -22,67 +31,49 @@
                             <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="name" placeholder="">
-                                </div>
+                                    <input type="text" class="form-control" id="apply_year" 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 data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="card_number" placeholder="">
+                                    <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 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>
+                                    <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="nation">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">                         
+                            <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">手机
                                         </button>
                                     </div>
-                                    <select class="form-control" id="nationality">
-                                    </select>
-                                </div>
+                                    <input type="text" class="form-control" id="phone" placeholder="">
+                                </div>                            
                             </div>
-                            <div class="col-sm-3">                        
+                            <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 data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">电子邮箱
                                         </button>
                                     </div>
-                                    <select class="form-control" id="talent_arrange">
-                                    </select>
-                                </div>
+                                    <input type="text" class="form-control" id="email" placeholder="">
+                                </div>                            
                             </div>
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
@@ -108,7 +99,8 @@
                                     <select class="form-control" id="checkState">
                                         <option value="">---请选择---</option>
                                         <option value="1">待审核</option>
-                                        <option value="2">审核驳回</option>
+                                        <!--<option value="2">审核驳回</option>-->
+                                        <option value="3">审核失败</option>
                                     </select>
                                 </div>
                             </div>
@@ -122,31 +114,31 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="IntegralVerifyTableToolbar" role="group">
-                            <if condition="chkCommission('/admin/talent/base_verify','')">
-                                <button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.openCheckIntegralVerify()" 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="IntegralVerify.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="IntegralVerify.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="IntegralVerify.openCheckIntegralVerify()" 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="IntegralVerify.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="IntegralVerify.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="IntegralVerify.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="IntegralVerify.setNotPass()" id="">
-                                    <i class="fa fa-mobile"></i>&nbsp;审核不通过
-                                </button>
-                            </if>
+                            {/if}-->
+                            {if condition="chkCommission('/admin/talent/setNotPass','')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.setNotPass()" id="">
+                                <i class="fa fa-mobile"></i>&nbsp;审核不通过
+                            </button>
+                            {/if}
                         </div>
                         <table id="IntegralVerifyTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
                             <thead>
@@ -160,7 +152,48 @@
             </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="/talentInfoExport/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="phone"><span>手机号码</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="email"><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="shareholder"><span>是否股东</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="year"><span>申报年度</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="project"><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="IntegralVerify.checkAll()">全选</button>
+                            <button type="button" class="btn btn-success" onclick="IntegralVerify.unCheckAll()">反选</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="IntegralVerify.export(2)">导出</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 type="text/javascript">
     document.write('<script src="/static/modular/talentIdentify/integralMgr/IntegralVerify.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');

app/common/api/IntegralRecordApi.php

@@ -53,26 +53,114 @@ class IntegralRecordApi {
         return ["total" => $count, "rows" => $list];
     }
 
+    public static function getPublicList($params) {
+        $order = $params["order"];
+        $offset = $params["offset"];
+        $limit = $params["limit"];
+        $where = [];
+        $where[] = ["e.type", "=", session("user")["type"]];
+        if ($params["name"]) {
+            $where[] = ["ir.name", "like", "%" . $params["name"] . "%"];
+        }
+        if ($params["checkState"]) {
+            $where[] = ["ir.checkState", "=", $params["checkState"]];
+        }
+        $type = $params["type"];
+        switch ($type) {
+            case 1:
+            case 2:
+                $where[] = ["ir.checkState", "=", TalentState::REVERIFY_PASS];
+                break;
+            case 3:             //公示
+            case 7:             //公示预览
+                $where[] = ["ir.checkState", "=", TalentState::ZX_PASS];
+                break;
+            case 4:             //公示通过
+                $where[] = ["ir.checkState", "=", TalentState::ANNOUNCED];
+                break;
+            case 5:
+            case 8:             //公布预览
+                $where[] = ["ir.checkState", "=", TalentState::ANNOUNCED_REVERIFY_PASS];
+                break;
+            case 6:
+                $where[] = ["ir.checkState", "=", TalentState::PUBLISH_PASS];
+                break;
+        }
+        $enterprise_tag_kvs = DictApi::selectByParentCode("enterprise_tag");
+        $count = IntegralRecord::alias("ir")->leftJoin("un_enterprise e", "e.id=ir.enterprise_id")->where($where)->count();
+        $list = IntegralRecord::alias("ir")->leftJoin("un_enterprise e", "e.id=ir.enterprise_id")
+                        ->where($where)
+                        ->limit($offset, $limit)
+                        ->order("ir.createTime " . $order)->field("ir.*,e.name as enterpriseName,e.type as enterprise_type,enterpriseTag")->select()->toArray();
+        foreach ($list as &$item) {
+            $item["talent_type"] = $item["enterprise_type"] == 1 ? "晋江市现代产业体系人才" : "集成电路优秀人才";
+            $item["enterprise_tag"] = $enterprise_tag_kvs[$item["enterpriseTag"]];
+        }unset($item);
+        return ["total" => $count, "rows" => $list];
+    }
+
     public static function getListByProcess($params) {
         $process = $params["process"] ?: 1;
         $where = [];
         switch ($process) {
             case 1://初审阶段
-                $where[] = ["checkState", "in", [IntegralState::SUBMIT, IntegralState::VERIFY_FAIL]];
+                switch ($params["checkState"]) {
+                    case 1://待审核
+                        $where[] = ["ir.checkState", "=", IntegralState::SUBMIT];
+                        $where[] = ["tl.state", "=", IntegralState::SUBMIT];
+                        break;
+                    case 2://驳回
+                        $where[] = ["tl.new_state", "in", [IntegralState::SAVE]];
+                        $where[] = ["tl.state", "in", [IntegralState::VERIFY_REJECT]];
+                        break;
+                    case 3:
+                        //审核失败
+                        $where[] = ["ir.checkState", "in", [IntegralState::VERIFY_FAIL]];
+                        break;
+                    default:
+                        $where[] = ["tl.state", "in", [IntegralState::SUBMIT, IntegralState::VERIFY_REJECT, IntegralState::VERIFY_FAIL]];
+                }
                 break;
             case 2://复审阶段
-                $where[] = ["checkState", "in", [IntegralState::VERIFY_PASS, IntegralState::REVERIFY_FAIL]];
+                switch ($params["checkState"]) {
+                    case 1://待审核
+                        $where[] = ["tl.state", "=", IntegralState::VERIFY_PASS];
+                        break;
+                    case 3:
+                        //审核失败
+                        $where[] = ["tl.state", "in", [IntegralState::VERIFY_FAIL]];
+                        break;
+                    default:
+                        $where[] = ["tl.state", "in", [IntegralState::VERIFY_PASS, IntegralState::REVERIFY_FAIL]];
+                }
                 break;
             case 3://复审后征信公示等状态
-                $where[] = ["checkState", "in", [IntegralState::REVERIFY_PASS, IntegralState::ZX_PASS, IntegralState::ZX_FAIL, IntegralState::ANNOUNCED, IntegralState::ANNOUNCED_REVERIFY_PASS, IntegralState::ANNOUNCED_REVERIFY_FAIL, IntegralState::PUBLISH_PASS, IntegralState::PUBLISH_FAIL, IntegralState::SUCCESS]];
+                if ($params["checkState"]) {
+                    $where[] = ["ir.checkState", "=", $params["checkState"]];
+                } else {
+                    $where[] = ["ir.checkState", "in", [IntegralState::REVERIFY_PASS, IntegralState::ZX_PASS, IntegralState::ZX_FAIL, IntegralState::ANNOUNCED, IntegralState::ANNOUNCED_REVERIFY_PASS, IntegralState::ANNOUNCED_REVERIFY_FAIL, IntegralState::PUBLISH_PASS, IntegralState::PUBLISH_FAIL, IntegralState::SUCCESS]];
+                }
                 break;
         }
         $order = $params["order"] ?: "desc";
         $offset = $params["offset"] ?: 0;
         $limit = $params["limit"] ?: 10;
         $where[] = ["delete", "=", 0];
-        $count = IntegralRecord::where($where)->count();
-        $list = IntegralRecord::where($where)->field("*,if(updateTime is not null,updateTime,createTime) as orderTime")->limit($offset, $limit)->order("orderTime " . $order)->select();
+        if ($params["name"]) {
+            $where[] = ["ir.name", "like", "%{$params['name']}%"];
+        }
+        if ($params["card_number"]) {
+            $where[] = ["ir.card_number", "like", "%{$params['card_number']}%"];
+        }
+        if ($params["shareholder"]) {
+            $where[] = ["ir.shareholder", "=", $params['shareholder']];
+        }
+        $count = IntegralRecord::alias("ir")->where($where)
+                ->leftJoin("(select description,mainId,last_state,new_state,state,createTime from new_talent_checklog where createTime in (select max(createTime) from `new_talent_checklog` where `type`=20 and `step` is null and active=1 and typeFileId is null group by mainId,`type`)) tl", "`tl`.`mainId`=ir.id")
+                ->count();
+        $list = IntegralRecord::alias("ir")->where($where)
+                        ->leftJoin("(select description,mainId,last_state,new_state,state,createTime from new_talent_checklog where createTime in (select max(createTime) from `new_talent_checklog` where `type`=20 and `step` is null and active=1 and typeFileId is null group by mainId,`type`)) tl", "`tl`.`mainId`=ir.id")
+                        ->field("ir.*,tl.state as real_state,tl.last_state,if(ir.updateTime is not null,ir.updateTime,ir.createTime) as orderTime")->limit($offset, $limit)->order("orderTime " . $order)->select();
         foreach ($list as $key => $item) {
             $list[$key]["apply_year"] = BatchApi::getOne($item["batch_id"])["batch"];
             $tmp_items = [];
@@ -80,11 +168,11 @@ class IntegralRecordApi {
                 $integral_item_info = getCacheById("IntegralItem", $_item["item_id"]);
                 $tmp_items[] = sprintf("%s（%s%s）", $integral_item_info["name"], $_item["amount"], $integral_item_info["unit"]);
             }
-            $list[$key]["details"] = implode("，", $tmp_items);
+            $list[$key]["details"] = implode("；", $tmp_items);
             $list[$key]["type"] = session("user")["type"];
-            $last_log = TalentLogApi::getLastLog($item["id"], \app\common\state\ProjectState::INTEGRAL);
-            $list[$key]["real_state"] = $last_log["state"];
-            $list[$key]["last_state"] = $last_log["last_state"];
+            //$last_log = TalentLogApi::getLastLog($item["id"], \app\common\state\ProjectState::INTEGRAL);
+            //$list[$key]["real_state"] = $last_log["state"];
+            //$list[$key]["last_state"] = $last_log["last_state"];
         }
         return ["total" => $count, "rows" => $list];
     }
@@ -103,6 +191,71 @@ class IntegralRecordApi {
         return $info;
     }
 
+    /**
+     * 导出
+     * @param type $process
+     * @param type $params
+     * @return type
+     */
+    public static function getExportDatas($process, $params) {
+        $where[] = [];
+        //特殊字段处理
+        $fields = [];
+        $fields[] = "ir.id";
+        foreach ($params as $param) {
+            if (!in_array($param, ["enterpriseName", "street", "checkMsg", "project", "year"])) {
+                $fields[] = "ir." . $param;
+            }
+        }
+        $fields[] = "e.name as enterpriseName";
+        $fields[] = "e.street";
+        $fields[] = "tl.description as checkMsg";
+        $fields[] = "b.batch as year";
+        if (in_array("card_type", $params)) {
+            $cardTypes = DictApi::selectByParentCode("card_type");
+        }
+        if (in_array("street", $params)) {
+            $streets = DictApi::selectByParentCode("street");
+        }
+        $sex = [1 => "男", 2 => "女"];
+
+        $where = [];
+        $where[] = ["e.type", "=", session("user")["type"]];
+        switch ($process) {
+            case 1:
+                $where = "ir.checkState in (" . IntegralState::SUBMIT . "," . IntegralState::VERIFY_FAIL . ")";
+                break;
+            case 2:
+                $where = "ir.checkState in (" . IntegralState::VERIFY_PASS . "," . IntegralState::REVERIFY_FAIL . ")";
+                break;
+            case 3:
+                $where = "ir.checkState >= " . IntegralState::REVERIFY_PASS;
+                break;
+        }
+        $list = IntegralRecord::alias("ir")
+                        ->field($fields)
+                        ->leftJoin("un_enterprise e", "e.id=ir.enterprise_id")
+                        ->leftJoin("sys_batch b", "b.id=ir.batch_id")
+                        ->leftJoin("(select description,mainId,last_state,new_state,state,createTime from new_talent_checklog where createTime in (select max(createTime) from `new_talent_checklog` where `type`=20 and `step` is null and active=1 and typeFileId is null group by mainId,`type`)) tl", "`tl`.`mainId`=ir.id")
+                        //->leftJoin("new_talent_checklog tl", "tl.mainId=ti.id and tl.id=(select id from new_talent_checklog where mainId=ti.id and `step` is null and active=1 and typeFileId is null order by createTime desc limit 1)")
+                        ->whereRaw($where)
+                        ->select()->toArray();
+        foreach ($list as &$item) {
+            $item["card_type"] = $cardTypes[$item["card_type"]];
+            $item["street"] = $streets[$item["street"]];
+            $item["sex"] = $sex[$item["sex"]];
+            $item["checkState"] = IntegralState::getStateName($item["checkState"]);
+            $detail = \app\common\model\IntegralDetail::where("record_id", $item["id"])->select();
+            $tmp_items = [];
+            foreach ($detail as $_item) {
+                $integral_item_info = getCacheById("IntegralItem", $_item["item_id"]);
+                $tmp_items[] = sprintf("%s（%s%s）", $integral_item_info["name"], $_item["amount"], $integral_item_info["unit"]);
+            }
+            $item["project"] = implode("；", $tmp_items);
+        }unset($item);
+        return $list;
+    }
+
     /**
      * 计算积分
      * @param type $enterpriseId 企业id

app/common/controller/Api.php

@@ -19,6 +19,7 @@ use app\common\api\TalentConditionApi;
 use app\common\api\CompanyApi;
 use app\common\api\TalentState;
 use app\common\state\ProjectState;
+use app\common\state\IntegralState;
 
 /**
  * 需要权限的公共方法放这
@@ -118,8 +119,13 @@ class Api extends BaseController {
         foreach ($list as $key => $item) {
             switch ($item['type']) {
                 case 20:
-                    $new_item["stepName"] = \app\common\state\IntegralState::getLogStepName($item["state"]);
-                    $new_item["stateName"] = \app\common\state\IntegralState::getLogStateName($item["state"]);
+                    $new_item["stepName"] = IntegralState::getLogStepName($item["state"]);
+                    $new_item["stateName"] = IntegralState::getLogStateName($item["state"], $item["last_state"]);
+                    if ($item["last_state"] && $item["new_state"]) {
+                        $new_item["stateChange"] = sprintf("%s -> %s", IntegralState::getLogChangeName($item["last_state"]), IntegralState::getLogChangeName($item["new_state"], $item["last_state"]));
+                    } else {
+                        $new_item["stateChange"] = "";
+                    }
                     break;
                 case 10:
                     if ($item["category"] == "enterprise_change") {
@@ -544,9 +550,17 @@ class Api extends BaseController {
         if (!$files)
             die("没有附件不能打包下载");
 
-        $talent_info = \app\enterprise\model\Talent::findOrEmpty($id);
-        $enterprise_info = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
-        $zip_filename = sprintf("%s(%s)人才申报材料.zip", $talent_info["name"], $enterprise_info["name"]);
+        switch ($type) {
+            case ProjectState::TALENT:
+                $talent_info = \app\enterprise\model\Talent::findOrEmpty($id);
+                $enterprise_info = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
+                $zip_filename = sprintf("%s(%s)人才申报材料.zip", $talent_info["name"], $enterprise_info["name"]);
+                break;
+            case ProjectState::INTEGRAL:
+                $record = \app\common\api\IntegralRecordApi::getOne($id);
+                $zip_filename = sprintf("%s(%s)积分申报材料.zip", $record["name"], $record["enterprise"]["name"]);
+                break;
+        }
 
         $tmp_path = "storage/temp/";
         $tmp_file_path = $tmp_path . $zip_filename;

app/common/state/IntegralState.php

@@ -21,6 +21,43 @@ class IntegralState {
     public const PUBLISH_FAIL = 27; //公布不通过
     public const SUCCESS = 28; //积分兑现成功
 
+    public static function getStateName($state) {
+        switch ($state) {
+            case 1:
+                return "保存未提交";
+            case 2:
+                return "待初审";
+            case 3:
+                return "初审通过";
+            case 4:
+                return "初审驳回";
+            case 5:
+                return "初审不通过";
+            case 6:
+                return "复审通过";
+            case 7:
+                return "复审驳回";
+            case 8:
+                return "复审不通过";
+            case 21:
+                return "待公示";
+            case 22:
+                return "征信不通过";
+            case 23:
+                return "已公示";
+            case 24:
+                return "待公布";
+            case 25:
+                return "公示审核不通过";
+            case 26:
+                return "公布通过";
+            case 27:
+                return "公布不通过";
+            case 28:
+                return "积分已到账";
+        }
+    }
+
     public static function getLogStepName($state) {
         switch ($state) {
             case 3:
@@ -48,27 +85,83 @@ class IntegralState {
         }
     }
 
-    public static function getLogStateName($state) {
+    public static function getLogStateName($state, $last_state) {
+        if (in_array($state, [self::VERIFY_FAIL, self::REVERIFY_FAIL, self::ZX_FAIL, self::ANNOUNCED_REVERIFY_FAIL, self::PUBLISH_FAIL])) {
+            return '<span class="label label-danger">审核不通过</span>';
+        } else if (in_array($state, [self::VERIFY_PASS, self::REVERIFY_PASS])) {
+            return '<span class="label label-primary">审核通过</span>';
+        } else if (in_array($state, [self::VERIFY_REJECT, self::REVERIFY_REJECT])) {
+            return '<span class="label label-danger">审核驳回</span>';
+        } else if (in_array($state, [self::ZX_PASS, self::ANNOUNCED, self::ANNOUNCED_REVERIFY_PASS, self::PUBLISH_PASS, self::SUCCESS])) {
+            return '<span class="label label-primary">审核通过</span>';
+        } else if (in_array($state, [self::SAVE])) {
+            return '<span class="label">保存未提交</span>';
+        } else if ($state == 0) {
+            return '<span class="label">添加附件</span>';
+        } else {
+            if ($last_state == self::VERIFY_REJECT && $state == self::SUBMIT) {
+                return '<span class="label label-success">待审核（重新提交）</span>';
+            } else {
+                return '<span class="label label-success">待审核</span>';
+            }
+        }
+    }
+
+    public static function getLogChangeName($state, $last_state = 0) {
+        $str = "";
         switch ($state) {
-            case 1:
-                return '<span class="label">用户保存</span>';
-            case 2:
-                return '<span class="label">用户提交</span>';
-            case 3:
-                return '<span class="label">用户提交</span>';
-            case 4:
-                return '<span class="label">用户提交</span>';
-            case 5:
-                return '<span class="label">用户提交</span>';
-            case 6:
-                return '<span class="label">用户提交</span>';
-            case 7:
-                return '<span class="label">用户提交</span>';
-            case 8:
-                return '<span class="label">用户提交</span>';
-            default:
-                return '<span class="label">添加附件</span>';
+            case self::SAVE:
+                if ($last_state == self::VERIFY_REJECT) {
+                    $str = '<span class="label label-danger">初审驳回</span>';
+                } else {
+                    $str = '<span class="label">保存待提交</span>';
+                }
+                break;
+            case self::SUBMIT:
+                if ($last_state == self::REVERIFY_REJECT) {
+                    $str = '<span class="label label-danger">复审驳回</span>';
+                } else {
+                    $str = '<span class="label label-success">待初审</span>';
+                }
+                break;
+            case self::VERIFY_PASS:
+                $str = '<span class="label label-primary">待复审</span>';
+                break;
+            case self::VERIFY_FAIL:
+                $str = '<span class="label label-danger">初审不通过</span>';
+                break;
+            case self::REVERIFY_PASS:
+                $str = '<span class="label label-success">待核查征信</span>';
+                break;
+            case self::REVERIFY_FAIL:
+                $str = '<span class="label label-danger">复审不通过</span>';
+                break;
+            case self::ZX_PASS:
+                $str = '<span class="label label-success">待公示</span>';
+                break;
+            case self::ZX_FAIL:
+                $str = '<span class="label label-danger">征信不通过</span>';
+                break;
+            case self::ANNOUNCED:
+                $str = '<span class="label label-success">待公示审核</span>';
+                break;
+            case self::ANNOUNCED_REVERIFY_PASS:
+                $str = '<span class="label label-success">待公布</span>';
+                break;
+            case self::ANNOUNCED_REVERIFY_FAIL:
+                $str = '<span class="label label-danger">公示审核不通过</span>';
+                break;
+            case self::PUBLISH_PASS:
+                $str = '<span class="label label-success">积分待入账</span>';
+                break;
+            case self::PUBLISH_FAIL:
+                $str = '<span class="label label-danger">公布不通过</span>';
+                break;
+            case self::SUCCESS:
+                $str = '<span class="label label-primary">积分已入账</span>';
+                break;
         }
+        return $str;
     }
 
 }

public/static/modular/talentIdentify/integralMgr/IntegralVerify.js

@@ -7,6 +7,17 @@ var IntegralVerify = {
     table: null,
     layerIndex: -1
 };
+IntegralVerify.formParams = function () {
+    var queryData = {};
+    queryData['name'] = $("#name").val();
+    queryData['card_number'] = $("#card_number").val();
+    queryData['phone'] = $("#phone").val();
+    queryData['email'] = $("#email").val();
+    queryData['checkState'] = $("#checkState").val();
+    queryData['apply_year'] = $("#apply_year").val();
+    queryData['shareholder'] = $("#shareholder").val();
+    return queryData;
+}
 
 /**
  * 初始化表格的列
@@ -53,93 +64,32 @@ IntegralVerify.initColumn = function () {
         {title: '最新提交时间', field: 'new_submit_time', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
-                console.log(row)
-                if (typeof row.deptCheckState != "undefined") {
-                    if (row.deptCheckState == 12) {
-                        return "<span class='label label-primary'>部门已通过</span>"
-                    } else if (row.deptCheckState == 9) {
-                        if (row.lastState == 13) {
-                            return "<span class='label label-success'>待重新审核</span>"
-                        } else {
-                            return "<span class='label label-danger'>部门已驳回</span>"
-                        }
-                    } else {
-                        return "<span class='label label-success'>待审核</span>"
+                if (row.real_state != row.checkState) {
+                    switch (row.real_state) {
+                        case 4:
+                            return "<span class='label label-danger'>初审驳回</span>";
+                        case 7:
+                            //复审驳回
+                            return "<span class='label label-success'>待重新初审</span>";
                     }
                 } else {
-                    if (value == 2) {
-                        if (row.lastState == 4) {
-                            return "<span class='label label-success'>待审核（重新提交）</span>"
-                        }
-                        if (row.realState == 6) {
-                            return "<span class='label label-danger'>复审驳回</span>"
-                        }
-                        return "<span class='label label-success'>待审核</span>"
-                    }
-                    if (value == 3) {
-                        return "<span class='label label-success'>待复审</span>"
-                    }
-                    if (value == 5) {
-                        return "<span class='label label-success'>复审通过</span>"
-                    }
-                    if (value == 10) {
-                        return "<span class='label label-success'>待审核</span>"
-                    }
-                    if (value == 8) {
-                        if (row.realState == 11) {
-                            return "<span class='label label-danger'>初审驳回</span>"
-                        }
-                    }
-                    if (value == 9) {
-                        if (row.realState == 13) {
-                            return "<span class='label label-danger'>部门驳回</span>"
-                        } else if (row.realState == 15) {
-                            return "<span class='label label-danger'>复审驳回</span>"
-                        } else {
-                            if (row.lastState == 11) {
-                                return "<span class='label label-success'>待审核（重新提交）</span>"
+                    switch (value) {
+                        case 2:
+                            if (row.last_state == 4) {
+                                return "<span class='label label-success'>待初审（重新提交）</span>";
                             }
-                            return "<span class='label label-success'>待审核</span>"
-                        }
-                    }
-                    if (value == 16 || value == -1 || value == -2 || value == 7) {
-                        return "<span class='label label-danger'>审核不通过</span>"
-                    }
-                    if (value == 4) {
-                        if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 1) {
-                            return "<span class='label label-success'>上级驳回</span>"
-                        } else {
-                            return "<span class='label label-success'>待审核</span>"
-                        }
-                    }
-                    if (value == 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 == 12) {
-                        return "<span class='label label-success'>待复审</span>"
-                    }
-                    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 == 14) {
-                        return "<span class='label label-primary'>已通过</span>"
-                    }
-                    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>"
-                        }
+                            return "<span class='label label-success'>待初审</span>";
+                        case 3:
+                            return "<span class='label label-success'>待复审</span>";
+                        case 5:
+                            return "<span class='label label-danger'>初审不通过</span>";
+                        case 6:
+                            return "<span class='label label-success'>复审通过待核查征信</span>";
+                        case 8:
+                            return "<span class='label label-danger'>复审不通过</span>";
                     }
                 }
+
             }
         },
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "80px",
@@ -166,6 +116,74 @@ IntegralVerify.check = function () {
 };
 
 
+/**
+ * 查询人才认定申报列表
+ */
+IntegralVerify.search = function () {
+    IntegralVerify.table.refresh({query: IntegralVerify.formParams()});
+};
+
+/**
+ * 重置
+ */
+IntegralVerify.reset = function () {
+    $("#name").val("");
+    $("#card_number").val("");
+    $("#phone").val("");
+    $("#email").val("");
+    $("#checkState").val("");
+    $("#apply_year").val("");
+    $("#shareholder").val("");
+}
+/**
+ * 显示导出模态框
+ */
+IntegralVerify.showExportModal = function () {
+    $("#exportForm")[0].reset();
+    $("#commonExportModal").modal("show");
+}
+
+/**
+ * 导出提交
+ */
+IntegralVerify.export = function (process) {
+    var names = '';
+    var values = '';
+    var commonExport = "";
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            values = values + $(this).val() + ",";
+            names = names + $(this).next().text() + ",";
+        }
+    });
+    var queryData = IntegralVerify.formParams();
+    var process = parseInt($("#process").val());
+    switch (process) {
+        case 1:
+            commonExport = "fstVerifyListExport";
+            break;
+        case 2:
+            commonExport = "reVerifyListExport";
+            break;
+        case 3:
+            commonExport = "preListExport";
+            break;
+    }
+    $("#commonExportModal").modal('hide');
+    var params = $("#exportForm").serialize();
+    var url = "/admin/integralVerify/" + commonExport + "?" + params;
+    window.location.href = url;
+}
+/**
+ * 下载
+ */
+IntegralVerify.download = function () {
+    if (this.check()) {
+        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=20&id=" + IntegralVerify.seItem.id));
+    }
+}
+
+
 IntegralVerify.openCheckIntegralVerify = function () {
     var process = $("#process").val();
     var title = "";
@@ -455,6 +473,26 @@ IntegralVerify.getEnterprisePhones = function () {
     ajax.setData(IntegralVerify.formParams());
     ajax.start();
 }
+/**
+ * 全选
+ */
+IntegralVerify.checkAll = function () {
+    $("#field_info input").each(function () {
+        this.checked = true;
+    })
+}
+/**
+ * 反选
+ */
+IntegralVerify.unCheckAll = function () {
+    $("#field_info input").each(function () {
+        if (this.checked) {
+            this.checked = false;
+        } else {
+            this.checked = true;
+        }
+    })
+}
 
 $(function () {
     var defaultColunms = IntegralVerify.initColumn();

public/static/modular/talentIdentify/integralMgr/IntegralVerify_prepare.js

@@ -20,48 +20,47 @@ IntegralInfo.initColumn = function () {
     }
     ;
     return [
-        {field: 'selectItem', checkbox: true},
+        {field: 'selectItem', radio: true},
         {title: '申报年度', field: 'apply_year', visible: true, align: 'center', valign: 'middle', width: '80px'},
-        {title: '离职状态', field: 'active', visible: true, align: 'center', valign: 'middle', width: '80px',
+        {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: "100px",
+            formatter: function (value, row, index) {
+                if (row.sex == 1) {
+                    return value + '<span style="color:#6495ED">【男】</span>';
+                } else if (row.sex == 2) {
+                    return value + '<span style="color:#FF82AB">【女】</span>';
+                } else {
+                    return value;
+                }
+            }
+        },
+        {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
                 if (value == 1) {
-                    return '<span style="color:#6495ED">在职</span>';
+                    return '晋江市现代产业体系人才';
                 }
                 if (value == 2) {
-                    return '<span style="color:#FF82AB">离职</span>';
+                    return '集成电路优秀人才';
                 }
             }
         },
-        {title: '企业名称', field: 'enterprise_name', visible: true, align: 'center', valign: 'middle', width: '150px'},
-        {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: '120px',
+        {title: '是否股东', field: 'shareholder', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
-                if (row.sex == 1) {
-                    return value + '<span style="color:#6495ED">【男】</span>';
+                if (value == 1) {
+                    return '是';
                 }
-                if (row.sex == 2) {
-                    return value + '<span style="color:#FF82AB">【女】</span>';
+                if (value == 2) {
+                    return '否';
                 }
             }
         },
-        // {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',width:'120px',
-        //     formatter : function (value,row,index){
-        //         if(value==1){
-        //             return '晋江市现代产业体系人才';
-        //         }if(value==2){
-        //             return '集成电路优秀人才';
-        //         }
-        //     }
-        // },
-        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', width: '100px'},
-        {title: '单位标签', field: 'enterprise_tag', visible: isShow, align: 'center', valign: 'middle', width: '100px'},
-        {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', width: '150px', 'class': 'uitd_showTip'},
-        {title: '认定条件', field: 'talentConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px'},
+        {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
+        {title: '申报标准', field: 'details', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '首次提交时间', field: 'first_submit_time', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
         {title: '最新提交时间', field: 'new_submit_time', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
                 switch (value) {
-                    case 14:
+                    case 6:
                         return "<span class='label label-success'>待核查征信</span>";
                         break;
                     case 21:
@@ -74,10 +73,10 @@ IntegralInfo.initColumn = function () {
                         return "<span class='label label-success'>待公布</span>";
                         break;
                     case 26:
-                        return "<span class='label label-success'>待发放人才码</span>";
+                        return "<span class='label label-success'>待发放积分</span>";
                         break;
                     case 28:
-                        return "<span class='label label-primary'>已发放人才码</span>";
+                        return "<span class='label label-primary'>积分已到账</span>";
                         break;
                     case 13:
                         return "<span class='label label-danger'>复核失败</span>";

public/static/modular/talentIdentify/integralMgr/integralCommon.js

@@ -24,37 +24,11 @@ IntegralInfo.formParams = function () {
     var queryData = {};
     queryData['name'] = $("#name").val();
     queryData['card_number'] = $("#card_number").val();
-    queryData['sex'] = $("#sex").val();
-    queryData['nation'] = $("#nation").val();
-    queryData['nationality'] = $("#nationality").val();
-    queryData['province'] = $("#province").val();
-    queryData['politics'] = $("#politics").val();
-    queryData['enterprise_id'] = $("#enterprise_id").val();
-    queryData['industry_field'] = $("#industry_field").val();
-    queryData['source'] = $("#source").val();
-    queryData['city'] = $("#city").val();
-    queryData['import_way'] = $("#import_way").val();
-    queryData['highest_degree'] = $("#highest_degree").val();
-    queryData['major'] = $("#major").val();
-    queryData['title'] = $("#title").val();
-    queryData['study_abroad'] = $("#study_abroad").val();
     queryData['phone'] = $("#phone").val();
     queryData['email'] = $("#email").val();
-    queryData['breakFaith'] = $("#breakFaith").val();
-    queryData['talent_type'] = $("#talent_type").val();
-    queryData['talent_arrange'] = $("#talent_arrange").val();
-    queryData['street'] = $("#street").val();
-    if ($("#talent_condition").val() == null || $("#talent_condition").val() == '' || $("#talent_condition").val() == "null") {
-        queryData['talent_condition'] = "";
-    } else {
-        queryData['talent_condition'] = $("#talent_condition").val();
-    }
-    queryData['identifyMonth'] = $("#identifyMonth").val();
     queryData['checkState'] = $("#checkState").val();
-    queryData['isPublic'] = $("#isPublic").val();
-    queryData['active'] = $("#active").val()
     queryData['apply_year'] = $("#apply_year").val();
-    queryData['isEffect'] = $("#isEffect").val();
+    queryData['shareholder'] = $("#shareholder").val();
     return queryData;
 }
 
@@ -71,33 +45,11 @@ IntegralInfo.search = function () {
 IntegralInfo.reset = function () {
     $("#name").val("");
     $("#card_number").val("");
-    $("#sex").val("");
-    $("#nation").val("");
-    $("#nationality").val("");
-    $("#province").val("");
-    $("#politics").val("");
-    $("#enterprise_id").val("").trigger("chosen:updated");
-    $("#industry_field").val("");
-    $("#source").val("");
-    $("#fromCity").val("");
-    $("#import_way").val("");
-    $("#highest_degree").val("");
-    $("#major").val("");
-    $("#title").val("");
-    $("#study_abroad").val("");
     $("#phone").val("");
     $("#email").val("");
-    $("#breakFaith").val("");
-    $("#talent_type").val("");
-    $("#talent_arrange").val("");
-    $("#street").val("");
-    $("#talent_condition").val("").trigger("chosen:updated");
     $("#checkState").val("");
-    $("#identifyMonth").val("");
-    $("#isPublic").val("");
-    $("#active").val("")
     $("#apply_year").val("");
-    $("#isEffect").val("");
+    $("#shareholder").val("");
 }
 
 /**
@@ -157,7 +109,7 @@ IntegralInfo.init = function () {
  */
 IntegralInfo.download = function () {
     if (this.check()) {
-        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=1&id=" + IntegralInfo.seItem.id));
+        window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/common/api/downloadZip?type=20&id=" + IntegralInfo.seItem.id));
     }
 }
 
@@ -174,7 +126,7 @@ IntegralInfo.downloadPhoto = function () {
     for (let i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadPhotos?type=1&ids=" + ids));
+    window.location.href = encodeURI(encodeURI(Feng.ctxPath + "/api/commonDownload/downloadPhotos?type=20&ids=" + ids));
 }
 
 /**