个人申报子女就学++

app/common/api/MenuApi.php

@@ -259,7 +259,7 @@ class MenuApi {
         $menus = [];
         $menus[] = ["type" => [1], "code" => "grzx", "pcode" => "0", "name" => "个人中心", "url" => "/person/index/center_page", "icon" => "fa-user", "status" => 1];
         $menus[] = ["type" => [1], "code" => "znjx", "pcode" => "0", "name" => "子女就学", "url" => "#", "icon" => "fa-graduation-cap", "status" => 1];
-        $menus[] = ["type" => [1], "code" => "znzx", "pcode" => "znjx", "name" => "子女择校", "url" => "/person/education/choose", "icon" => "fa-thumbs-up", "status" => 1];
+        $menus[] = ["type" => [1], "code" => "znzx", "pcode" => "znjx", "name" => "子女择校", "url" => "/person/education/index", "icon" => "fa-thumbs-up", "status" => 1];
         foreach ($menus as $key => $menu) {
             if (!in_array($type, $menu["type"]) || ($menu["pcode"]) != "0" && $menu["url"] == "" || $menu["status"] == 0)
                 unset($menus[$key]);

app/common/controller/Auth.php

@@ -678,6 +678,10 @@ class Auth extends BaseController {
             if (!$info) {
                 throw new ValidateException("人才库中不存在该证件号码，注册失败");
             }
+
+            if (!strtotime($info["certificateExpireTime"]) || strtotime($info["certificateExpireTime"]) < time()) {
+                throw new ValidateException("人才库中该证件号码所属人才的人才证书已过期，注册失败");
+            }
             if ($info["phone"] != $data["phone"]) {
                 throw new ValidateException("手机号码必须与人才库中一致，可联系企业经办人修改人才库手机号码");
             }

app/person/controller/Education.php

@@ -15,8 +15,29 @@ class Education extends PersonController {
         return view();
     }
 
-    public function choose() {
+    public function list() {
+        $res = [];
+        return json($res);
+    }
+
+    public function validateIsAdd() {
+        
+    }
+
+    public function apply() {
         return view();
     }
 
+    public function view() {
+        return view();
+    }
+
+    public function save() {
+        
+    }
+
+    public function submitToCheck() {
+        
+    }
+
 }

app/person/view/education/apply.html

@@ -0,0 +1,210 @@
+{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="initFileTable(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-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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)">
+                                                        </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}"/>
+                                                    </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}">
+                                                            <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}"/>
+                                                    </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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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}"></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 class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                    <table id="logTable">
+                                    </table>
+                                </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/gate/education/educationSchool/educationSchool_info.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/person/view/education/choose.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<!--
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
--->
-<html>
-    <head>
-        <title>TODO supply a title</title>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    </head>
-    <body>
-        <div>TODO write content</div>
-    </body>
-</html>

app/person/view/education/index.html

@@ -0,0 +1,263 @@
+{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;
+    }
+</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" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">企业名称
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="enterpriseName" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">父母姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="pName" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            父母性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="pSex">
+                                        <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="pIdcard" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="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" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">现居地址
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="address" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">联系电话
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="phone" placeholder="">
+                                </div>
+                            </div>
+
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">子女姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="cName" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            子女性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="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" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            与申报人关系
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="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" placeholder="">
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            现就读年级
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="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 class="col-sm-3">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="EducationSchool.search()">
+                                    <i class="fa fa-search"></i>&nbsp;搜索
+                                </button>
+                                <button type="button" class="btn btn-sm btn-primary " onclick="EducationSchool.reset()">
+                                    <i class="fa fa-trash"></i>&nbsp;重置
+                                </button>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="EducationSchoolTableToolbar" role="group">
+                            <button type="button" class="btn btn-sm btn-primary " onclick="EducationSchool.openAddEducationSchool()">
+                                <i class="fa fa-plus"></i>&nbsp;添加
+                            </button>
+                            <button type="button" class="btn btn-sm btn-primary " onclick="EducationSchool.openEducationSchoolDetail()">
+                                <i class="fa fa-edit"></i>&nbsp;修改
+                            </button>
+                            <button type="button" class="btn btn-sm btn-primary " onclick="EducationSchool.openEducationSchoolSelect()">
+                                <i class="fa fa-book"></i>&nbsp;查看
+                            </button>
+                            <button type="button" class="btn btn-sm btn-primary " onclick="EducationSchool.delete()">
+                                <i class="fa fa-remove"></i>&nbsp;删除
+                            </button>
+                            <!--                            <#button name="打印入学证明" icon="fa-print" clickFun="EducationSchool.print()" space="true"/>-->
+                        </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>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/gate/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/person/view/education/view.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()">申报信息</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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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)">
+                                                        </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}"/>
+                                                    </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}">
+                                                            <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}"/>
+                                                    </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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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}">
+                                                        </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}"/>
+                                                    </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}"></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/gate/education/educationSchool/educationSchool_select.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

public/static/modular/gate/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,64 +14,71 @@ 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: '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: '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-warning">重新提交</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>";
             }
         }
     ];
@@ -82,10 +89,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;
     }
@@ -95,7 +102,7 @@ EducationSchool.check = function () {
  * 点击添加子女就学
  */
 EducationSchool.openAddEducationSchool = function () {
-    var ajax = new $ax(Feng.ctxPath + "/api/educationSchool/valiateIsAdd", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/person/education/valiateIsAdd", function (data) {
         if (data.code == 200) {
             var index = layer.open({
                 type: 2,
@@ -103,27 +110,27 @@ EducationSchool.openAddEducationSchool = function () {
                 area: 'auto', //宽高
                 fix: false, //不固定
                 maxmin: true,
-                content: Feng.ctxPath + '/api/educationSchool/educationSchool_add?year='+data.obj,
-                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 + '/person/education/apply?year=' + data.obj,
+                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.addSubmit();
-                },btn2: function(index, layero){
+                }, btn2: function (index, layero) {
                     var obj = layero.find("iframe")[0].contentWindow;
                     obj.EducationSchoolInfoDlg.submitToCheck();
                     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');
                 }
             });
             EducationSchool.layerIndex = index;
             layer.full(index);
-        }else{
+        } else {
             Feng.info(data.msg);
         }
     }, function (data) {
@@ -137,8 +144,8 @@ EducationSchool.openAddEducationSchool = function () {
  * 打开查看子女就学详情
  */
 EducationSchool.openEducationSchoolDetail = function () {
-    if (this.check()){
-        var ajax = new $ax(Feng.ctxPath + "/api/commonBatch/valiateIsEditOrSubmit", function (data) {
+    if (this.check()) {
+        var ajax = new $ax(Feng.ctxPath + "/common/batch/checkBatchValid", function (data) {
             if (data.code == 200) {
                 var index = layer.open({
                     type: 2,
@@ -146,39 +153,40 @@ EducationSchool.openEducationSchoolDetail = function () {
                     area: 'auto', //宽高
                     fix: false, //不固定
                     maxmin: true,
-                    content: Feng.ctxPath + '/api/educationSchool/educationSchool_update/' + 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 + '/person/education/apply/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.addSubmit();
-                    },btn2: function(index, layero){
+                    }, btn2: function (index, layero) {
                         var obj = layero.find("iframe")[0].contentWindow;
                         obj.EducationSchoolInfoDlg.submitToCheck();
                         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');
                     }
                 });
                 EducationSchool.layerIndex = index;
                 layer.full(index);
-            }else{
+            } else {
                 Feng.info(data.msg);
             }
         }, function (data) {
             Feng.error("校验失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("type",CONFIG.project_school);
-        ajax.set("year",EducationSchool.seItem.year)
+        ajax.set("type", CONFIG.project_school);
+        ajax.set("year", EducationSchool.seItem.year)
+        ajax.set("first_submit_time", EducationSchool.seItem.firstSubmitTime)
         ajax.start();
     }
 };
 
-EducationSchool.openEducationSchoolSelect = function(){
+EducationSchool.openEducationSchoolSelect = function () {
     if (this.check()) {
         var index = layer.open({
             type: 2,
@@ -186,7 +194,7 @@ EducationSchool.openEducationSchoolSelect = function(){
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/api/educationSchool/educationSchool_select/' + EducationSchool.seItem.id,
+            content: Feng.ctxPath + '/person/education/view/id/' + EducationSchool.seItem.id,
             btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
             btnAlign: 'c',
         });
@@ -200,22 +208,22 @@ EducationSchool.openEducationSchoolSelect = function(){
  */
 EducationSchool.delete = function () {
     if (this.check()) {
-        if(EducationSchool.seItem.checkState != -2){
+        if (EducationSchool.seItem.checkState != -2) {
             Feng.error("仅能删除未提交的数据");
-            return  ;
+            return;
         }
-        var operation = function() {
-            var ajax = new $ax(Feng.ctxPath + "/api/educationSchool/delete", function (data) {
-                if(data.code == 200){
+        var operation = function () {
+            var ajax = new $ax(Feng.ctxPath + "/person/education/delete", function (data) {
+                if (data.code == 200) {
                     Feng.success(data.msg);
                     EducationSchool.table.refresh();
-                }else{
+                } else {
                     Feng.info(data.msg);
                 }
             }, function (data) {
                 Feng.error("删除失败!" + data.responseJSON.message + "!");
             });
-            ajax.set("educationSchoolId",EducationSchool.seItem.id);
+            ajax.set("educationSchoolId", EducationSchool.seItem.id);
             ajax.start();
         }
         Feng.confirm("删除后无法恢复，确认删除吗?", operation);
@@ -225,20 +233,20 @@ EducationSchool.delete = function () {
 /**
  *
  */
-EducationSchool.print = function(){
+EducationSchool.print = function () {
     if (this.check()) {
-        if(EducationSchool.seItem.checkState != 3){
+        if (EducationSchool.seItem.checkState != 3) {
             Feng.error("暂未审核通过，无法打印");
-            return  ;
+            return;
         }
-        window.open("/webroot/decision/view/report?viewlet=educationSchool.cpt&&id="+EducationSchool.seItem.id);
+        window.open("/webroot/decision/view/report?viewlet=educationSchool.cpt&&id=" + EducationSchool.seItem.id);
     }
 }
 
 /**
  * 收集数据
  */
-EducationSchool.formParams = function(){
+EducationSchool.formParams = function () {
     var queryData = {};
     queryData['year'] = $("#year").val();
     queryData['enterpriseName'] = $("#enterpriseName").val();
@@ -266,7 +274,7 @@ EducationSchool.formParams = function(){
 /**
  * 重置
  */
-EducationSchool.reset = function(){
+EducationSchool.reset = function () {
     $("#year").val("");
     $("#enterpriseName").val("");
     $("#pName").val("");
@@ -299,16 +307,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})
         }
     });
 }
@@ -316,7 +324,7 @@ EducationSchool.showLog = function (id){
 
 $(function () {
     var defaultColunms = EducationSchool.initColumn();
-    var table = new BSTable(EducationSchool.id, "/api/educationSchool/list", defaultColunms);
+    var table = new BSTable(EducationSchool.id, "/person/education/list", defaultColunms);
     table.setPaginationType("server");
     table.setOnDblClickRow(function () {
         EducationSchool.openEducationSchoolDetail();
@@ -324,20 +332,20 @@ $(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":"applySchool","code":"un_school_pool"}];
+        {"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": "applySchool", "code": "un_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/gate/education/educationSchool/educationSchool_info.js

@@ -171,7 +171,7 @@ EducationSchoolInfoDlg.addSubmit = function() {
         return ;
     }
     if(!validateIsEdit())return;
-    var ajax = new $ax(Feng.ctxPath + "/api/educationSchool/upsert", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/person/education/apply", function(data){
         if(data.code == 200){
             Feng.success(data.msg);
             window.parent.EducationSchool.table.refresh();
@@ -199,7 +199,7 @@ EducationSchoolInfoDlg.submitToCheck = function () {
     }
     if(!validateIsEdit())return;
     var operation = function() {
-        var ajax = new $ax(Feng.ctxPath + "/api/educationSchool/submitToCheck", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/person/education/submitToCheck", function (data) {
             if(data.code==200){
                 Feng.success(data.msg);
                 // $("#checkState").val(data.obj);