浏览代码

积分一票否决

sugangqiang 2 年之前
父节点
当前提交
09f0d76322

+ 79 - 0
app/admin/controller/IntegralVerify.php

@@ -114,6 +114,85 @@ class IntegralVerify extends AdminController {
         return view("", ["enterprises" => $enterprises]);
     }
 
+    public function veto() {
+        $type = $this->request["type"];
+        $card_type = $this->request["card_type"];
+        $card_number = $this->request["card_number"];
+        $enterprise_id = $this->request["enterprise_id"];
+        $where = [];
+        $enterpriseList = [];
+        if ($type == 1) {
+            $where[] = ["enterprise_id", "=", $enterprise_id];
+            $enterpriseList = EnterpriseApi::getSimpleList([["type", "=", $this->user["type"]]]);
+        } else {
+            $where[] = ["card_type", "=", $card_type];
+            $where[] = ["card_number", "=", $card_number];
+            $whr[] = ["card_type", "=", $card_type];
+            $whr[] = ["card_number", "=", $card_number];
+            $whr[] = ["checkState", "=", IntegralState::SUCCESS];
+            $irecord = Db::table("new_integral_record")->where($whr)->find();
+        }
+        $veto = Db::table("new_integral_veto")->where($where)->find();
+        $veto["name"] = $irecord["name"];
+        return json(["code" => 200, "veto" => $veto, "enterprises" => $enterpriseList]);
+    }
+
+    public function submitVeto() {
+        $checkState = $this->request["checkState"];
+        $checkMsg = $this->request["checkMsg"];
+        $type = $this->request["type"];
+        $card_type = $this->request["card_type"];
+        $card_number = $this->request["card_number"];
+        $enterprise_id = $this->request["enterprise_id"];
+        $active = 0;
+        if ($checkState == 1)
+            $active = 1;
+        if (!$type)
+            return json(["msg" => "不确定的类型"]);
+        if (!$checkMsg)
+            return json(["msg" => "请填写意见"]);
+        if ($type == 1) {
+            if (!$enterprise_id)
+                return json(["msg" => "不确定的企业"]);
+            $where[] = ["enterprise_id", "=", $enterprise_id];
+        } else {
+            if (!$card_type || !$card_number)
+                return json(["msg" => "不确定的个人"]);
+            $where[] = ["card_type", "=", $card_type];
+            $where[] = ["card_number", "=", $card_number];
+        }
+        $veto = Db::table("new_integral_veto")->where($where)->find();
+        $checkActive = $veto["active"] == 1 ? 1 : 0;
+        if ($active == $checkActive && $active == 1) {
+            return json(["msg" => "已经被一票否决,无需重复操作"]);
+        }
+        if ($active == $checkActive && $active === 0) {
+            return json(["msg" => "未被一票否决或者已经恢复,操作失败"]);
+        }
+        try {
+            $data["active"] = $active;
+            $data["description"] = $checkMsg;
+            if ($veto) {
+                $data["id"] = $veto["id"];
+                $data["updateTime"] = date("Y-m-d H:i:s");
+                $data["updateUser"] = $this->user["uid"];
+            } else {
+                if ($type == 1) {
+                    $data["enterprise_id"] = $enterprise_id;
+                } else {
+                    $data["card_type"] = $card_type;
+                    $data["card_number"] = $card_number;
+                }
+                $data["createTime"] = date("Y-m-d H:i:s");
+                $data["createUser"] = $this->user["uid"];
+            }
+            Db::table("new_integral_veto")->save($data);
+            return json(["code" => 200, "msg" => "提交成功"]);
+        } catch (\think\db\exception\DbException $e) {
+            return json(["msg" => "数据异常,操作失败\n\r" . $e->getMessage()]);
+        }
+    }
+
     /**
      * 历史积分
      */

+ 2 - 2
app/admin/view/integral_verify/integral_log.html

@@ -80,9 +80,9 @@
                             <button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.openCheckIntegralVerify()" id="">
                                 <i class="fa fa-check"></i>&nbsp;查看
                             </button>
-                            <button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.showExportModal(1)" id="">
+                            <!--<button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.showExportModal(1)" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出
-                            </button>
+                            </button>-->
                             <button type="button" class="btn btn-sm btn-primary " onclick="IntegralVerify.download()" id="">
                                 <i class="fa fa-download"></i>&nbsp;下载
                             </button>

+ 22 - 224
app/admin/view/integral_verify/library.html

@@ -62,6 +62,19 @@
                                     </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="veto">
+                                        <option value="">否</option>
+                                        <option value="1">是</option>
+                                    </select>
+                                </div>
+                            </div>
                         </div>
                         <div class="row">
                             <div class="col-sm-12" style="text-align: center">
@@ -73,23 +86,23 @@
                         </div>
                         <div class="hidden-xs" id="IntegralInfoTableToolbar" role="group">
                             {if condition="chkCommission('/admin/integralVerify/libraryDetail','')"}
-                            <button type="button" class="btn btn-sm btn-primary" onclick="IntegralInfo.openIntegralInfoDetail()">
+                            <button type="button" class="btn btn-sm btn-primary" onclick="IntegralInfo.openIntegralLog()">
                                 <i class="fa fa-eye"></i>&nbsp;查看
                             </button>
                             {/if}
                             {if condition="chkCommission('/admin/integralVerify/libraryExport','')"}
-                            <button type="button" class="btn btn-sm btn-primary" onclick="IntegralInfo.showExportModal()">
+                            <!--<button type="button" class="btn btn-sm btn-primary" onclick="IntegralInfo.showExportModal()">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出
-                            </button>
+                            </button>-->
                             {/if}
-                            {if condition="chkCommission('/admin/integralVerify/veto','')"}
-                            <button type="button" class="btn btn-sm btn-danger" onclick="IntegralInfo.download()">
-                                <i class="fa fa-user-times"></i>&nbsp;一票否决
+                            {if condition="chkCommission('/admin/integralVerify/vetoEnterprise','')"}
+                            <button type="button" class="btn btn-sm btn-danger" onclick="IntegralInfo.openCheckModal(1)">
+                                <i class="fa fa-user-times"></i>&nbsp;一票否决(企业)
                             </button>
                             {/if}
-                            {if condition="chkCommission('/admin/integralVerify/cancelVeto','')"}
-                            <button type="button" class="btn btn-sm btn-info" onclick="IntegralInfo.download()">
-                                <i class="fa fa-eraser"></i>&nbsp;取消一票否决
+                            {if condition="chkCommission('/admin/integralVerify/vetoPersonal','')"}
+                            <button type="button" class="btn btn-sm btn-warning" onclick="IntegralInfo.openCheckModal(2)">
+                                <i class="fa fa-eraser"></i>&nbsp;一票否决(个人)
                             </button>
                             {/if}
                         </div>
@@ -109,222 +122,7 @@
         </div>
     </div>
 </div>
-<!--核查征信导入模态框-->
-<div class="modal fade " id="hczxModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
-    <div class="modal-dialog" role="document">
-        <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="hczxModalLabel">导入核查征信结果文件</h4>
-            </div>
-            <div class="modal-body">
-                <form id="importHczx-form" action="/admin/integralVerify/importHczx" method="post" enctype="multipart/form-data" target="hiddenIframe">
-                    <input type="file" id="file" name="file" onchange="$('#fileName').val($('#file').val());" class="hidden">
-                    <div class="form-group row">
-                        <div class="col-sm-1"></div>
-                        <div class="col-sm-11">
-                            <div class="input-group">
-                                <input type="text" class="form-control" id="fileName" name="fileName" placeholder="请选择需要上传的附件" readonly="readonly" >
-                                <span class="input-group-btn">
-                                    <button class="btn btn-secondary" type="button" onclick="$('#file').click()"><i class="fa fa-search"></i>选择文件</button>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="IntegralInfo.importHczxSubmit()">提交</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!--公示再审核模态框-->
-<div class="modal fade " id="checkModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
-    <div class="modal-dialog" role="document" >
-        <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="rejectModalLabel">公示再审核</h4>
-            </div>
-            <div class="modal-body">
-                <form id="checkForm" class="form-horizontal">
-                    <input type="hidden" id="mainId" name="id">
-                    <div class="form-group">
-                        <div class="row" style="margin-bottom: 10px;">
-                            <label class="col-sm-2 control-label">审核状态</label>
-                            <div class="col-sm-10">
-                                <select id="checkStateAfter" name="checkState" class="form-control">
-                                    <option value="">请选择</option>
-                                    <option value="1">审核通过</option>
-                                    <option value="2">审核不通过</option>
-                                </select>
-                            </div>
 
-                        </div>
-                        <div class="row">
-                            <label class="col-sm-2 control-label">审核意见</label>
-                            <div class="col-sm-10">
-                                <textarea id="msg" name="msg" class="form-control"></textarea>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="IntegralInfo.afterCheckSubmit()">提交</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--公布审核模态框-->
-<div class="modal fade " id="publishModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
-    <div class="modal-dialog" role="document" >
-        <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="rejectModalLabel">公布审核</h4>
-            </div>
-            <div class="modal-body">
-                <form id="checkForm" class="form-horizontal">
-                    <input type="hidden" id="mainId" name="id">
-                    <div class="form-group">
-                        <div class="row" style="margin-bottom: 10px;">
-                            <label class="col-sm-2 control-label">审核状态</label>
-                            <div class="col-sm-10">
-                                <select id="checkStatePublish" name="checkState" class="form-control" onchange="IntegralInfo.publishStateChange();">
-                                    <option value="">请选择</option>
-                                    <option value="1">审核通过</option>
-                                    <option value="2">审核不通过</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="row" style="display:none;margin-bottom:10px;">
-                            <label class="col-sm-2 control-label">公布批次</label>
-                            <div class="col-sm-10">
-                                <input type="text" id="publishBatch" class="form-control" placeholder='请输入公布日期(公布入选月份)'>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <label class="col-sm-2 control-label">审核意见</label>
-                            <div class="col-sm-10">
-                                <textarea id="publishMsg" name="msg" class="form-control"></textarea>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" onclick="IntegralInfo.singlePublishSubmit()">提交</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--需要核查征信的名单-->
-<div class="modal fade " id="exportCommonModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
-    <div class="modal-dialog modal-lg" role="document" style="min-width: 1200px;">
-        <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="exportCommonModalLabel">待核查征信名单</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal" style="padding-bottom: 5px;">
-                    <div class="form-group-sm ">
-                        <div class="row">
-                            <div class="rowGroup">
-                                <label class="col-sm-1 control-label">姓名</label>
-                                <div class="col-sm-3 spacing">
-                                    <input type="text" class="form-control input-sm"  id="pub_name" name="name" >
-                                </div>
-                            </div>
-                            <div class="rowGroup">
-                                <label class="col-sm-1 control-label">性别</label>
-                                <div class="col-sm-3 spacing">
-                                    <select  class="form-control input-sm"  id="pub_sex" name="sex" >
-                                        <option value="">请选择</option>
-                                        <option value="1">男</option>
-                                        <option value="2">女</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="rowGroup">
-                                <label class="col-sm-1 control-label">审核状态</label>
-                                <div class="col-sm-3 spacing">
-                                    <select type="text" class="form-control input-sm"  id="pub_checkState" name="checkState" >
-                                        <option value="">请选择</option>
-                                        <option value="2">审核不通过</option>
-                                        <option value="1">已通过</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-                <div class="toolbar" style="padding-bottom: 5px;text-align: center">
-                    <button type="button" class="btn btn-sm btn-info" onclick="IntegralInfo.prepareSearch()"><i class="fa fa-search"></i>搜索</button>
-                    <button type="button" class="btn btn-sm btn-danger" onclick="IntegralInfo.prepareReset()"><i class="fa fa-trash"></i>重置</button>
-                    <button id="checkAll" class="btn btn-secondary btn-sm btn-success"><i class="fa fa-check-square-o"></i>全选</button>
-                    <button id="uncheckAll" class="btn btn-secondary btn-sm btn-danger"><i class="fa fa-ban"></i>取消全选</button>
-                </div>
-                <table id="dataTable" class="table-condensed table-sm" style="font-size: 12px;"></table>
-                <form id="hczxForm" style="padding-top: 10px;">
-                    <div class="form-group form-inline">
-                        <label class=" control-label">是否发送短信</label>
-                        <input type="radio" name="isSend" id="isSend1" value="1" onclick="IntegralInfo.toggleMessage()" checked="checked"> 是
-                        <input type="radio" name="isSend" id="isSend2" value="2" onclick="IntegralInfo.toggleMessage()"> 否
-                    </div>
-                    <div class="form-group form-inline" id="messageEdit">
-                        <label class=" control-label" style="line-height: 40px;"><span style="color: red;">编辑短信内容</span>:您好!您提交申请的
-                            <input type="text" class="form-control input-sm" id="typeName" value="{$message.typeName}" maxlength="20">已完成初步审核,现通过
-                            <input type="text" class="form-control input-sm" id="web" placeholder="公示平台(如聚财网/人才晋江公众号)" value="{$message.address}" maxlength="40">将审核结果予以公示,公示时间
-                            <input type="text" class="form-control input-sm time" id="publicStartTime" maxlength="15">至<input type="text" class="form-control input-sm time" id="publicEndTime" maxlength="15">。公示期间如有异议,请及时向
-                            <input type="text" class="form-control input-sm" id="dep" placeholder="xx单位/部门" value="{$message.dep}" maxlength="30">反映。电话
-                            <input type="text" class="form-control input-sm" id="fyphone" value="{$message.phone}" maxlength="30">,电子邮箱
-                            <input type="text" class="form-control input-sm" id="fyemail" value="{$message.email}" maxlength="20">。
-                        </label>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="hczxButton" onclick="IntegralInfo.checkExport()">导出</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </div>
-        </div>
-    </div>
-</div>
-<!--核查征信不通过-->
-<div class="modal fade " id="hczxRejectModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
-    <div class="modal-dialog" role="document">
-        <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="hczxRejectModalLabel">核查征信不通过</h4>
-            </div>
-            <div class="modal-body">
-                <form id="hczxRejectForm" class="form-horizontal">
-                    <input type="hidden" name="hczxId" id="hczxId">
-                    <div class="form-group">
-                        <div class="row">
-                            <label class="col-sm-2 control-label">审核意见</label>
-                            <div class="col-sm-10">
-                                <textarea id="hczxMsg" name="hczxMsg" class="form-control"></textarea>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary"  onclick="IntegralInfo.hczxReject()">提交</button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-            </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">

+ 15 - 3
app/common/api/IntegralRecordApi.php

@@ -270,16 +270,28 @@ class IntegralRecordApi {
         if ($params["enterprise_id"]) {
             $where[] = ["ir.enterprise_id", "=", $params['enterprise_id']];
         }
+        if ($params["veto"]) {
+            $having = "if(min_shareholder=1 and enterprise_veto = 1,true,false) or personal_veto = 1";
+        } else {
+            $having = "if(min_shareholder=1 and enterprise_veto = 1,false,true) and personal_veto = 0";
+        }
         $count = IntegralRecord::alias("ir")->where($where)
                 ->leftJoin("sys_batch b", "b.id=ir.batch_id")
                 ->leftJoin("un_enterprise e", "e.id=ir.enterprise_id")
-                ->group("concat(card_type,card_number)")
+                ->leftJoin("new_integral_veto iv1", "iv1.enterprise_id=ir.enterprise_id")
+                ->leftJoin("new_integral_veto iv2", "md5(concat(iv2.card_type,iv2.card_number))=md5(concat(ir.card_type,ir.card_number))")
+                ->field("min(shareholder) as min_shareholder,if(iv1.`active`=1,iv1.`active`,0) as enterprise_veto,if(iv2.`active`=1,iv2.`active`,0) as personal_veto")
+                ->group("concat(ir.card_type,ir.card_number)")
+                ->having($having)
                 ->count();
         $list = IntegralRecord::alias("ir")->where($where)
                         ->leftJoin("sys_batch b", "b.id=ir.batch_id")
                         ->leftJoin("un_enterprise e", "e.id=ir.enterprise_id")
-                        ->group("concat(card_type,card_number)")
-                        ->field("ir.name,ir.card_type,ir.card_number,ir.enterprise_id,sum(ir.totalPoints) as totalPoints,e.name as enterpriseName")->limit($offset, $limit)->order("b.batch " . $order)->select();
+                        ->leftJoin("new_integral_veto iv1", "iv1.enterprise_id=ir.enterprise_id")
+                        ->leftJoin("new_integral_veto iv2", "md5(concat(iv2.card_type,iv2.card_number))=md5(concat(ir.card_type,ir.card_number))")
+                        ->group("concat(ir.card_type,ir.card_number)")
+                        ->having($having)
+                        ->field("min(shareholder) as min_shareholder,ir.name,ir.card_type,ir.card_number,ir.enterprise_id,sum(ir.totalPoints) as totalPoints,e.name as enterpriseName,if(iv1.`active`=1,iv1.`active`,0) as enterprise_veto,iv1.description as enterprise_veto_msg,if(iv2.`active`=1,iv2.`active`,0) as personal_veto,iv2.description as personal_veto_msg")->limit($offset, $limit)->order("b.batch " . $order)->select();
         return ["total" => $count, "rows" => $list];
     }
 

+ 117 - 655
public/static/modular/talentIdentify/integralMgr/IntegralVerify_library.js

@@ -56,6 +56,11 @@ IntegralInfo.initColumn = function () {
         }
     ];
 };
+IntegralInfo.openIntegralLog = function () {
+    if (this.check()) {
+        IntegralInfo.showIntegralLog(IntegralInfo.seItem.card_type, IntegralInfo.seItem.card_number);
+    }
+}
 
 /**
  * 显示积分记录
@@ -72,6 +77,7 @@ IntegralInfo.showIntegralLog = function (card_type, card_number) {
     });
 }
 
+
 /**
  * 检查是否选中
  */
@@ -105,674 +111,145 @@ IntegralInfo.openIntegralInfoDetail = function () {
     }
 };
 
-IntegralInfo.prepareSearch = function () {
-    var sex = $("#pub_sex").val();
-    var checkState = $("#pub_checkState").val();
-    var name = $("#pub_name").val();
-    $('#dataTable').bootstrapTable("refresh", {"query": {"sex": sex, "checkState": checkState, "name": name}});
-}
-
-IntegralInfo.prepareReset = function () {
-    $("#pub_sex").val("");
-    $("#pub_checkState").val("");
-    $("#pub_name").val("");
-}
-
-
-/**
- * 查询需要处理的数据
- * @param type
- */
-IntegralInfo.showDataCheckModal = function (type) {
-    $("#hczxForm").css("display", "none");
-    switch (type) {
-        case 1:                     //待核查征信名单-导出
-            $("#hczxButton").attr("onclick", "IntegralInfo.checkExport()").text("导出");
-            $("#exportCommonModalLabel").text("待核查征信名单");
-            break;
-        case 2:                     //待核查征信名单-核查征信通过
-            $("#hczxButton").attr("onclick", "IntegralInfo.hczxPass()").text("提交");
-            $("#exportCommonModalLabel").text("待核查征信名单");
-            break;
-        case 3:                     //公示(批量)
-            $("#hczxButton").attr("onclick", "IntegralInfo.public()").text("公示");
-            $("#exportCommonModalLabel").text("待公示名单");
-            $("#hczxForm").css("display", "block");
-            $(".time").each(function () {
-                laydate.render({
-                    elem: "#" + $(this).attr("id")
-                    , type: 'date'
-                    , format: 'yyyy年MM月dd日'
-                });
-            });
-            break;
-        case 4:                     //公示通过(批量)
-            $("#hczxButton").attr("onclick", "IntegralInfo.publicPass()").text("提交");
-            $("#exportCommonModalLabel").text("公示通过名单");
-            break;
-        case 5:                     //待公布名单
-            $("#hczxButton").attr("onclick", "IntegralInfo.publish()").text("公布");
-            $("#exportCommonModalLabel").text("待公布名单");
-            break;
-        case 6:                     //待发放人才码名单
-            $("#hczxButton").attr("onclick", "IntegralInfo.sendCard()").text("提交");
-            $("#exportCommonModalLabel").text("待发放积分名单");
-            break;
-        case 7:                     //公示名单预览
-            $("#hczxButton").attr("onclick", "IntegralInfo.needPublicExport()").text("导出");
-            $("#exportCommonModalLabel").text("待公示名单");
-            break;
-        case 8:                     //公布预览
-            $("#hczxButton").attr("onclick", "IntegralInfo.publishExportBefore()").text("导出");
-            $("#exportCommonModalLabel").text("待公布名单");
-            break;
-    }
-    $('#dataTable').bootstrapTable('destroy');
-    $('#dataTable').bootstrapTable({
-        url: "/admin/integralVerify/selectNeedCheckData?type=" + type,
-        method: 'POST',
-        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
-        showRefresh: false, // 是否显示刷新按钮
-        clickToSelect: true, // 是否启用点击选中行
-        singleSelect: false, // 设置True 将禁止多选
-        striped: true, // 是否显示行间隔色
-        pagination: true, // 设置为 true 会在表格底部显示分页条
-        paginationHAlign: "left",
-        paginationDetailHAlign: "right",
-        sidePagination: "client", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
-        pageNumber: 1, //初始化加载第一页,默认第一页
-        pageSize: 10, //每页的记录行数(*)
-        pageList: [10, 25, 50, 100, 500, 1000, 1500], //可供选择的每页的行数(*)
-        maintainSelected: true, //全表全选需要开启
-        showColumns: false,
-        responseHandler: function (res) {
-            $("#exportCommonModal").modal("show");
-            return res.obj.rows;
-        },
-        columns:
-                [
-                    {field: "selectItem", checkbox: true},
-                    {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: "20%"},
-                    {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', width: "30%"},
-                    {title: '企业名称', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "40%"},
-                    {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "10%",
-                        formatter: function (value, row, index) {
-                            if (value == 8 || value == 22 || value == 25 || value == 27) {
-                                return "<span style='color: #ed5565;'>审核不通过</span>";
-                            }
-                            if (value == 6 || value == 21 || value == 23 || value == 24 || value == 26 || value == 28) {
-                                return "<span style='color: #1ab394;'>审核通过</span>";
+IntegralInfo.openCheckModal = function (type) {
+    if ((type == 2 && this.check()) || type == 1) {
+        var selected = $('#' + this.id).bootstrapTable('getSelections');
+        selected = selected.length > 0 ? selected[0] : [];
+        var subtitle = type == 2 ? "个人" : "企业";
+        var enterprise_id = selected.enterprise_id;
+        var card_type = selected.card_type;
+        var card_number = selected.card_number;
+        var ajax = new $ax("/admin/integralVerify/veto", function (data) {
+            if (data.code == 200) {
+                layer.open({
+                    type: 1,
+                    id: "newVetoModalForm",
+                    title: '一票否决(' + subtitle + ")",
+                    area: ['800px', '350px'], //宽高
+                    fix: false, //不固定
+                    shade: 0,
+                    maxmin: true,
+                    content: IntegralInfo.createVetoFormModal(),
+                    btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                    btnAlign: 'c',
+                    zIndex: layer.zIndex,
+                    success: function (layero, index) {
+                        $("#vetoForm")[0].reset();
+                        $("#vetoType").html('<option value="' + type + '">' + subtitle + '</option>');
+                        var veto = data.veto;
+                        var list = "";
+                        if (type == 1) {
+                            for (var i in data.enterprises) {
+                                list += '<option value="' + data.enterprises[i].id + '" ' + (typeof veto.enterprise_id != "undefined" && veto.enterprise_id == data.enterprises[i].id ? "selected" : "") + '>' + data.enterprises[i].name + '</option>';
                             }
+                        } else {
+                            list += '<option>' + veto.name + '</option>';
                         }
+                        $("#vetoObj").html(list);
+                        $("#vetoCheckState").val(veto.active == 1 || typeof veto.active == "undefined" ? 1 : 2);
+                        $("#vetoMsg").html(veto.description);
                     },
-                ]
-
-    });
-}
-
-/**
- * 选择导出提交
- */
-IntegralInfo.checkExport = function () {
-    var selected = $('#dataTable').bootstrapTable('getSelections');
-    if (!selected || selected.length < 1) {
-        Feng.info("请至少选择一行数据!");
-        return;
-    }
-    var ids = "";
-    for (var i = 0; i < selected.length; i++) {
-        ids = ids + selected[i].id + ",";
-    }
-    window.location.href = Feng.ctxPath + "/admin/integralVerify/prepareHczx?ids=" + ids;
-}
-
-/**
- * 核查征信批量通过提交
- */
-IntegralInfo.hczxPass = function () {
-    var selected = $('#dataTable').bootstrapTable('getSelections');
-    if (!selected || selected.length < 1) {
-        Feng.info("请至少选择一行数据!");
-        return;
-    }
-    var ids = "";
-    for (var i = 0; i < selected.length; i++) {
-        ids = ids + selected[i].id + ",";
-    }
-    var operation = function () {
-        var ajax = new $ax("/admin/integralVerify/hczxPass", function (data) {
-            if (data.code == 200) {
-                Feng.success(data.msg);
-                IntegralInfo.table.refresh();
-                $("#exportCommonModal").modal("hide");
-            } else {
-                Feng.error(data.msg);
-            }
-        }, function (data) {
-            Feng.error("核查征信失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("ids", ids);
-        ajax.start();
-    }
-    Feng.confirm("一旦提交无法修改,确定提交吗?", operation);
-}
-
-/**
- * 显示核查征信驳回模态框
- */
-IntegralInfo.showHczxRejectModal = function () {
-    if (this.check()) {
-        if (IntegralInfo.seItem.checkState != 6) {
-            Feng.info("当前记录不是待核查征信状态,无法核查");
-            return;
-        }
-        $("#hczxId").val(IntegralInfo.seItem.id);
-        $("#hczxMsg").val("");
-        $("#hczxRejectModal").modal("show");
-    }
-}
-
-/**
- * 核查征信驳回提交
- */
-IntegralInfo.hczxReject = function () {
-    var id = $("#hczxId").val();
-    var msg = $("#hczxMsg").val();
-    if (msg == null || msg == '') {
-        Feng.info("请填写失信原因");
-        return;
-    }
-    var operation = function () {
-        var ajax = new $ax("/admin/integralVerify/hczxReject", function (data) {
-            if (data.code == 200) {
-                Feng.success(data.msg);
-                IntegralInfo.table.refresh();
-                $("#hczxRejectModal").modal("hide");
+                    yes: function (index, layero) {
+                        IntegralInfo.submitVeto(index, type);
+                    }
+                });
             } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
-            Feng.error("核查征信失败!" + data.responseJSON.message + "!");
+            Feng.error("校验失败!" + data.responseJSON.message + "!");
         });
-        ajax.setData({"id": id, "outMsg": msg});
+        ajax.setData({type: type, card_type: card_type, card_number: card_number, enterprise_id: enterprise_id})
         ajax.start();
     }
-    Feng.confirm("一旦提交无法修改,确定提交吗?", operation);
 }
 
-
-// /**
-//  * 导入核查征信名单
-//  * @param type
-//  */
-// IntegralInfo.importHczx = function(){
-//     $("#importHczx-form")[0].reset();
-//     $("#hczxModal").modal("show");
-// }
-// /**
-//  * 导入提交
-//  */
-// IntegralInfo.importHczxSubmit = function(){
-//     $("#importHczx-form")[0].submit();
-// }
-
-/**
- * 是否发送短信
- */
-IntegralInfo.toggleMessage = function () {
-    var isMessage = $("input[name='isSend']:checked").val();
-    if (isMessage == 1) {
-        $("#messageEdit").css("display", "block");
-    } else if (isMessage == 2) {
-        $("#messageEdit").css("display", "none");
-    }
-}
-
-
+var locked = false;
 /**
- * 公示预览
+ * 提交一票否决
  */
-IntegralInfo.needPublicExport = function () {
-    var selected = $('#dataTable').bootstrapTable('getSelections');
-    if (!selected || selected.length < 1) {
-        Feng.info("请至少选择一行数据!");
-        return;
-    }
-    var ids = "";
-    for (var i = 0; i < selected.length; i++) {
-        ids = ids + selected[i].id + ",";
-    }
-    var operation = function () {
-        $("#exportCommonModal").modal("hide");
-        window.location.href = encodeURI(encodeURI("/admin/integralVerify/publicExportBefore?ids=" + ids));
-    }
-    Feng.confirm("确定要公示预览吗?", operation);
-}
-
-/**
- * 公示
- */
-IntegralInfo.public = function () {
-    var selected = $('#dataTable').bootstrapTable('getSelections');
-    if (!selected || selected.length < 1) {
-        Feng.info("请至少选择一行数据!");
-        return;
-    }
-    var ids = "";
-    for (var i = 0; i < selected.length; i++) {
-        ids = ids + selected[i].id + ",";
-    }
-    var isMessage = $("input[name='isSend']:checked").val();
-    var typeName = $("#typeName").val();
-    var address = $("#web").val();
-    var publicStartTime = $("#publicStartTime").val();
-    var publicEndTime = $("#publicEndTime").val();
-    var dep = $("#dep").val();
-    var phone = $("#fyphone").val();
-    var email = $("#fyemail").val();
-    if (isMessage == 1) {
-        if (typeName == null || typeName == '') {
-            Feng.info("请填写公示类型");
-            return;
-        }
-        if (address == null || address == '') {
-            Feng.info("请填写公示平台");
-            return;
-        }
-        if (publicStartTime == null || publicStartTime == '') {
-            Feng.info("请填写公示开始时间");
-            return;
-        }
-        if (publicEndTime == null || publicEndTime == '') {
-            Feng.info("请填写公示截止时间");
-            return;
-        }
-        if (dep == null || dep == '') {
-            Feng.info("请填写反映单位");
-            return;
-        }
-        if (phone == null || phone == '') {
-            Feng.info("请填写联系电话");
-            return;
-        }
-        if (email == null || email == '') {
-            Feng.info("请填写联系邮箱");
-            return;
-        }
-    }
-    var operation = function () {
-        var index = layer.open({
-            type: 1,
-            title: '公示',
-            area: ['300px', '220px'], //宽高
-            fix: false, //不固定
-            maxmin: true,
-            content: "<input class='form-control' id='publicBatchId' style='width:90%;margin: 10px' placeholder='请输入公示批次'>",
-            btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
-            btnAlign: 'c',
-            success: function () {
-                laydate.render({elem: "#publicBatchId", type: 'month', trigger: 'click', format: "yyyyMM"});
-            },
-            yes: function (index, layero) {
-                var month = $("#publicBatchId").val();
-                if (Feng.isEmptyStr(month)) {
-                    Feng.info("请填写公示批次");
-                    return;
-                }
-                layer.close(index);
-                var ajax = new $ax("/admin/integralVerify/preparePublic", function (data) {
-                    if (data.code == 200) {
-                        Feng.success(data.msg);
-                        IntegralInfo.table.refresh();
-                        $("#exportCommonModal").modal("hide");
-                    } else {
-                        Feng.error(data.msg);
-                    }
-                }, function (data) {
-                    Feng.error("公示失败!" + data.responseJSON.message + "!");
-                });
-                ajax.set("ids", ids);
-                ajax.set("typeName", typeName);
-                ajax.set("address", address);
-                ajax.set("publicStartTime", publicStartTime);
-                ajax.set("publicEndTime", publicEndTime);
-                ajax.set("dep", dep);
-                ajax.set("phone", phone);
-                ajax.set("email", email);
-                ajax.set("isMessage", isMessage);
-                ajax.set("batch", month);
-                ajax.start();
-            }
-        });
-    }
-    Feng.confirm("确定要公示吗?", operation);
-}
-
-
-
-//已公示的数据根据公示批次公示导出
-IntegralInfo.publicExport = function (type) {
-    var url = "", dateType = '', format = '';
-    if (type == 1) {         //公示导出
-        url = "/admin/integralVerify/publicExport";
-        dateType = 'month';
-        format = "yyyyMM";
-    } else if (type == 2) {     //公布导出
-        url = Feng.ctxPath + "/admin/integralVerify/publishExport";
-        dateType = 'date';
-        format = "yyyy-MM-dd";
-    }
-    layer.open({
-        type: 1,
-        title: type == 1 ? '公示导出' : "公布导出",
-        area: ['800px', '300px'], //宽高
-        fix: false, //不固定
-        maxmin: true,
-        content: "<form id=\"publicExportForm\" action=\"" + url + "\" target=\"hiddenIframe\" class=\"form-horizontal \" style='padding-top: 10px;'>\n" +
-                "                    <div class=\"form-group col-sm-12\">\n" +
-                "                        <div class=\"row\">\n" +
-                "                            <label class=\"col-sm-2 control-label\">开始时间</label>\n" +
-                "                            <div class=\"col-sm-4\">\n" +
-                "                                <input type=\"text\" id=\"startTime\" name=\"startTime\" time=\"time\" format=\"month\" class=\"form-control\">\n" +
-                "                            </div>\n" +
-                "                            <label class=\"col-sm-2 control-label\">截止时间</label>\n" +
-                "                            <div class=\"col-sm-4\">\n" +
-                "                                <input type=\"text\" id=\"endTime\" name=\"endTime\" time=\"time\" format=\"month\" class=\"form-control\">\n" +
-                "                            </div>\n" +
-                "                        </div>\n" +
-                "                    </div>\n" +
-                "                </form>",
-        btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
-        btnAlign: 'c',
-        success: function (index, layero) {
-            $("#publicExportForm")[0].reset();
-            $("input[time='time']").each(function () {
-                laydate.render({
-                    elem: "#" + $(this).attr("id")
-                    , type: dateType
-                    , format: format
-                    , trigger: 'click'
-                });
-            });
-        },
-        yes: function (index) {
-            var startTime = $("#startTime").val();
-            var endTime = $("#endTime").val();
-            if (startTime == null || startTime == '') {
-                Feng.info("请选择开始时间");
-                return;
-            }
-            if (endTime == null || endTime == '') {
-                Feng.info("请选择结束时间");
-                return;
-            }
-            $("#publicExportForm")[0].submit();
-            layer.close(index)
-        }
-    });
-}
-/**
- * 公示再审核
- */
-IntegralInfo.afterCheck = function () {
-    if (this.check()) {
-        if (IntegralInfo.seItem.checkState != 23) {
-            Feng.info("当前记录不是公示中状态,无法审核");
-            return;
-        }
-        if (IntegralInfo.seItem.outMsg != null && IntegralInfo.seItem.outMsg != '') {
-            Feng.info("当前申请人核查征信不通过,请谨慎选择审核状态!");
-        }
-        if (IntegralInfo.seItem.checkState == 16) {
-            var html = '<option value="">请选择</option>\n' +
-                    '       <option value="2">驳回/恢复</option>';
-            $("#checkStateAfter").empty().append(html);
-        }
-        if (IntegralInfo.seItem.checkState == 14) {
-            var html = '<option value="">请选择</option>\n' +
-                    '       <option value="-1">审核不通过</option>' +
-                    '       <option value="2">驳回</option>';
-            $("#checkStateAfter").empty().append(html);
-        }
-        $("#checkForm")[0].reset();
-        $("#mainId").val(IntegralInfo.seItem.id);
-        $("#checkModal").modal("show");
-    }
-}
-/**
- * 公示后审核提交
- */
-IntegralInfo.afterCheckSubmit = function () {
-    var checkState = $("#checkStateAfter").val();
-    var msg = $("#msg").val();
+IntegralInfo.submitVeto = function (i, type) {
+    var checkState = $("#vetoCheckState").val();
+    var checkMsg = $("#vetoMsg").val();
+    var vetoObj = $("#vetoObj").val();
     if (checkState == null || checkState == '') {
-        Feng.info("请选择审核状态");
+        Feng.info("请选择否决状态");
         return;
     }
-    if (msg == null || msg == '') {
-        Feng.info("请填写审核意见");
+    if (checkMsg == null || checkMsg == '') {
+        Feng.info("请填写意见");
         return;
     }
-    var operation = function () {
-        var ajax = new $ax(Feng.ctxPath + "/admin/integralVerify/prepareCheck", function (data) {
-            if (data.code == 200) {
-                Feng.success(data.msg);
-                IntegralInfo.table.refresh();
-                $("#checkModal").modal("hide");
-            } else {
-                Feng.error(data.msg);
-            }
-        }, function (data) {
-            Feng.error("审核失败!" + data.responseJSON.message + "!");
-        });
-        ajax.setData({"id": $("#mainId").val(), "checkState": $("#checkStateAfter").val(), "checkMsg": msg});
-        ajax.start();
+    var card_type = "";
+    var card_number = "";
+    if (type == 2 && this.check()) {
+        card_type = IntegralInfo.seItem.card_type;
+        card_number = IntegralInfo.seItem.card_number;
     }
-    Feng.confirm("一旦提交无法修改,确定提交吗?", operation);
-}
-
-/**
- * 批量公示通过
- * @param type
- */
-IntegralInfo.publicPass = function () {
-    var selected = $('#dataTable').bootstrapTable('getSelections');
-    if (!selected || selected.length < 1) {
-        Feng.info("请至少选择一行数据!");
+    if (type == 1 && !vetoObj) {
+        Feng.info("请选择企业");
         return;
     }
-    var ids = "";
-    for (var i = 0; i < selected.length; i++) {
-        ids = ids + selected[i].id + ",";
-    }
-    var operation = function () {
-        var ajax = new $ax("/admin/integralVerify/publicPass", function (data) {
-            if (data.code == 200) {
-                Feng.success(data.msg);
-                IntegralInfo.table.refresh();
-                $("#exportCommonModal").modal("hide");
-            } else {
-                Feng.error(data.msg);
-            }
-        }, function (data) {
-            Feng.error("公示通过失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("ids", ids);
-        ajax.start();
-    }
-    Feng.confirm("一旦提交无法修改,确定公示通过吗?", operation);
-}
-
-/**
- * 公布预览
- */
-IntegralInfo.publishExportBefore = function () {
-    var selected = $('#dataTable').bootstrapTable('getSelections');
-    if (!selected || selected.length < 1) {
-        Feng.info("请至少选择一行数据!");
+    if (locked)
         return;
-    }
-    var ids = "";
-    for (var i = 0; i < selected.length; i++) {
-        ids = ids + selected[i].id + ",";
-    }
-    var operation = function () {
-        $("#exportCommonModal").modal("hide");
-        window.location.href = "/admin/integralVerify/publishExportBefore?ids=" + ids;
-    }
-    Feng.confirm("确定要导出吗?", operation);
-}
-
-/**
- * 公布审核
- */
-IntegralInfo.singlePublish = function () {
-    if (this.check()) {
-        if (IntegralInfo.seItem.checkState != 24) {
-            Feng.info("当前记录不是公示再审核通过状态,无法审核");
-            return;
+    locked = true;
+    var ajax = new $ax(Feng.ctxPath + "/admin/integralVerify/submitVeto", function (data) {
+        if (data.code == 200) {
+            Feng.success(data.msg);
+            window.parent.IntegralInfo.table.refresh();
+            layer.close(i);
+        } else {
+            Feng.error(data.msg);
         }
-        /*if (IntegralInfo.seItem.checkState == 13) {
-         var html = '<option value="">请选择</option>\n' +
-         '       <option value="2">驳回/恢复</option>';
-         $("#checkStateAfter").empty().append(html);
-         }
-         if (IntegralInfo.seItem.checkState == 11) {
-         var html = '<option value="">请选择</option>\n' +
-         '       <option value="-1">审核不通过</option>' +
-         '       <option value="2">驳回</option>';
-         $("#checkStateAfter").empty().append(html);
-         }*/
-        $("#checkForm")[0].reset();
-        $("#mainId").val(IntegralInfo.seItem.id);
-        $("#publishModal").modal("show");
-        laydate.render({elem: "#publishBatch", type: 'date', trigger: 'click', format: "yyyy-MM-dd"});
-    }
-}
-IntegralInfo.publishStateChange = function () {
-    var state = $("#checkStatePublish").val();
-    if (state == 1) {
-        $("#checkStatePublish").parents(".row").next(".row").css("display", "block");
-    } else {
-        $("#checkStatePublish").parents(".row").next(".row").css("display", "none");
-    }
+        locked = false;
+    }, function (data) {
+        Feng.error("提交失败!" + data.responseJSON.message + "!");
+        locked = false;
+    });
+    ajax.setData({"checkState": checkState, "checkMsg": checkMsg, type: type, card_type: card_type, card_number: card_number, enterprise_id: vetoObj});
+    ajax.start();
 }
 
-/**
- * 公示后审核提交
- */
-IntegralInfo.singlePublishSubmit = function () {
-    var checkState = $("#checkStatePublish").val();
-    var msg = $("#publishMsg").val();
-    var month = $("#publishBatch").val();
-    if (checkState == null || checkState == '') {
-        Feng.info("请选择审核状态");
-        return;
-    }
-    if (Feng.isEmptyStr(month)) {
-        Feng.info("请填写公布批次");
-        return;
-    }
-    if (msg == null || msg == '') {
-        Feng.info("请填写审核意见");
-        return;
-    }
-    var operation = function () {
-        var ajax = new $ax("/admin/integralVerify/publish", function (data) {
-            if (data.code == 200) {
-                Feng.success(data.msg);
-                IntegralInfo.table.refresh();
-                $("#publishModal").modal("hide");
-            } else {
-                Feng.error(data.msg);
-            }
-        }, function (data) {
-            Feng.error("审核失败!" + data.responseJSON.message + "!");
-        });
-        ajax.setData({"id": $("#mainId").val(), "checkState": checkState, "checkMsg": msg, batch: month});
-        ajax.start();
-    }
-    Feng.confirm("一旦提交无法修改,确定提交吗?", operation);
+IntegralInfo.createVetoFormModal = function () {
+    return '<form id="vetoForm">\n' +
+            '  <div class="form-group" style="margin: 10px;">\n' +
+            '      <div class="row" style="margin-bottom: 10px;">\n' +
+            '         <label class="col-sm-2 control-label">类型</label>\n' +
+            '         <div class="col-sm-10">\n' +
+            '           <select id="vetoType" name="vetoType" class="form-control">\n' +
+            '           </select>\n' +
+            '         </div>\n' +
+            '       </div>\n' +
+            '      <div class="row" style="margin-bottom: 10px;">\n' +
+            '         <label class="col-sm-2 control-label">名称</label>\n' +
+            '         <div class="col-sm-10">\n' +
+            '           <select id="vetoObj" name="vetoObj" class="form-control">\n' +
+            '           </select>\n' +
+            '         </div>\n' +
+            '       </div>\n' +
+            '      <div class="row" style="margin-bottom: 10px;">\n' +
+            '         <label class="col-sm-2 control-label">状态</label>\n' +
+            '         <div class="col-sm-10">\n' +
+            '           <select id="vetoCheckState" name="vetoCheckState" class="form-control">\n' +
+            '               <option value="1">一票否决</option>\n' +
+            '               <option value="2">恢复</option>\n' +
+            '           </select>\n' +
+            '         </div>\n' +
+            '       </div>\n' +
+            '       <div class="row">\n' +
+            '          <label class="col-sm-2 control-label">意见</label>\n' +
+            '          <div class="col-sm-10">\n' +
+            '           <textarea id="vetoMsg" name="vetoMsg" class="form-control"></textarea>\n' +
+            '           </div>\n' +
+            '      </div>\n' +
+            '   </div>\n' +
+            '</form>';
 }
 
 /**
- * 批量公布
- */
-IntegralInfo.publish = function () {
-    var selected = $('#dataTable').bootstrapTable('getSelections');
-    if (!selected || selected.length < 1) {
-        Feng.info("请至少选择一行数据!");
-        return;
-    }
-    var ids = "";
-    for (var i = 0; i < selected.length; i++) {
-        ids = ids + selected[i].id + ",";
-    }
-    var operation = function () {
-        var index = layer.open({
-            type: 1,
-            title: '公布',
-            area: ['300px', '220px'], //宽高
-            fix: false, //不固定
-            maxmin: true,
-            content: "<input class='form-control' id='publicBatchId' style='width:90%;margin: 10px' placeholder='请输入公布日期(公布入选月份)'>",
-            btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
-            btnAlign: 'c',
-            success: function () {
-                laydate.render({elem: "#publicBatchId", type: 'date', trigger: 'click', format: "yyyy-MM-dd"});
-            },
-            yes: function (index, layero) {
-                var month = $("#publicBatchId").val();
-                if (Feng.isEmptyStr(month)) {
-                    Feng.info("请填写公布批次");
-                    return;
-                }
-                layer.close(index);
-                var ajax = new $ax(Feng.ctxPath + "/admin/integralVerify/preparePublish", function (data) {
-                    if (data.code == 200) {
-                        Feng.success(data.msg);
-                        IntegralInfo.table.refresh();
-                        $("#exportCommonModal").modal("hide");
-                    } else {
-                        Feng.error(data.msg);
-                    }
-                }, function (data) {
-                    Feng.error("公布失败!" + data.responseJSON.message + "!");
-                });
-                ajax.set("ids", ids);
-                ajax.set("batch", month);
-                ajax.start();
-            }
-        });
-    }
-    Feng.confirm("一旦确认无法修改,确定要公布吗?", operation);
-}
-/**
- * 撤销公布
+ * 选择导出提交
  */
-IntegralInfo.canclePublish = function () {
-    if (this.check()) {
-        var operation = function () {
-            var ajax = new $ax(Feng.ctxPath + "/talentInfo/canclePublish", function (data) {
-                if (data.code == 200) {
-                    Feng.success(data.msg);
-                    IntegralInfo.table.refresh();
-                } else {
-                    Feng.error(data.msg);
-                }
-            }, function (data) {
-                Feng.error("撤销公布失败!" + data.responseJSON.message + "!");
-            });
-            ajax.set("id", IntegralInfo.seItem.id);
-            ajax.start();
-        }
-        Feng.confirm("一旦撤销无法修改,确定要撤销公布吗?", operation);
-    }
-}
-
-//发放积分
-IntegralInfo.sendCard = function () {
+IntegralInfo.checkExport = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
     if (!selected || selected.length < 1) {
         Feng.info("请至少选择一行数据!");
@@ -782,22 +259,7 @@ IntegralInfo.sendCard = function () {
     for (var i = 0; i < selected.length; i++) {
         ids = ids + selected[i].id + ",";
     }
-    var operation = function () {
-        var ajax = new $ax("/admin/integralVerify/prepareCertification", function (data) {
-            if (data.code == 200) {
-                Feng.success(data.msg);
-                IntegralInfo.table.refresh();
-                $("#exportCommonModal").modal("hide");
-            } else {
-                Feng.error(data.msg);
-            }
-        }, function (data) {
-            Feng.error("发放积分失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("ids", ids);
-        ajax.start();
-    }
-    Feng.confirm("积分发放后无法修改,确定要发放积分吗?", operation);
+    window.location.href = Feng.ctxPath + "/admin/integralVerify/prepareHczx?ids=" + ids;
 }
 
 //回调
@@ -816,7 +278,7 @@ $(function () {
     table.setPaginationType("server");
     table.setSingleSelect(false);
     table.setOnDblClickRow(function () {
-        IntegralInfo.openIntegralInfoDetail();
+        //IntegralInfo.openIntegralInfoDetail();
     });
     var t = IntegralInfo.table = table.init();
     IntegralInfo.init();

+ 2 - 0
public/static/modular/talentIdentify/integralMgr/integralCommon.js

@@ -30,6 +30,7 @@ IntegralInfo.formParams = function () {
     queryData['apply_year'] = $("#apply_year").val();
     queryData['enterprise_id'] = $("#enterprise_id").val();
     queryData['shareholder'] = $("#shareholder").val();
+    queryData['veto'] = $("#veto").val();
     return queryData;
 }
 
@@ -52,6 +53,7 @@ IntegralInfo.reset = function () {
     $("#apply_year").val("");
     $("#enterprise_id").val("").trigger("chosen:updated");
     $("#shareholder").val("");
+    $("#veto").val("");
 }
 
 /**