子女择校审核端基本完成

app/admin/controller/EducationSchool.php

@@ -0,0 +1,294 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\common\AdminController;
+use app\common\api\ChuanglanSmsApi;
+use app\common\model\TalentLog;
+use app\common\state\ProjectState;
+use app\common\api\DictApi;
+use think\facade\Db;
+use app\common\api\EducationApi;
+use app\common\state\MainState;
+
+/**
+ * Description of EducationSchool
+ *
+ * @author sgq
+ */
+class EducationSchool extends AdminController {
+
+    public function index() {
+        $type = $this->user["type"];
+        return view("", ["type" => $type]);
+    }
+
+    public function list() {
+        $res = EducationApi::getList($this->request);
+        return json($res);
+    }
+
+    public function detail() {
+        $id = $this->request->param("id");
+        $info = EducationApi::getInfoById($id);
+
+        return view("", ["row" => $info]);
+    }
+
+    /**
+     * 校验是否在审核范围内
+     * @param type $id
+     * @param type $process
+     * @return type
+     */
+    public function validateIsCheck($id) {
+        $responseObj = new \stdClass();
+        $responseObj->code = 500;
+        $oldInfo = EducationApi::getInfoById($id);
+        if ($oldInfo["checkState"] != 1 && $oldInfo["checkState"] != 9) {
+            $responseObj->msg = "不在审核范围内";
+            return json($responseObj);
+        }
+        $where = [];
+        $where[] = ["mainId", "=", $id];
+        $where[] = ["active", "=", 2];
+        $where[] = ["step", "=", 11];
+        $log = TalentLog::where($where)->order("createTime desc")->find();
+
+        if ($log) {
+            $oldInfo["checkState"] = $log["state"];
+            $oldInfo["checkMsg"] = $log["description"];
+        } else {
+            $oldInfo["checkState"] = null;
+            $oldInfo["checkMsg"] = "";
+        }
+        $responseObj->code = 200;
+        $responseObj->obj = $oldInfo;
+        return json($responseObj);
+    }
+
+    /**
+     * 审核
+     * @return type
+     */
+    public function check() {
+        $responseObj = new \stdClass();
+        $responseObj->code = 500;
+        $obj = $this->request->param();
+        if (!$obj) {
+            $responseObj->msg = "系统错误，请联系管理员";
+            return json($responseObj);
+        }
+        if (!$obj["checkState"]) {
+            $responseObj->msg = "请选择审核状态";
+            return json($responseObj);
+        }
+        Db::startTrans();
+        try {
+            //加入日志
+            $newLog["id"] = getStringId();
+            $newLog["type"] = ProjectState::EDUCATION;
+            $newLog["mainId"] = $obj["id"];
+            $newLog["active"] = 2;
+            $newLog["state"] = $obj["checkState"];
+            $newLog["step"] = 11;
+            $newLog["stateChange"] = "保存未提交";
+            $newLog["description"] = $obj["checkMsg"];
+            $newLog["createTime"] = date("Y-m-d H:i:s");
+            $newLog["createUser"] = sprintf("%s(%s)", $this->user["account"], $this->user["companyName"]);
+            Db::table("new_talent_checklog")->insert($newLog);
+            $responseObj->code = 200;
+            $responseObj->msg = "审核成功";
+            Db::commit();
+            return json($responseObj);
+        } catch (\Exception $e) {
+            Db::rollback();
+            $responseObj->msg = $e->getMessage();
+            return json($responseObj);
+        }
+    }
+
+    public function submitCheck() {
+        $id = $this->request->param("id");
+        $checkState = $this->request->param("id");
+        $responseObj = new \stdClass();
+        $responseObj->code = 500;
+        if (!$id) {
+            $responseObj->msg = "系统错误,请联系管理员!";
+            return json($responseObj);
+        }
+        $oldInfo = EducationApi::getInfoById($id);
+
+        if ($oldInfo["checkState"] != 1 && $oldInfo["checkState"] != 9) {
+            $responseObj->msg = "不在审核范围内";
+            return json($responseObj);
+        }
+        $where = [];
+        $where[] = ["mainId", "=", $id];
+        $where[] = ["active", "=", 2];
+        $where[] = ["step", "=", 11];
+        $oldLog = TalentLog::where($where)->order("createTime desc")->find();
+        if (!$oldLog) {
+            $responseObj->msg = "请先审核后再提交";
+            return json($responseObj);
+        }
+        $updData = [];
+        $updData["id"] = $id;
+        $updData["checkState"] = $oldLog["state"];
+        $updData["checkMsg"] = $oldLog["description"];
+
+        if ($updData["checkState"] == 3) {
+            $updData["passTime"] = date("Y-m-d H:i:s");
+            if ($oldInfo["project"] == 2) {
+                if ($oldInfo["talentArrange"] == 1) {
+                    $updData["score"] = 15;
+                } else if ($oldInfo["talentArrange"] == 2) {
+                    $updData["score"] = 10;
+                } else if ($oldInfo["talentArrange"] == 3) {
+                    $updData["score"] = 5;
+                }
+            }
+        }
+
+        $newLog["id"] = getStringId();
+        $newLog["type"] = ProjectState::EDUCATION;
+        $newLog["mainId"] = $id;
+        $newLog["active"] = 1;
+        $newLog["state"] = $oldLog["state"];
+        $newLog["step"] = 11;
+        $newLog["stateChange"] = MainState::getStateName($oldInfo["checkState"]) . "->" . MainState::getStateName($updData["checkState"]);
+        $newLog["description"] = $oldLog["description"];
+        $newLog["createTime"] = date("Y-m-d H:i:s");
+        $newLog["createUser"] = sprintf("%s(%s)", $this->user["account"], $this->user["companyName"]);
+        Db::startTrans();
+        try {
+            $where = [];
+            $where[] = ["mainId", "=", $id];
+            $where[] = ["type", "=", ProjectState::EDUCATION];
+            $where[] = ["active", "=", 2];
+            Db::table("new_talent_checklog")->where($where)->delete();
+            Db::table("new_talent_checklog")->insert($newLog);
+            Db::table("un_education_school")->save($updData);
+            Db::commit();
+
+            $responseObj->code = 200;
+            $responseObj->msg = "提交审核成功";
+            return json($responseObj);
+        } catch (\think\db\exception\DbException $e) {
+            Db::rollback();
+            $responseObj->msg = $e->getMessage();
+            return json($responseObj);
+        }
+    }
+
+    /**
+     * 通用导出
+     * @return type
+     */
+    public function export() {
+        $response = new \stdClass();
+        $response->code = 500;
+
+        $request = $this->request;
+        $user = $this->user;
+        if (!in_array($user["type"], [1, 2])) {
+            $response->msg = "当前账号类型没有操作权限";
+            return \StrUtil::back($response, "TalentInfo.callBack");
+        }
+        $names = \StrUtil::getRequestDecodeParam($request, "names");
+        $values = \StrUtil::getRequestDecodeParam($request, "values");
+
+        $title = array_filter(explode(",", $names)); //exce标题
+        $keys = array_filter(explode(",", $values)); //标题对应的字段
+
+        $where = [];
+        $where[] = ["type", "=", $user["type"]];
+
+        if ($_where = EducationApi::getWhereByParams($request->param())) {
+            $where = array_merge($where, $_where);
+        }
+
+        $list = \app\common\model\EducationSchool::where($where)->select()->toArray();
+
+        if (in_array("talentArrangeName", $keys)) {
+            $levelMap = DictApi::selectByParentCode("talent_arrange");
+        }
+        if (in_array("companyStreetName", $keys) || in_array("houseStreetName", $keys)) {
+            $streetMap = DictApi::selectByParentCode("street");
+        }
+        if (in_array("cRelationName", $keys)) {
+            $relationMap = DictApi::selectByParentCode("education_relation");
+        }
+        if (in_array("nowGradeName", $keys)) {
+            $gradeMap = DictApi::selectByParentCode("education_grade");
+        }
+        if (in_array("applySchoolName", $keys)) {
+            $schoolMap = DictApi::selectByParentCode("education_school_pool");
+        }
+        if (in_array("projectName", $keys)) {
+            $educationProjectMap = DictApi::selectByParentCode("education_project");
+        }
+
+        $rows = [];
+
+        foreach ($list as $item) {
+            $row = [];
+            foreach ($keys as $k) {
+                $val = $item[$k];
+                switch ($k) {
+                    case "talentArrangeName":
+                        $val = $levelMap[$item["talentArrange"]];
+                        break;
+                    case "companyStreetName":
+                        $val = $streetMap[$item["companyStreet"]];
+                        break;
+                    case "houseStreetName":
+                        $val = $streetMap[$item["houseStreet"]];
+                        break;
+                    case "cRelationName":
+                        $val = $relationMap[$item["cRelation"]];
+                        break;
+                    case "nowGradeName":
+                        $val = $gradeMap[$item["nowGrade"]];
+                        break;
+                    case "applySchoolName":
+                        $val = $schoolMap[$item["applySchool"]];
+                        break;
+                    case "projectName":
+                        $val = $educationProjectMap[$item["project"]];
+                        break;
+                    case "pSexName":
+                        $val = $item["pSex"] == 1 ? "男" : "女";
+                        break;
+                    case "cSexName":
+                        $val = $item["cSex"] == 1 ? "男" : "女";
+                        break;
+                    case "checkStateName":
+                        if ($item["checkState"] == -2) {
+                            $val = "保存未提交";
+                        }if ($item["checkState"] == -1) {
+                            $val = "审核不通过";
+                        }if ($item["checkState"] == 1) {
+                            $val = "待审核";
+                        }if ($item["checkState"] == 2) {
+                            $val = "审核驳回";
+                        }if ($item["checkState"] == 3) {
+                            $val = "审核通过";
+                        }if ($item["checkState"] == 9) {
+                            $val = "重新提交";
+                        }
+                        break;
+                }
+                $row[] = $val;
+            }
+            $rows[] = $row;
+        }
+        if (!$rows) {
+            $response->msg = "没有可导出的内容";
+            return \StrUtil::back($response, "TalentInfo.callBack");
+        }
+        $fileName = "子女择校导出";
+        export($title, $rows, $fileName);
+    }
+
+}

app/admin/controller/LivingAllowance.php

@@ -560,7 +560,7 @@ class LivingAllowance extends AdminController {
             $introductionModeMap = DictApi::selectByParentCode("un_introduction_mode");
         }
 
-        $list = LaModel::where($_where)->select()->toArray();
+        $list = LaModel::where($where)->select()->toArray();
         $nationalityOldAndNew = [
             "01" => "cn",
             "02" => "cn_hk",

app/admin/view/education_school/detail.html

@@ -0,0 +1,213 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    #talentInfoForm label {
+        font-size: xx-small;
+    }
+    .control-label{
+        color: #337ab7;
+    }
+    .rowGroup{
+        padding-bottom: 5px;
+    }
+    .imgs li{
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12" >
+                    <div class="tabs-container" >
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基础信息</a></li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="initNoBtnFileTable(CONFIG.project_school, 'fileTable')"  aria-expanded="false">2.附件上传</a></li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <div class="panel-body" >
+                                <div class="panel panel-primary">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息<span style="color: red;">({$row.year}年度)</span></div>
+                                    <div class="panel-body">
+                                        <form id="educationSchoolForm">
+                                            <div class="col-sm-12 form-group-sm">
+                                                <input type="hidden" name="id" id="id" value="{$row.id}">
+                                                <input type="hidden" id="talentId" name="talentId" value="{$row.talentId}">
+                                                <input type="hidden" name="personId" id="personId" value="{$row.personId}">
+                                                <input type="hidden" name="type" id="type" value="{$row.type}">
+                                                <input type="hidden" name="year" id="year" value="{$row.year}">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
+                                                <div class="row">
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报人姓名</label>
+                                                        <input type="text" class="form-control" id="pName" name="pName" value="{$row.pName}" readonly="readonly">
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报人性别</label>
+                                                        <select class="form-control" id="pSex" name="pSex" value="{$row.pSex}" style="pointer-events: none;background-color: #eee;">
+                                                            <option value="">请选择</option>
+                                                            <option value="1">男</option>
+                                                            <option value="2">女</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报人证件号码</label>
+                                                        <input type="text" class="form-control" id="pIdcard" name="pIdcard" value="{$row.pIdcard}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
+                                                        <select class="form-control" id="talentArrange" name="talentArrange" value="{$row.talentArrange}" style="pointer-events: none;background-color: #eee;">
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>认定条件</label>
+                                                        <input class="form-control" id="identifyCondition" name="identifyCondition" value="{$row.identifyCondition}" style="pointer-events: none;background-color: #eee;">
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才证书发证日期</label>
+                                                        <input type="text" class="form-control" id="certificateStartTime" name="certificateStartTime" value="{$row.certificateStartTime}" style="pointer-events: none;background-color: #eee;"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才证书有效期</label>
+                                                        <input type="text" class="form-control" id="qzgccrcActiveTime" name="qzgccrcActiveTime" value="{$row.qzgccrcActiveTime}" style="pointer-events: none;background-color: #eee;"/>
+                                                    </div>
+                                                    <!--                                                    <div class="rowGroup col-sm-3">-->
+                                                    <!--                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才编号</label>-->
+                                                    <!--                                                        <input type="text" class="form-control" id="certificateNo" name="certificateNo" value="{$row.certificateNo}" readonly="readonly"/>-->
+                                                    <!--                                                    </div>-->
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                        <input type="text" class="form-control" id="nativePlace" name="nativePlace" value="{$row.nativePlace}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>联系电话</label>
+                                                        <input type="text" class="form-control" id="phone" name="phone" value="{$row.phone}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>房产所在镇街</label>
+                                                        <select class="form-control" id="houseStreet" name="houseStreet" value="{$row.houseStreet}" style="pointer-events: none;background-color: #eee;">
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>现居详细地址</label>
+                                                        <input type="text" class="form-control" id="address" name="address" value="{$row.address}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>工作单位</label>
+                                                        <input type="text" class="form-control" id="enterpriseName" name="enterpriseName" value="{$row.enterpriseName}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>工作单位所属镇街</label>
+                                                        <select class="form-control" id="companyStreet" name="companyStreet" value="{$row.companyStreet}" style="pointer-events: none;background-color: #eee;">
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>工作单位详细地址</label>
+                                                        <input type="text" class="form-control" id="enterpriseAddress" name="enterpriseAddress" value="{$row.enterpriseAddress}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报项目</label>
+                                                        <select type="text" class="form-control" id="project" name="project" value="{$row.project}" onchange="EducationSchoolInfoDlg.projectChange(this)" style="pointer-events: none;background-color: #eee;">
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>子女姓名</label>
+                                                        <input type="text" class="form-control" id="cName" name="cName" value="{$row.cName}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>子女性别</label>
+                                                        <select class="form-control" id="cSex" name="cSex" value="{$row.cSex}" style="pointer-events: none;background-color: #eee;">
+                                                            <option value="">请选择</option>
+                                                            <option value="1">男</option>
+                                                            <option value="2">女</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>子女证件号码</label>
+                                                        <input type="text" class="form-control" id="cIdcard" name="cIdcard" value="{$row.cIdcard}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>子女出生日期</label>
+                                                        <input type="text" class="form-control date" id="cBirthday" name="cBirthday" value="{$row.cBirthday}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>与申报人关系</label>
+                                                        <select class="form-control" id="cRelation" name="cRelation" value="{$row.cRelation}" style="pointer-events: none;background-color: #eee;">
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>现就读学校</label>
+                                                        <input type="text" class="form-control " id="nowSchool" name="nowSchool" value="{$row.nowSchool}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>现就读年级</label>
+                                                        <select class="form-control" id="nowGrade" name="nowGrade" value="{$row.nowGrade}" style="pointer-events: none;background-color: #eee;">
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing">学籍号</label>
+                                                        <input type="text" class="form-control " id="stuNumber" name="stuNumber" value="{$row.stuNumber}" readonly="readonly"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3" style="display: none">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>拟申请学校</label>
+                                                        <select  class="form-control " id="applySchool" name="applySchool" value="{$row.applySchool}" readonly="readonly"></select>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明：本人对输入材料的真实性负全部责任</span></label>
+                                                </div>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                                <div class="panel panel-success">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                    <div class="panel-body">
+                                        <table id="logTable">
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                <thead>
+                                    <tr>
+                                        <th data-field="selectItem" data-checkbox="true"></th>
+                                    </tr>
+                                </thead>
+                            </table>
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
+                            <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                <input type='hidden' id="fileId" name="fileId" >
+                                <input type='file' id="upload_file" name="fileUrl" style='display: none'>
+                                <input type='hidden' id="mainId" name="mainId" >
+                                <input type='hidden' id="fileTypeId" name="fileTypeId" >
+                                <input type='hidden' id="index" name="index" >
+                                <input type="hidden" name="backName" value="callBack">
+                                <input type="type" name="type" value="6">
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/education/educationSchool/educationSchool_check.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/admin/view/education_school/index.html

@@ -0,0 +1,347 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
+    ul li{
+        list-style: none;
+        display:inline-block;
+        margin-bottom: 5px;
+    }
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>子女就学管理</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <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="year"/>
+                                </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="enterpriseName"/>
+                                </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="pName"/>
+                                </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="pSex">
+                                        <option value="">请选择</option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row highSearch" style="display: none">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            父母证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="pIdcard"/>
+                                </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="talentArrange">
+                                    </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>
+                                    <input type="text" class="form-control" id="certificateNo"/>
+                                </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="address"/>
+                                </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="phone"/>
+                                </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="project">
+                                    </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>
+                                    <input type="text" class="form-control" id="cName"/>
+                                </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="cSex">
+                                        <option value="">请选择</option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            子女证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="cIdcard"/>
+                                </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="cRelation">
+                                    </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>
+                                    <input type="text" class="form-control" id="nowSchool"/>
+                                </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="nowGrade">
+                                    </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="applySchool">
+                                    </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="companyStreet">
+                                    </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="houseStreet">
+                                    </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="checkState">
+                                        <option value="">请选择</option>
+                                        <option value="-2">保存未提交</option>
+                                        <option value="1">待审核</option>
+                                        <option value="2">审核驳回</option>
+                                        <option value="3">审核通过</option>
+                                        <option value="9">重新提交</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-12" style="text-align: center">
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();$(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();$('.highSearch').hide();$(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="EducationSchool.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="EducationSchool.reset()">重置</button>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="EducationSchoolTableToolbar" role="group">
+                            {if condition="chkCommission('/admin/education_school/detail','/educationSchool/toCheckPage')"}
+                            <button type="button" class="btn btn-sm btn-primary" onclick="EducationSchool.toCheckPage()">
+                                <i class="fa fa-check"></i>&nbsp;审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/education_school/export','/educationSchool/export')"}
+                            <button type="button" class="btn btn-sm btn-primary" onclick="EducationSchool.showExportModel()">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                            </button>
+                            {/if}
+                        </div>
+                        <table id="EducationSchoolTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--导出模态框-->
+<div class="modal fade " id="commonExportModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog modal-lg" role="document">
+        <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="${ctxPath}/talentInfoExport/publicExport" target="hiddenIframe" class="form-horizontal">
+                    <div class="form-group" id="field">
+                        <div id="field_info">
+                            <ul>
+                                {if condition="$type eq 1"}
+                                <li style="width:12%"><input type="checkbox" value="year"><span>申报年度</span></li>
+                                <li style="width:12%"><input type="checkbox" value="pName"><span>父母姓名</span></li>
+                                <li style="width:12%"><input type="checkbox" value="pSexName"><span>父母性别</span></li>
+                                <li style="width:24%"><input type="checkbox" value="pIdcard"><span>父母证件号码</span></li>
+                                <li style="width:12%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>
+                                <li style="width:12%"><input type="checkbox" value="certificateNo"><span>人才编号</span></li>
+                                <li style="width:12%"><input type="checkbox" value="nativePlace"><span>籍贯</span></li>
+                                <li style="width:12%"><input type="checkbox" value="enterpriseName"><span>工作单位</span></li>
+                                <li style="width:24%"><input type="checkbox" value="companyStreetName"><span>工作单位所属镇街</span></li>
+                                <li style="width:24%"><input type="checkbox" value="enterpriseAddress"><span>工作单位详细地址</span></li>
+                                <li style="width:24%"><input type="checkbox" value="houseStreetName"><span>房产所在镇街</span></li>
+                                <li style="width:12%"><input type="checkbox" value="address"><span>现居详细地址</span></li>
+                                <li style="width:12%"><input type="checkbox" value="phone"><span>联系电话</span></li>
+                                <li style="width:12%"><input type="checkbox" value="projectName"><span>申报项目</span></li>
+                                <li style="width:12%"><input type="checkbox" value="cName"><span>子女姓名</span></li>
+                                <li style="width:12%"><input type="checkbox" value="cSexName"><span>子女性别</span></li>
+                                <li style="width:24%"><input type="checkbox" value="cIdcard"><span>子女证件号码</span></li>
+                                <li style="width:24%"><input type="checkbox" value="cBirthday"><span>子女出生日期</span></li>
+                                <li style="width:12%"><input type="checkbox" value="stuNumber"><span>学籍号</span></li>
+                                <li style="width:24%"><input type="checkbox" value="cRelationName"><span>与申报人关系</span></li>
+                                <li style="width:12%"><input type="checkbox" value="nowSchool"><span>现就读学校</span></li>
+                                <li style="width:12%"><input type="checkbox" value="nowGradeName"><span>现就读年级</span></li>
+                                <li style="width:12%"><input type="checkbox" value="applySchoolName"><span>拟申请学校</span></li>
+                                {/if}
+                                {if condition="$type eq 2"}
+                                <li style="width:12%"><input type="checkbox" value="score"><span>加分</span></li>
+                                {/if}
+                                <li style="width:12%"><input type="checkbox" value="checkStateName"><span>审核状态</span></li>
+                            </ul>
+                        </div>
+                        <div class="form-group" style="text-align: center">
+                            <button type="button" class="btn btn-primary" onclick="Feng.checkAll('field_info')">全选</button>
+                            <button type="button" class="btn btn-success" onclick="Feng.unCheckAll('field_info')">反选</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="EducationSchool.export()">导出</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/education/educationSchool/educationSchool.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/common/api/EducationApi.php

@@ -50,8 +50,8 @@ class EducationApi {
     }
 
     public static function getWhereByParams($params) {
-        foreach ($params as &$param) {
-            $param = trim($param);
+        foreach ($params as $key => $param) {
+            $params[$key] = trim(\StrUtil::getRequestDecodeParam($params, $key));
         }unset($param);
         $where = [];
         if ($params["year"]) {
@@ -81,6 +81,9 @@ class EducationApi {
         if ($params["phone"]) {
             $where[] = ["phone", "like", "%" . $params["phone"] . "%"];
         }
+        if ($params["project"]) {
+            $where[] = ["project", "=", $params["project"]];
+        }
         if ($params["cName"]) {
             $where[] = ["cName", "like", "%" . $params["cName"] . "%"];
         }

public/static/modular/education/educationSchool/educationSchool.js

@@ -2,8 +2,8 @@
  * 子女就学管理初始化
  */
 var EducationSchool = {
-    id: "EducationSchoolTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "EducationSchoolTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,66 +14,73 @@ var EducationSchool = {
 EducationSchool.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '申报年度', field: 'year', visible: true, align: 'center', valign: 'middle',width:"80px",'class': 'uitd_showTip'},
-        {title: '申报项目', field: 'projectName', visible: true, align: 'center', valign: 'middle',width:"80px",'class': 'uitd_showTip'},
-        {title: '父母姓名', field: 'pName', visible: true, align: 'center', valign: 'middle',width:"80px",'class': 'uitd_showTip'},
-        {title: '父母性别', field: 'pSex', visible: true, align: 'center', valign: 'middle',width:"80px",'class': 'uitd_showTip',
-            formatter : function (value,row,index) {
-                if(value==1){
+        {title: '申报年度', field: 'year', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        {title: '申报项目', field: 'projectName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        {title: '父母姓名', field: 'pName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        {title: '父母性别', field: 'pSex', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (value == 1) {
                     return '男';
-                }if(value==2){
+                }
+                if (value == 2) {
                     return '女';
                 }
             }
         },
-        {title: '父母证件号码', field: 'pIdcard', visible: true, align: 'center', valign: 'middle',width:"150px",'class': 'uitd_showTip'},
-        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle',width:"80px",'class': 'uitd_showTip'},
-        {title: '认定条件', field: 'identifyCondition', visible: true, align: 'center', valign: 'middle',width:"120px",'class': 'uitd_showTip'},
-        {title: '人才证书有效期', field: 'certificateNo', visible: true, align: 'center', valign: 'middle',width:"140px",'class': 'uitd_showTip',
-            formatter : function (value,row,index) {
+        {title: '父母证件号码', field: 'pIdcard', visible: true, align: 'center', valign: 'middle', width: "150px", 'class': 'uitd_showTip'},
+        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+        {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        {title: '认定条件', field: 'identifyCondition', visible: true, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
+        {title: '人才证书有效期', field: 'certificateNo', visible: true, align: 'center', valign: 'middle', width: "140px", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
                 return row.certificateStartTime + "至" + row.qzgccrcActiveTime;
             }
         },
-        {title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle',width:"80px",'class': 'uitd_showTip'},
-        {title: '子女姓名', field: 'cName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-        {title: '子女性别', field: 'cSex', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter : function (value,row,index) {
-                if(value==1){
+        {title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle', width: "80px", 'class': 'uitd_showTip'},
+        {title: '子女姓名', field: 'cName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+        {title: '子女性别', field: 'cSex', visible: true, align: 'center', valign: 'middle', width: "80px",
+            formatter: function (value, row, index) {
+                if (value == 1) {
                     return '男';
-                }if(value==2){
+                }
+                if (value == 2) {
                     return '女';
                 }
             }
         },
-        {title: '与申报人关系', field: 'cRelationName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-        {title: '现就读学校', field: 'nowSchool', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-        {title: '现就读年级', field: 'nowGradeName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-        {title: '拟申请学校', field: 'applySchoolName', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle',width:"100px",'class': 'uitd_showTip'},
-        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle',width:"100px",
-            formatter : function (value,row,index) {
-                if(value==-2){
+        {title: '与申报人关系', field: 'cRelationName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+        {title: '现就读学校', field: 'nowSchool', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+        {title: '现就读年级', field: 'nowGradeName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+        {title: '拟申请学校', field: 'applySchoolName', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', width: "100px", 'class': 'uitd_showTip'},
+        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
+            formatter: function (value, row, index) {
+                if (value == -2) {
                     return '<span class="label label-default">待提交</span>';
-                }if(value==-1){
+                }
+                if (value == -1) {
                     return '<span class="label label-danger">审核不通过</span>';
-                }if(value==1){
+                }
+                if (value == 1) {
                     return '<span class="label label-success">待审核</span>';
-                }if(value==2){
+                }
+                if (value == 2) {
                     return '<span class="label label-danger">审核驳回</span>';
-                }if(value==3){
+                }
+                if (value == 3) {
                     return '<span class="label label-primary">审核通过</span>';
-                }if(value==9){
+                }
+                if (value == 9) {
                     return '<span class="label label-success">重新提交</span>';
                 }
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter : function (value,row,index){
-                return "<span class='label label-success' onclick=\"EducationSchool.showLog('"+value+"')\" >" +
-                    "<i class=\"fa fa-book\"></i>日志" +
-                    "</span>";
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "80px",
+            formatter: function (value, row, index) {
+                return "<span class='label label-success' onclick=\"EducationSchool.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         }
     ];
@@ -84,10 +91,10 @@ EducationSchool.initColumn = function () {
  */
 EducationSchool.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
+    } else {
         EducationSchool.seItem = selected[0];
         return true;
     }
@@ -97,28 +104,28 @@ EducationSchool.check = function () {
  * 审核
  */
 EducationSchool.toCheckPage = function () {
-    if (this.check()){
+    if (this.check()) {
         var index = layer.open({
             type: 2,
             title: '子女就学申报',
             area: 'auto', //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/educationSchool/toCheckPage/' + EducationSchool.seItem.id,
-            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交','<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+            content: Feng.ctxPath + '/admin/education_school/detail/id/' + EducationSchool.seItem.id,
+            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
             btnAlign: 'c',
             btn1: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.EducationSchoolInfoDlg.showCheckModal();
-            },btn2: function(index, layero){
+            }, btn2: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.EducationSchoolInfoDlg.submitCheck();
                 return false;
             },
-            success :function (layero, index) {
-                layer.tips('审核完成并确认无误后点击','.layui-layer-btn1',{tips:[1,"#78BA32"],time:0,closeBtn :2});
+            success: function (layero, index) {
+                layer.tips('审核完成并确认无误后点击', '.layui-layer-btn1', {tips: [1, "#78BA32"], time: 0, closeBtn: 2});
             },
-            end :function () {
+            end: function () {
                 layer.closeAll('tips');
             }
         });
@@ -132,7 +139,7 @@ EducationSchool.toCheckPage = function () {
 /**
  * 收集数据
  */
-EducationSchool.formParams = function(){
+EducationSchool.formParams = function () {
     var queryData = {};
     queryData['year'] = $("#year").val();
     queryData['enterpriseName'] = $("#enterpriseName").val();
@@ -154,14 +161,16 @@ EducationSchool.formParams = function(){
     queryData['companyStreet'] = $("#companyStreet").val();
     queryData['houseStreet'] = $("#houseStreet").val();
     queryData['checkState'] = $("#checkState").val();
+    queryData['isDoctor'] = $("#isDoctor").val();
     return queryData;
 }
 
 /**
  * 重置
  */
-EducationSchool.reset = function(){
+EducationSchool.reset = function () {
     $("#year").val("");
+    $("#isDoctor").val("");
     $("#enterpriseName").val("");
     $("#pName").val("");
     $("#pSex").val("");
@@ -193,16 +202,16 @@ EducationSchool.search = function () {
 /**
  * 显示审核日志
  */
-EducationSchool.showLog = function (id){
+EducationSchool.showLog = function (id) {
     layer.open({
         type: 1,
-        title:"日志",
-        fixed:false,
-        content: '<table id="'+id+'"></table>',
+        title: "日志",
+        fixed: false,
+        content: '<table id="' + id + '"></table>',
         area: ['80%', '80%'],
         maxmin: true,
-        success :function (layero, index) {
-            Feng.getCheckLog(id,{"type":CONFIG.project_school,"mainId":id,"typeFileId":"","active":1})
+        success: function (layero, index) {
+            Feng.getCheckLog(id, {"type": CONFIG.project_school, "mainId": id, "typeFileId": "", "active": 1})
         }
     });
 }
@@ -210,7 +219,7 @@ EducationSchool.showLog = function (id){
 /**
  * 显示导出
  */
-EducationSchool.showExportModel = function(){
+EducationSchool.showExportModel = function () {
     $("#exportForm")[0].reset();
     $("#commonExportModal").modal("show");
 }
@@ -218,44 +227,45 @@ EducationSchool.showExportModel = function(){
 /**
  * 导出
  */
-EducationSchool.export = function(){
+EducationSchool.export = function () {
     var names = '';
     var values = '';
-    $("#field_info li input").each(function(index){
-        if($(this).is(":checked")){
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
             values = values + $(this).val() + ",";
             names = names + $(this).next().text() + ",";
         }
     });
     var queryData = EducationSchool.formParams();
     $("#commonExportModal").modal('hide');
-    var url = Feng.ctxPath + "/educationSchoolExport/export?names="+names+"&values="+values +
-        "&year=" + queryData.year +
-        "&enterpriseName=" + queryData.enterpriseName +
-        "&pName=" + queryData.pName +
-        "&pSex=" + queryData.pSex +
-        "&pIdcard=" + queryData.pIdcard +
-        "&talentArrange=" + queryData.talentArrange +
-        "&certificateNo=" + queryData.certificateNo +
-        "&address=" + queryData.address +
-        "&phone=" + queryData.phone +
-        "&project="+queryData.project+
-        "&cName=" + queryData.cName +
-        "&cSex=" + queryData.cSex +
-        "&cIdcard=" + queryData.cIdcard +
-        "&cRelation=" + queryData.cRelation +
-        "&nowSchool=" + queryData.nowSchool +
-        "&nowGrade=" + queryData.nowGrade +
-        "&applySchool=" + queryData.applySchool +
-        "&companyStreet=" + queryData.companyStreet +
-        "&houseStreet=" + queryData.houseStreet +
-        "&checkState=" + queryData.checkState;
+    var url = Feng.ctxPath + "/admin/education_school/export?names=" + names + "&values=" + values +
+            "&isDoctor=" + queryData.isDoctor +
+            "&year=" + queryData.year +
+            "&enterpriseName=" + queryData.enterpriseName +
+            "&pName=" + queryData.pName +
+            "&pSex=" + queryData.pSex +
+            "&pIdcard=" + queryData.pIdcard +
+            "&talentArrange=" + queryData.talentArrange +
+            "&certificateNo=" + queryData.certificateNo +
+            "&address=" + queryData.address +
+            "&phone=" + queryData.phone +
+            "&project=" + queryData.project +
+            "&cName=" + queryData.cName +
+            "&cSex=" + queryData.cSex +
+            "&cIdcard=" + queryData.cIdcard +
+            "&cRelation=" + queryData.cRelation +
+            "&nowSchool=" + queryData.nowSchool +
+            "&nowGrade=" + queryData.nowGrade +
+            "&applySchool=" + queryData.applySchool +
+            "&companyStreet=" + queryData.companyStreet +
+            "&houseStreet=" + queryData.houseStreet +
+            "&checkState=" + queryData.checkState;
     window.location.href = encodeURI(encodeURI(url));
 }
 
 $(function () {
     var defaultColunms = EducationSchool.initColumn();
-    var table = new BSTable(EducationSchool.id, "/educationSchool/list", defaultColunms);
+    var table = new BSTable(EducationSchool.id, "/admin/education_school/list", defaultColunms);
     table.setPaginationType("server");
     table.setOnDblClickRow(function () {
         EducationSchool.toCheckPage();
@@ -263,21 +273,21 @@ $(function () {
     EducationSchool.table = table.init();
     //批量加载字典表数据
     var arr = [
-        {"name":"companyStreet","code":"un_street"},
-        {"name":"houseStreet","code":"un_street"},
-        {"name":"talentArrange","code":"un_talentLevel"},
-        {"name":"cRelation","code":"un_education_relation"},
-        {"name":"nowGrade","code":"un_grade"},
-        {"name":"project","code":"un_educationSchool_project"},
-        {"name":"applySchool","code":"un_school_pool"}];
+        {"name": "companyStreet", "code": "street"},
+        {"name": "houseStreet", "code": "street"},
+        {"name": "talentArrange", "code": "talent_arrange"},
+        {"name": "cRelation", "code": "education_relation"},
+        {"name": "nowGrade", "code": "education_grade"},
+        {"name": "project", "code": "education_project"},
+        {"name": "applySchool", "code": "education_school_pool"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
-    $("#applySchool").on('chosen:ready', function(e, params) {
-        $(".chosen-container-single .chosen-single").css("padding","4px 0px 0px 4px");
+    $("#applySchool").on('chosen:ready', function (e, params) {
+        $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
     });
     $("#applySchool").chosen({
-        search_contains:true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        search_contains: true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
         disable_search: false,
-        width:"100%",
+        width: "100%",
         enable_split_word_search: true
     });
 });

public/static/modular/education/educationSchool/educationSchool_check.js

@@ -2,13 +2,13 @@
  * 初始化子女就学详情对话框
  */
 var EducationSchoolInfoDlg = {
-    educationSchoolInfoData : {},
+    educationSchoolInfoData: {},
 };
 
 /**
  * 关闭此对话框
  */
-EducationSchoolInfoDlg.close = function() {
+EducationSchoolInfoDlg.close = function () {
     parent.layer.close(window.parent.EducationSchool.layerIndex);
 }
 
@@ -16,38 +16,38 @@ EducationSchoolInfoDlg.close = function() {
  * 项目选择变更
  * @param content
  */
-EducationSchoolInfoDlg.projectChange = function(content){
+EducationSchoolInfoDlg.projectChange = function (content) {
     var project = $(content).val();
-    if(Feng.isEmptyStr(project)){
-        $("#applySchool").parent().css("display","none");
+    if (Feng.isEmptyStr(project)) {
+        $("#applySchool").parent().css("display", "none");
     }
-    if(project == CONFIG.education_school){
-        $("#applySchool").parent().css("display","block");
+    if (project == CONFIG.education_school) {
+        $("#applySchool").parent().css("display", "block");
     }
-    if(project == CONFIG.education_score){
-        $("#applySchool").parent().css("display","none");
+    if (project == CONFIG.education_score) {
+        $("#applySchool").parent().css("display", "none");
     }
 }
 
 /**
  * 显示审核
  */
-EducationSchoolInfoDlg.showCheckModal = function(){
-    var ajax = new $ax(Feng.ctxPath + "/educationSchool/validateIsCheck", function (data) {
-        if(data.code==200){
+EducationSchoolInfoDlg.showCheckModal = function () {
+    var ajax = new $ax(Feng.ctxPath + "/admin/education_school/validateIsCheck", function (data) {
+        if (data.code == 200) {
             layer.open({
                 type: 1,
-                id:"neewFieldFormModel",
+                id: "neewFieldFormModel",
                 title: '审核',
                 area: ['800px', '450px'], //宽高
                 fix: false, //不固定
-                shade:0,
+                shade: 0,
                 maxmin: true,
                 content: EducationSchoolInfoDlg.creatFieldCheckModal(),
-                btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                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){
+                success: function (layero, index) {
                     layer.setTop(layero);
                     $("#checkStateModel").val(data.obj.checkState);
                     $("#checkMsg").val(data.obj.checkMsg);
@@ -56,13 +56,13 @@ EducationSchoolInfoDlg.showCheckModal = function(){
                     EducationSchoolInfoDlg.check(index);
                 }
             });
-        }else{
+        } else {
             Feng.error(data.msg);
         }
     }, function (data) {
         Feng.error("校验失败!" + data.responseJSON.message + "!");
     });
-    ajax.setData({"id":$("#id").val()})
+    ajax.setData({"id": $("#id").val()})
     ajax.start();
 }
 
@@ -70,22 +70,22 @@ EducationSchoolInfoDlg.showCheckModal = function(){
  * 审核
  * @param index
  */
-EducationSchoolInfoDlg.check = function(index){
+EducationSchoolInfoDlg.check = function (index) {
     var checkState = $("#checkStateModel").val();
     var checkMsg = $("#checkMsg").val();
-    if(checkState==null||checkState==''){
+    if (checkState == null || checkState == '') {
         Feng.info("请选择审核状态");
-        return ;
+        return;
     }
-    if(checkMsg == null || checkMsg == ''){
+    if (checkMsg == null || checkMsg == '') {
         Feng.info("请填写审核意见");
-        return ;
+        return;
     }
-    var ajax = new $ax(Feng.ctxPath + "/educationSchool/check", function (data) {
-        if(data.code==200){
+    var ajax = new $ax(Feng.ctxPath + "/admin/education_school/check", function (data) {
+        if (data.code == 200) {
             layer.close(index);
             Feng.success(data.msg);
-        }else{
+        } else {
             Feng.error(data.msg);
         }
         locked = false;
@@ -93,7 +93,7 @@ EducationSchoolInfoDlg.check = function(index){
         Feng.error("审核失败!" + data.responseJSON.message + "!");
         locked = false;
     });
-    ajax.setData({"id":$("#id").val(),"checkState":checkState,"checkMsg":checkMsg});
+    ajax.setData({"id": $("#id").val(), "checkState": checkState, "checkMsg": checkMsg});
     ajax.start();
 }
 
@@ -101,25 +101,25 @@ EducationSchoolInfoDlg.check = function(index){
 /**
  * 提交审核
  */
-EducationSchoolInfoDlg.submitCheck = function(){
+EducationSchoolInfoDlg.submitCheck = function () {
     var checkState = $("#checkState").val();
-    if(checkState != 1 && checkState != 9){
+    if (checkState != 1 && checkState != 9) {
         Feng.info("不在审核范围内");
-        return ;
+        return;
     }
-    var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/educationSchool/submitCheck", function (data) {
-            if(data.code==200){
+    var operation = function () {
+        var ajax = new $ax(Feng.ctxPath + "/admin/education_school/submitCheck", function (data) {
+            if (data.code == 200) {
                 Feng.success(data.msg);
                 window.parent.EducationSchool.table.refresh();
                 EducationSchoolInfoDlg.close();
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("提交审核失败!" + data.responseJSON.message + "!");
         });
-        ajax.setData({"id":$("#id").val()});
+        ajax.setData({"id": $("#id").val()});
         ajax.start();
     }
     Feng.confirm("一旦提交无法修改，是否审核完毕且无误?", operation);
@@ -128,48 +128,48 @@ EducationSchoolInfoDlg.submitCheck = function(){
 /**
  *
  */
-EducationSchoolInfoDlg.creatFieldCheckModal = function(){
+EducationSchoolInfoDlg.creatFieldCheckModal = function () {
     return '<form id="checkForm">\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <label for="checkState" class="control-label">审核状态</label>\n' +
-        '                        <select class="form-control" id="checkStateModel" >\n' +
-        '                            <option value="">请选择</option>\n' +
-        '                            <option value="3">审核通过</option>\n' +
-        '                            <option value="2">审核驳回</option>\n' +
-        '                        </select>\n' +
-        '                    </div>\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
-        '                        <textarea class="form-control" id="checkMsg"  rows="6"></textarea>\n' +
-        '                    </div>\n' +
-        '                </form>';
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <label for="checkState" class="control-label">审核状态</label>\n' +
+            '                        <select class="form-control" id="checkStateModel" >\n' +
+            '                            <option value="">请选择</option>\n' +
+            '                            <option value="3">审核通过</option>\n' +
+            '                            <option value="2">审核驳回</option>\n' +
+            '                        </select>\n' +
+            '                    </div>\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
+            '                        <textarea class="form-control" id="checkMsg"  rows="6"></textarea>\n' +
+            '                    </div>\n' +
+            '                </form>';
 }
 
-$(function() {
-    Feng.initValidatorTip("educationSchoolForm",EducationSchoolInfoDlg.validateFields);
+$(function () {
+    Feng.initValidatorTip("educationSchoolForm", EducationSchoolInfoDlg.validateFields);
     //批量加载字典表数据
     var arr = [
-        {"name":"companyStreet","code":"un_street"},
-        {"name":"houseStreet","code":"un_street"},
-        {"name":"talentArrange","code":"un_talentLevel"},
-        {"name":"cRelation","code":"un_education_relation"},
-        {"name":"nowGrade","code":"un_grade"},
-        {"name":"project","code":"un_educationSchool_project"},
-        {"name":"applySchool","code":"un_school_pool"}];
+        {"name": "companyStreet", "code": "street"},
+        {"name": "houseStreet", "code": "street"},
+        {"name": "talentArrange", "code": "talent_arrange"},
+        {"name": "cRelation", "code": "education_relation"},
+        {"name": "nowGrade", "code": "education_grade"},
+        {"name": "project", "code": "education_project"},
+        {"name": "applySchool", "code": "education_school_pool"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
-    $("#applySchool").on('chosen:ready', function(e, params) {
-        $(".chosen-container-single .chosen-single").css("padding","4px 0px 0px 4px");
+    $("#applySchool").on('chosen:ready', function (e, params) {
+        $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
     });
     $("#applySchool").chosen({
-        search_contains:true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        search_contains: true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
         disable_search: false,
-        width:"100%",
+        width: "100%",
         enable_split_word_search: true
     });
     $("select").each(function () {
         $(this).val($(this).attr("value")).trigger("change").trigger("chosen:updated");
     });
     var id = $("#id").val();
-    Feng.getCheckLog("logTable",{"type":CONFIG.project_school,"mainId":id,"typeFileId":"","active":1})
-    Feng.showMiniFileModal(CONFIG.project_school,$("#type").val(),$("#id").val());
+    Feng.getCheckLog("logTable", {"type": CONFIG.project_school, "mainId": id, "typeFileId": "", "active": 1})
+    Feng.showMiniFileModal(CONFIG.project_school, $("#type").val(), $("#id").val());
 });