瀏覽代碼

高教增加认定条件取得时间
层次变更审核端基础文件

sugangqiang 1 年之前
父節點
當前提交
e9ae0bb779

+ 6 - 6
app/admin/controller/TalentTypeChange.php

@@ -11,23 +11,23 @@ class TalentTypeChange extends AdminController {
         $process = $this->request->param('process');
         switch ($process) {
             case -1:
-                $tpl = "talentTypeChange_before";
+                $tpl = "dept_before";//移除部门初审
                 break;
             case 1:
-                $tpl = "talentTypeChange_first";
+                $tpl = "fst_verify";//初审
                 break;
             case 2:
-                $tpl = "talentTypeChange_dep";
+                $tpl = "dept_verify";//部门审核
                 break;
             case 3:
-                $tpl = "talentTypeChange_third";
+                $tpl = "re_verify";//复审
                 break;
             case 4:
-                $tpl = "talentTypeChange_prepare";
+                $tpl = "prepare";//预备库
 
                 break;
             case 5:
-                $tpl = "talentTypeChange_library";
+                $tpl = "library";//正式库
                 break;
         }
 

+ 4 - 0
app/admin/view/talent/school/talentInfo_common_check.html

@@ -187,6 +187,10 @@
                                                                 <option value="{$info.talent_condition}">{$info.talentConditionName}</option>
                                                             </select>
                                                         </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
+                                                            <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$info.identifyGetTime}"/>
+                                                        </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>开户银行</label>
                                                             <input type="text" class="form-control" id="bank" name="bank" value="{$info.bank}" placeholder="XX银行"/>

+ 342 - 0
app/admin/view/talent_type_change/common_check.html

@@ -0,0 +1,342 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    #talentInfoForm label {
+        font-size: xx-small;
+    }
+
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    #field ul li{
+        list-style: none;
+        display:inline-block;
+        width:13%;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-right:5px;
+        margin-top:1px;
+    }
+    .imgs li{
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #1E9FFF;
+        background-color: #1E9FFF;
+        color: #fff;
+    }
+    .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
+        background-color: #ddd;
+        opacity: 1;
+    }
+    #fileTable td{
+        word-break: break-word;
+        white-space: inherit;
+    }
+</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="TalentTypeChangeInfoDlg.initFileTable()"  aria-expanded="false">2.附件上传</a></li>
+                            <li  class="" style="float: right;"><#button name="打包下载" icon="fa-download" clickFun="TalentTypeChangeInfoDlg.download()"/></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="talentTypeForm">
+                                    <div class="col-sm-12 form-group-sm">
+                                        <input type="hidden" id="id" name="id" value="${item.id}">
+                                        <input type="hidden" id="process" name="process" value="${item.process}">
+                                        <input type="hidden" id="type" name="type" value="${item.type}">
+                                        <input type="hidden" id="checkState" name="checkState" value="${item.checkState}"/>
+                                        <input type="hidden" id="talentId" name="talentId" value="${item.talentId}"/>
+                                        <input type="hidden" id="enterpriseId" name="enterpriseId" value="${item.enterpriseId}"/>
+                                        <input type="hidden" id="companyId" value="${companyId}" value="${companyId}">
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">变更对象</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" readonly="readonly" id="talentName" name="talentName" value="${item.talentName}">
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">证件号码</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" id="idCard" readonly="readonly" name="idCard" value="${item.idCard}"/>
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">单位名称</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" id="enterpriseName" readonly="readonly" name="enterpriseName" value="${item.enterpriseName}"/>
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">原申报年度</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" readonly="readonly" id="oldYear" name="oldYear" value="${item.oldYear}">
+                                            </div>
+                                        </div>
+                                        @if(item.type==1){
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">原申报来源</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <select class="form-control" disabled="disabled" id="oldSource" name="oldSource" value="${item.oldSource}">
+                                                        <option value="">请选择</option>
+                                                        <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
+                                                        <option value="2">从我市以外的其他县(市、区)变动到我市工作的泉州市高层次人才</option>
+                                                        <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            @if(item.oldSource==1){
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing">公布入选来源</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <select class="form-control" disabled="disabled" id="oldOurCitySource" name="oldOurCitySource" value="${item.oldOurCitySource}">
+                                                            <option value="">请选择</option>
+                                                            <option value="1">泉州市公布入选的泉州市第一至第五层次人才</option>
+                                                            <option value="2">晋江市公布入选的泉州市高层次第六七层次人才</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            @}
+                                            @if(item.oldSource==2){
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing">原入选来源县市</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input class="form-control" readonly="readonly" id="oldFromCityName" name="oldFromCityName" value="${item.oldFromCityName}">
+                                                    </div>
+                                                </div>
+                                            @}
+                                            @if(item.oldSource==1 || item.oldSource==2){
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing">原入选名单批次</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input class="form-control" readonly="readonly" id="oldQzBath" name="oldQzBath" value="${item.oldQzBath}">
+                                                    </div>
+                                                </div>
+                                            @}
+                                        @}
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">原人才层次</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" readonly="readonly" id="oldTalentArrangeName" name="oldTalentArrangeName" value="${item.oldTalentArrangeName}">
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">原认定条件</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" readonly="readonly" id="oldIdentifyConditionCH" name="oldIdentifyConditionCH" value="${item.oldIdentifyConditionCH}"></input>
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">原认定条件证书取得时间</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" id="oldIdentifyGetTime" readonly="readonly" name="oldIdentifyGetTime" value="${item.oldIdentifyGetTime}"/>
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">原认定条件名称</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control " id="oldIdentifyConditionName" readonly="readonly" name="oldIdentifyConditionName" title="${item.oldIdentifyConditionName}" value="${item.oldIdentifyConditionName}"/>
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">原公布入选月份</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control " id="oldIdentifyMonth" readonly="readonly" name="oldIdentifyMonth" value="${item.oldIdentifyMonth}"/>
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup" style="display: none">
+                                            <label class="col-sm-2 control-label spacing">原人才编号</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control " id="oldCertificateNO" readonly="readonly" name="oldCertificateNO" value="${item.oldCertificateNO}"/>
+                                            </div>
+                                        </div>
+                                        @if(item.type==1){
+                                            <div class="rowGroup" >
+                                                <label class="col-sm-2 control-label spacing">原泉州高层次人才证书发证日期</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input class="form-control" readonly="readonly" id="oldCertificateStartTime"  name="oldCertificateStartTime" value="${item.oldCertificateStartTime}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">原泉州高层次人才证书的有效期</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input class="form-control " id="oldCertificateOutTime" readonly="readonly" name="oldCertificateOutTime" value="${item.oldCertificateOutTime}"/>
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">原引进方式</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input class="form-control" id="oldIntroductionModeName" readonly="readonly" name="oldIntroductionModeName" value="${item.oldIntroductionModeName}">
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">新申报年度</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input class="form-control" readonly="readonly" id="newYear" name="newYear" value="${item.newYear}">
+                                                </div>
+                                            </div>
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">新申报来源</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <select class="form-control" disabled="disabled" id="newSource" name="newSource" value="${item.newSource}" onchange="TalentTypeChangeInfoDlg.sourceChange()">
+                                                        <option value="">请选择</option>
+                                                        <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
+                                                        <option value="2">从我市以外的其他县(市、区)变动到我市工作的泉州市高层次人才</option>
+                                                        <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            @if(item.newSource==1){
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing">新公布入选来源</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <select class="form-control" disabled="disabled" id="newOurCitySource" name="newOurCitySource" value="${item.newOurCitySource}">
+                                                            <option value="">请选择</option>
+                                                            <option value="1">泉州市公布入选的泉州市第一至第五层次人才</option>
+                                                            <option value="2">晋江市公布入选的泉州市高层次第六七层次人才</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            @}
+                                            @if(item.newSource==2){
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing">新入选来源县市</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input class="form-control" readonly="readonly" id="newFromCity" name="newFromCity" value="${item.newFromCityName}">
+                                                    </div>
+                                                </div>
+                                            @}
+                                            @if(item.newSource==1 || item.newSource==2){
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-2 control-label spacing">新入选名单批次</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input class="form-control" readonly="readonly" id="newQzBath" name="newQzBath" value="${item.newQzBath}">
+                                                    </div>
+                                                </div>
+                                            @}
+                                        @}
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">新人才层次</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control"readonly="readonly" id="newTalentArrangeName" name="newTalentArrangeName" value="${item.newTalentArrangeName}" >
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">新认定条件</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" readonly="readonly" id="newIdentifyConditionCH" name="newIdentifyConditionCH" value="${item.newIdentifyConditionCH}" title="${item.newIdentifyConditionCH}">
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">新认定条件证书取得时间</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" readonly="readonly" id="newIdentifyGetTime" name="newIdentifyGetTime" value="${item.newIdentifyGetTime}"/>
+                                            </div>
+                                        </div>
+                                        <div class="rowGroup">
+                                            <label class="col-sm-2 control-label spacing">新认定条件名称</label>
+                                            <div class="col-sm-4 spacing">
+                                                <input class="form-control" readonly="readonly" id="newIdentifyConditionName" title="${item.newIdentifyConditionName}" name="newIdentifyConditionName" value="${item.newIdentifyConditionName}"/>
+                                            </div>
+                                        </div>
+                                        @if(item.type==1){
+                                            @if(item.newSource==1 || item.newSource==2 || (item.checkState==35 && item.isPublic>=5)){
+                                                <div class="rowGroup" >
+                                                    <label class="col-sm-2 control-label spacing">新泉州高层次人才证书发证日期</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input class="form-control" readonly="readonly" id="newCertificateStartTime" name="newCertificateStartTime" value="${item.newCertificateStartTime}"/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" >
+                                                    <label class="col-sm-2 control-label spacing">新泉州高层次人才证书的有效期</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input class="form-control" readonly="readonly" id="newCertificateOutTime" name="newCertificateOutTime" value="${item.newCertificateOutTime}"/>
+                                                    </div>
+                                                </div>
+                                            @}
+                                            <div class="rowGroup">
+                                                <label class="col-sm-2 control-label spacing">新引进方式</label>
+                                                <div class="col-sm-4 spacing">
+                                                    <input class="form-control" readonly="readonly" id="newIntroductionModeName" name="newIntroductionModeName" value="${item.newIntroductionModeName}">
+                                                </div>
+                                            </div>
+                                        @}
+                                    </div>
+                                </form>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <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"/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--&lt;!&ndash;审核模态框&ndash;&gt;-->
+<!--<div class="modal fade " id="commonModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">-->
+<!--    <div class="modal-dialog" role="document">-->
+<!--        <div class="modal-content animated flipInY">-->
+<!--            <div class="modal-header">-->
+<!--                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
+<!--                <h4 class="modal-title" id="basicModalLabel">审核</h4>-->
+<!--            </div>-->
+<!--            <div class="modal-body">-->
+<!--                <form id="commonCheckForm">-->
+<!--                    <div class="form-group">-->
+<!--                        <label for="checkState" class="control-label">审核状态</label>-->
+<!--                        <select class="form-control" id="checkStateModal" onchange="TalentTypeChangeInfoDlg.toggleDepField()">-->
+<!--                            <option value=""></option>-->
+<!--                            <option value="3">审核通过</option>-->
+<!--                            <option value="2">审核驳回</option>-->
+<!--                        </select>-->
+<!--                    </div>-->
+<!--                    <div class="form-group">-->
+<!--                        <label for="checkMsg" class="control-label">审核意见</label>-->
+<!--                        <textarea class="form-control" id="checkMsg" placeholder="审核状态属“审核通过”的,仅代表此步骤已操作完成,不代表用户提交的信息符合认定条件。若不符合认定条件的,请写明不符合原因。"></textarea>-->
+<!--                    </div>-->
+<!--                </form>-->
+<!--            </div>-->
+<!--            <div class="modal-footer">-->
+<!--                <button type="button" class="btn btn-primary" onclick="TalentTypeChangeInfoDlg.commonCheck()">提交</button>-->
+<!--                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
+
+
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common_check.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common_check.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+@}

+ 118 - 0
app/admin/view/talent_type_change/dept_verify.html

@@ -0,0 +1,118 @@
+@layout("/common/_container.html"){
+<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">
+                                <#NameCon id="talentName" name="姓名" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="idCard" name="证件号码" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="enterpriseName" name="单位名称" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="oldYear" name="原申报年度" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="oldTalentArrange" name="原人才层次" >
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="oldIdentifyCondition" name="原认定条件" >
+                                </#SelectCon>
+                            </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 time" id="oldIdentifyMonth" name="oldIdentifyMonth"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="newYear" name="新申报年度" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="newTalentArrange" name="新人才层次" >
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="newIdentifyCondition" name="新认定条件" >
+                                </#SelectCon>
+                            </div>
+            <div class="col-sm-3" style="display: none">
+                <div class="input-group">
+                    <div class="input-group-btn">
+                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">新公布入选月份
+                        </button>
+                    </div>
+                    <input type="text" time="time" formate="date" class="form-control" id="newIdentifyMonth" name="newIdentifyMonth"/>
+                </div>
+            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="checkState" name="审核状态" >
+                                    <option value="" >请选择</option>
+                                    <option value="1">待审核</option>
+                                    <option value="2">已驳回</option>
+                                    <option value="3">已通过</option>
+                                    <option value="5">重新提交</option>
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3" style="display: none">
+                                <#SelectCon id="isPublic" name="状态" >
+                                    <option value="">请选择</option>
+                                    <option value="1">待核查征信</option>
+                                    <option value="2">待公示</option>
+                                    <option value="3">公示中</option>
+                                    <option value="4">待公布</option>
+                                    <option value="5">待发证</option>
+                                    <option value="6">已发证</option>
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#button name="搜索" icon="fa-search" clickFun="TalentTypeChange.search()"/>
+                                <#button name="重置" icon="fa-trash" clickFun="TalentTypeChange.reset()"/>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentTypeChangeTableToolbar" role="group">
+                            @if(shiro.hasPermission("/talentTypeChange/depCheck")){
+                            <#button name="审核" icon="fa-check" clickFun="TalentTypeChange.openTalentTypeChangeCheck()"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/depExport")){
+                            <#button name="导出" icon="fa-file-excel-o" clickFun="TalentTypeChange.export(2)" space="true"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/depDownload")){
+                            <#button name="下载" icon="fa-download" clickFun="TalentTypeChange.download()"/>
+                            @}
+                        </div>
+                        <#table id="TalentTypeChangeTable"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_dep.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_dep.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+@}

+ 0 - 0
app/admin/view/talent_type_change/talentTypeChange_first.html → app/admin/view/talent_type_change/fst_verify.html


+ 320 - 0
app/admin/view/talent_type_change/prepare.html

@@ -0,0 +1,320 @@
+@layout("/common/_container.html"){
+<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">
+                                <#NameCon id="talentName" name="姓名" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="idCard" name="证件号码" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="enterpriseName" name="单位名称" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="oldYear" name="原申报年度" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="oldTalentArrange" name="原人才层次" >
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="oldIdentifyCondition" name="原认定条件" >
+                                </#SelectCon>
+                            </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 time" id="oldIdentifyMonth" name="oldIdentifyMonth"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="newYear" name="新申报年度" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="newTalentArrange" name="新人才层次" >
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="newIdentifyCondition" name="新认定条件" >
+                                </#SelectCon>
+                            </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 time" id="newIdentifyMonth" name="newIdentifyMonth"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="isPublic" name="状态" >
+                                    <option value="">请选择</option>
+                                    <option value="1">待核查征信</option>
+                                    <option value="2">待公示</option>
+                                    <option value="3">公示中</option>
+                                    <option value="4">待公布</option>
+                                    <option value="5">待发证</option>
+                                    <option value="6">已发证</option>
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="checkState" name="审核状态">
+                                    <option value="">请选择</option>
+                                    <option value="-1">审核不通过</option>
+                                    <option value="35">已通过</option>
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#button name="搜索" icon="fa-search" clickFun="TalentTypeChange.search()"/>
+                                <#button name="重置" icon="fa-trash" clickFun="TalentTypeChange.reset()"/>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentTypeChangeTableToolbar" role="group">
+                            @if(shiro.hasPermission("/talentTypeChange/prepareHczx")){
+                            <#button name="导出核查征信" icon="fa-file-excel-o" clickFun="TalentTypeChange.showDataCheckModal(1)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/hczxReject")){
+                            <#button name="征信失信" icon="fa-external-link" clickFun="TalentTypeChange.showHczxRejectModal()" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/hczxPass")){
+                            <#button name="征信通过" icon="fa-external-link" clickFun="TalentTypeChange.showDataCheckModal(2)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/publicExportBefore")){
+                            <#button name="公示预览" icon="fa-file-excel-o" clickFun="TalentTypeChange.showDataCheckModal(7)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/preparePublic")){
+                            <#button name="公示" icon="fa-opencart" btnCss="danger" clickFun="TalentTypeChange.showDataCheckModal(3)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/preparePublicExport")){
+                            <#button name="公示导出" icon="fa-file-excel-o" clickFun="TalentTypeChange.publicExport(1)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/prepareCheck")){
+                            <#button name="公示再审核" icon="fa-check-square-o" clickFun="TalentTypeChange.afterCheck()" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/publicPass")){
+                            <#button name="公示通过" icon="fa-compass" clickFun="TalentTypeChange.showDataCheckModal(4)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentInfo/publishExportBefore")){
+                            <#button name="公布预览" icon="fa-television" clickFun="TalentTypeChange.showDataCheckModal(8)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/preparePublish")){
+                            <#button name="公布" icon="fa-television" btnCss="danger" clickFun="TalentTypeChange.showDataCheckModal(5)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/preparePublishExport")){
+                            <#button name="公布导出" icon="fa-file-excel-o" clickFun="TalentTypeChange.publicExport(2)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/prepareCanclePublish")){
+                            <#button name="撤销公布" icon="fa-reply" clickFun="TalentTypeChange.canclePublish()" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/prepareCertification")){
+                            <#button name="发证" icon="fa-newspaper-o" clickFun="TalentTypeChange.showDataCheckModal(6)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/prepareExport")){
+                            <#button name="导出" icon="fa-file-excel-o" clickFun="TalentTypeChange.export(4)" space="false"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/prepareDownload")){
+                            <#button name="下载" icon="fa-download" clickFun="TalentTypeChange.download()"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/prepareDownload")){
+                            <#button name="批量下载头像" icon="fa-cloud-download" clickFun="TalentTypeChange.downloadPhoto()"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/prepareDetail")){
+                            <#button name="查看" icon="fa-eye" clickFun="TalentTypeChange.openTalentTypeChangeDetail()" space="false"/>
+                            @}
+                        </div>
+                        <#table id="TalentTypeChangeTable"/>
+                        <form id="publicForm" action="${ctxPath}/talentTypeChange/public" target="hiddenIframe" style="display: none">
+                            <input name="type" id="type">
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--核查征信导入模态框-->
+<div class="modal fade " id="hczxModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="hczxModalLabel">导入核查征信结果文件</h4>
+            </div>
+            <div class="modal-body">
+                <form id="importHczx-form" action="${ctxPath}/talentTypeChangeImport/importHczx" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                    <input type="file" id="file" name="file" onchange="$('#fileName').val($('#file').val());" class="hidden">
+                    <div class="form-group row">
+                        <div class="col-sm-1"></div>
+                        <div class="col-sm-11">
+                            <div class="input-group">
+                                <input type="text" class="form-control" id="fileName" name="fileName" placeholder="请选择需要上传的附件" readonly="readonly" >
+                                <span class="input-group-btn">
+						        	<button class="btn btn-secondary" type="button" onclick="$('#file').click()"><i class="fa fa-search"></i>选择文件</button>
+						      	</span>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="TalentTypeChange.importHczxSubmit()">提交</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--公示再审核模态框-->
+<div class="modal fade " id="checkModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="rejectModalLabel">公示再审核</h4>
+            </div>
+            <div class="modal-body">
+                <form id="checkForm" class="form-horizontal">
+                    <input type="hidden" id="mainId" name="id">
+                    <div class="form-group">
+                        <div class="row" style="margin-bottom: 10px;">
+                            <label class="col-sm-2 control-label">审核状态</label>
+                            <div class="col-sm-10">
+                                <select id="checkStateAfter" name="checkState" class="form-control">
+                                </select>
+                            </div>
+
+                        </div>
+                        <div class="row">
+                            <label class="col-sm-2 control-label">审核意见</label>
+                            <div class="col-sm-10">
+                                <textarea id="msg" name="msg" class="form-control"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="TalentTypeChange.afterCheckSubmit()">提交</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--需要核查征信的名单-->
+<div class="modal fade " id="exportCommonModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog modal-lg" role="document" style="min-width: 1200px;">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="exportCommonModalLabel">待核查征信名单</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" style="padding-bottom: 5px;">
+                    <div class="form-group-sm ">
+                        <div class="row">
+                            <div class="rowGroup">
+                                <label class="col-sm-1 control-label">姓名</label>
+                                <div class="col-sm-3 spacing">
+                                    <input type="text" class="form-control input-sm"  id="pub_name" name="name" >
+                                </div>
+                            </div>
+                            <div class="rowGroup">
+                                <label class="col-sm-1 control-label">审核状态</label>
+                                <div class="col-sm-3 spacing">
+                                    <select type="text" class="form-control input-sm"  id="pub_checkState" name="checkState" >
+                                        <option value="">请选择</option>
+                                        <option value="-1">审核不通过</option>
+                                        <option value="35">已通过</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                <div class="toolbar" style="padding-bottom: 5px;text-align: center">
+                    <button type="button" class="btn btn-sm btn-info" onclick="TalentTypeChange.prepareSearch()"><i class="fa fa-search"></i>搜索</button>
+                    <button type="button" class="btn btn-sm btn-danger" onclick="TalentTypeChange.prepareReset()"><i class="fa fa-trash"></i>重置</button>
+                    <button id="checkAll" class="btn btn-secondary btn-sm btn-success"><i class="fa fa-check-square-o"></i>全选</button>
+                    <button id="uncheckAll" class="btn btn-secondary btn-sm btn-danger"><i class="fa fa-ban"></i>取消全选</button>
+                </div>
+                <table id="dataTable" class="table-condensed" style="font-size: 12px;"></table>
+                <form id="hczxForm" class="form-inline" style="padding-top: 10px;">
+                    <div class="form-group form-inline">
+                        <label class=" control-label">是否发送短信</label>
+                        <input type="radio" name="isSend" id="isSend1" value="1" onclick="TalentTypeChange.toggleMessage()" checked="checked"> 是
+                        <input type="radio" name="isSend" id="isSend2" value="2" onclick="TalentTypeChange.toggleMessage()"> 否
+                    </div>
+                    <div class="form-group form-inline" id="messageEdit">
+                        <label class=" control-label" style="line-height: 40px;"><span style="color: red;">编辑短信内容</span>:您好!您提交申请的
+                            <input type="text" class="form-control input-sm" id="typeName" value="${message.typeName}" maxlength="20">已完成初步审核,现通过
+                            <input type="text" class="form-control input-sm" id="web" placeholder="公示平台(如聚财网/人才晋江公众号)" value="${message.address}" maxlength="40">将审核结果予以公示,公示时间
+                            <input type="text" class="form-control input-sm time" id="publicStartTime">至<input type="text" class="form-control input-sm time" id="publicEndTime" >。公示期间如有异议,请及时向
+                            <input type="text" class="form-control input-sm" id="dep" placeholder="xx单位/部门" value="${message.dep}" maxlength="30">反映。电话
+                            <input type="text" class="form-control input-sm" id="phone" value="${message.phone}" maxlength="30">,电子邮箱
+                            <input type="text" class="form-control input-sm" id="email" value="${message.email}" maxlength="20">。
+                        </label>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="hczxButton" onclick="TalentTypeChange.checkExport()">导出</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--核查征信不通过-->
+<div class="modal fade " id="hczxRejectModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="hczxRejectModalLabel">核查征信不通过</h4>
+            </div>
+            <div class="modal-body">
+                <form id="hczxRejectForm" class="form-horizontal">
+                    <input type="hidden" name="hczxId" id="hczxId">
+                    <div class="form-group">
+                        <div class="row">
+                            <label class="col-sm-2 control-label">审核意见</label>
+                            <div class="col-sm-10">
+                                <textarea id="hczxMsg" name="hczxMsg" class="form-control"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary"  onclick="TalentTypeChange.hczxReject()">提交</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 src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_prepare.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_prepare.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+@}

+ 119 - 0
app/admin/view/talent_type_change/re_verify.html

@@ -0,0 +1,119 @@
+@layout("/common/_container.html"){
+<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">
+                                <#NameCon id="talentName" name="姓名" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="idCard" name="证件号码" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="enterpriseName" name="单位名称" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="oldYear" name="原申报年度" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="oldTalentArrange" name="原人才层次" >
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="oldIdentifyCondition" name="原认定条件" >
+                                </#SelectCon>
+                            </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 time" id="oldIdentifyMonth" name="oldIdentifyMonth"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="newYear" name="新申报年度" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="newTalentArrange" name="新人才层次" >
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="newIdentifyCondition" name="新认定条件" >
+                                </#SelectCon>
+                            </div>
+            <div class="col-sm-3" style="display: none">
+                <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" time="time" formate="date" class="form-control" id="newIdentifyMonth" name="newIdentifyMonth"/>
+                </div>
+            </div>
+                            <div class="col-sm-3">
+                                <#SelectCon id="checkState" name="审核状态">
+                                    <option value="">请选择</option>
+                                    <option value="-1">审核不通过</option>
+                                    <option value="5">重新提交</option>
+                                    <option value="25">待审核</option>
+                                    <option value="30">已驳回</option>
+                                    <option value="35">已通过</option>
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3" style="display: none">
+                                <#SelectCon id="isPublic" name="状态" >
+                                    <option value="">请选择</option>
+                                    <option value="1">待核查征信</option>
+                                    <option value="2">待公示</option>
+                                    <option value="3">公示中</option>
+                                    <option value="4">待公布</option>
+                                    <option value="5">待发证</option>
+                                    <option value="6">已发证</option>
+                                </#SelectCon>
+                            </div>
+                            <div class="col-sm-3">
+                                <#button name="搜索" icon="fa-search" clickFun="TalentTypeChange.search()"/>
+                                <#button name="重置" icon="fa-trash" clickFun="TalentTypeChange.reset()"/>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentTypeChangeTableToolbar" role="group">
+                            @if(shiro.hasPermission("/talentTypeChange/thirdCheck")){
+                            <#button name="审核" icon="fa-check" clickFun="TalentTypeChange.openTalentTypeChangeCheck()"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/thirdExport")){
+                            <#button name="导出" icon="fa-file-excel-o" clickFun="TalentTypeChange.export(3)"/>
+                            @}
+                            @if(shiro.hasPermission("/talentTypeChange/thirdDownload")){
+                            <#button name="下载" icon="fa-download" clickFun="TalentTypeChange.download()"/>
+                            @}
+                        </div>
+                        <#table id="TalentTypeChangeTable"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_third.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_third.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+@}

+ 1 - 0
app/common/api/DictApi.php

@@ -331,6 +331,7 @@ class DictApi {
             "talent_arrange" => "人才层次",
             "talent_arrange_category" => "人才条款",
             "talent_condition" => "认定条件",
+            "identifyGetTime" => "认定条件取得时间",
             "bank" => "开户银行",
             "bank_account" => "银行账号",
             "bank_number" => "银行行号",

+ 2 - 2
app/enterprise/controller/Talent.php

@@ -644,7 +644,7 @@ class Talent extends EnterpriseController {
 
             $no_empty = ["name", "nation", "card_type", "card_number", "sex", "birthday", "politics", "nationality", "province", "city", "talent_type",
                 "position", "cur_entry_time", "labor_contract_rangetime", "highest_degree", "graduate_school", "major", "study_abroad", "phone",
-                "talent_arrange", "talent_condition",
+                "talent_arrange", "talent_condition", "identifyGetTime",
                 "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education"];
             if ($info["study_abroad"] == 1) {
                 $no_empty[] = "abroad_school";
@@ -1415,7 +1415,7 @@ class Talent extends EnterpriseController {
             $all_valid_keys = ["name", "nation", "card_type", "card_number", "sex", "birthday", "politics", "nationality", "province", "city", "county", "talent_type",
                 "position", "cur_entry_time", "labor_contract_rangetime",
                 "highest_degree", "graduate_school", "major", "study_abroad", "title", "pro_qua", "phone", "email",
-                "talent_arrange", "talent_condition",
+                "talent_arrange", "talent_condition", "identifyGetTime",
                 "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education"];
             foreach ($all_valid_keys as $key) {
                 $value = trim($param[$key]);

+ 4 - 0
app/enterprise/view/talent/school/apply.html

@@ -189,6 +189,10 @@
                                                             <label class=" control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                             <select class="form-control" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.changeIdentifyCondition()" value="{$row.talent_condition}"></select>
                                                         </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
+                                                            <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
+                                                        </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>开户银行</label>
                                                             <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" value="{$row.bank}" placeholder="XX银行"/>

+ 4 - 0
app/enterprise/view/talent/school/view.html

@@ -189,6 +189,10 @@
                                                             <label class=" control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                             <select class="form-control" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.changeIdentifyCondition()" value="{$row.talent_condition}"></select>
                                                         </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
+                                                            <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
+                                                        </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>开户银行</label>
                                                             <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" value="{$row.bank}" placeholder="XX银行"/>

+ 2 - 0
public/static/modular/gate/talentInfo/talentInfo_gj_info.js

@@ -58,6 +58,7 @@ var TalentInfoInfoDlg = {
         talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
         talent_arrange_category: {validators: {notEmpty: {message: '人才条款不能为空'}}},
         talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
+        identifyGetTime: {validators: {notEmpty: {message: '认定条件取得时间不能为空'}}},
         bank: {
             validators: {
                 notEmpty: {
@@ -154,6 +155,7 @@ TalentInfoInfoDlg.collectData = function () {
             .set('talent_arrange')
             .set('talent_arrange_category')
             .set('talent_condition')
+            .set('identifyGetTime')
             .set('bank')
             .set('bank_account')
             .set('bank_number')

+ 39 - 37
public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_dep.js

@@ -2,8 +2,8 @@
  * 人才类别变更管理初始化
  */
 var TalentTypeChange = {
-    id: "TalentTypeChangeTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "TalentTypeChangeTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,47 +14,49 @@ var TalentTypeChange = {
 TalentTypeChange.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '审核单位', field: 'companyName', visible: true, align: 'center', valign: 'middle',width:'10%','class': 'uitd_showTip'},
-        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
+        {title: '审核单位', field: 'companyName', visible: true, align: 'center', valign: 'middle', width: '10%', 'class': 'uitd_showTip'},
+        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
         // {title: '原认定条件证书取得时间', field: 'oldIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px",
-            formatter : function (value,row,index) {
+        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px",
+            formatter: function (value, row, index) {
                 return row.oldCertificateStartTime + "至" + row.oldCertificateOutTime
             }
         },
-        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
+        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
         // {title: '新认定条件证书取得时间', field: 'newIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
+        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
         // {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '审核状态', field: 'depState', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
-            formatter : function (value,row,index) {
-                if(value == 1){
-                    if(row.highProcess!=null && row.highProcess!='' && row.highProcess>=2){
+        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '审核状态', field: 'depState', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
+            formatter: function (value, row, index) {
+                if (value == 1) {
+                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 2) {
                         return "<span class='label label-success'>重新提交</span>"
                     }
                     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>"
                 }
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter: function (value,row,index) {
-                return "<span class='label label-success' onclick=\"TalentTypeChange.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=\"TalentTypeChange.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         }
     ];
@@ -65,10 +67,10 @@ TalentTypeChange.initColumn = function () {
  */
 TalentTypeChange.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录!");
         return false;
-    }else{
+    } else {
         TalentTypeChange.seItem = selected[0];
         return true;
     }
@@ -83,15 +85,15 @@ TalentTypeChange.openTalentTypeChangeCheck = function () {
             type: 2,
             title: '人才类别审核',
             area: ['800px', '420px'], //宽高
-            fix: false,                 //不固定
+            fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/toDepCheck/' + TalentTypeChange.seItem.id + '/'+ TalentTypeChange.seItem.companyId,
-            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交','<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            content: Feng.ctxPath + '/talentTypeChange/toDepCheck/' + TalentTypeChange.seItem.id + '/' + TalentTypeChange.seItem.companyId,
+            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save 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.TalentTypeChangeInfoDlg.showCommonCheckModal();
-            },btn2: function(index, layero){
+            }, btn2: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.TalentTypeChangeInfoDlg.submitCheck();
                 return false;
@@ -113,7 +115,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/talentTypeChange_toDepDetail/' + TalentTypeChange.seItem.id +'/'+TalentTypeChange.seItem.companyId,
+            content: Feng.ctxPath + '/admin/talentTypeChange/deptDetail/id/' + TalentTypeChange.seItem.id + '/company/' + TalentTypeChange.seItem.companyId,
         });
         TalentTypeChange.layerIndex = index;
         layer.full(index);
@@ -122,7 +124,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
 
 $(function () {
     var defaultColunms = TalentTypeChange.initColumn();
-    var table = new BSTable(TalentTypeChange.id, "/talentTypeChange/list/2", defaultColunms);
+    var table = new BSTable(TalentTypeChange.id, "/admin/talentTypeChange/list/process/2", defaultColunms);
     table.setPaginationType("server");
     // table.setHeight(665);
     TalentTypeChange.table = table.init();

+ 117 - 112
public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_first.js

@@ -2,8 +2,8 @@
  * 人才类别变更管理初始化
  */
 var TalentTypeChange = {
-    id: "TalentTypeChangeTable",	//表格id
-    seItem: null,		//选中的条目
+    id: "TalentTypeChangeTable", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
@@ -14,56 +14,61 @@ var TalentTypeChange = {
 TalentTypeChange.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
-        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px",
-            formatter : function (value,row,index) {
+        {title: '原申报年度', field: 'oldYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '工作单位', field: 'enterpriseName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '姓名', field: 'talentName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原人才层次', field: 'oldTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '原认定条件', field: 'oldIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
+        {title: '原认定条件名称', field: 'oldIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
+        {title: '原证书有效期', field: 'oldCertificateStartTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px",
+            formatter: function (value, row, index) {
                 return row.oldCertificateStartTime + "至" + row.oldCertificateOutTime
             }
         },
-        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle',width:'80px'},
-        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
+        {title: '原公布入选月份', field: 'oldIdentifyMonth', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新申报年度', field: 'newYear', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '新人才层次', field: 'newTalentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '新认定条件', field: 'newIdentifyConditionCH', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "140px"},
         // {title: '新认定条件证书取得时间', field: 'newIdentifyGetTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px"},
-        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"130px"},
+        {title: '新认定条件名称', field: 'newIdentifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "130px"},
         // {title: '新公布入选月份', field: 'newIdentifyMonth', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px"},
-        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
-            formatter : function (value,row,index) {
-                if(value==-1){
+        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
+            formatter: function (value, row, index) {
+                if (value == -1) {
                     return "<span class='label label-danger'>审核不通过</span>"
-                }if(value==1){
+                }
+                if (value == 1) {
                     return "<span class='label'>待提交</span>"
-                }if(value==7){
-                    if(row.highProcess!=null && row.highProcess!='' && row.highProcess>=1){
+                }
+                if (value == 7) {
+                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 1) {
                         return "<span class='label label-success'>重新提交</span>"
-                    }else{
+                    } else {
                         return "<span class='label label-success'>待审核</span>"
                     }
-                }if(value==20){
-                    if(row.highProcess!=null && row.highProcess!='' && row.highProcess>=1){
+                }
+                if (value == 20) {
+                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 1) {
                         return "<span class='label label-success'>上级驳回</span>"
-                    }else{
+                    } else {
                         return "<span class='label label-success'>待审核</span>"
                     }
-                }if(value==10){
+                }
+                if (value == 10) {
                     return "<span class='label label-danger'>已驳回</span>"
-                }if(value == 15 ||value>=25){
+                }
+                if (value == 15 || value >= 25) {
                     return "<span class='label label-primary'>已通过</span>"
                 }
             }
         },
-        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
-            formatter: function (value,row,index) {
-                return "<span class='label label-success' onclick=\"TalentTypeChange.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=\"TalentTypeChange.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
             }
         }
     ];
@@ -74,20 +79,20 @@ TalentTypeChange.initColumn = function () {
  */
 TalentTypeChange.check = function () {
     var selected = $('#' + this.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录!");
         return false;
-    }else{
+    } else {
         TalentTypeChange.seItem = selected[0];
         return true;
     }
 };
 
-TalentTypeChange.updateFieldsAndFiles = function(){
+TalentTypeChange.updateFieldsAndFiles = function () {
     if (this.check()) {
-        var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/findFieldsAndFiles?id="+TalentTypeChange.seItem.id, function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/findFieldsAndFiles?id=" + TalentTypeChange.seItem.id, function (data) {
             var obj = data.obj.obj;
-            if(data.code==200){
+            if (data.code == 200) {
                 layer.open({
                     type: 1,
                     id: "neewFieldFormModel",
@@ -103,24 +108,24 @@ TalentTypeChange.updateFieldsAndFiles = function(){
                     success: function (layero, index) {
                         var fileList = data.obj.fileList;
                         var html = '';
-                        for(var key in fileList){
-                            html = html + '<ul><li style="width: 100%"><input type="checkbox" value="'+fileList[key].id+'"><span>'+fileList[key].name+'</span></li></ul>';
+                        for (var key in fileList) {
+                            html = html + '<ul><li style="width: 100%"><input type="checkbox" value="' + fileList[key].id + '"><span>' + fileList[key].name + '</span></li></ul>';
                         }
                         $("#field_file").empty().append(html);
-                        if(obj.fields!=null && obj.fields!=''){
+                        if (obj.fields != null && obj.fields != '') {
                             $("#field_info input").each(function () {
                                 var arr = obj.fields.split(",");
-                                for(var key in arr){
-                                    if($(this).val()==arr[key]){
+                                for (var key in arr) {
+                                    if ($(this).val() == arr[key]) {
                                         this.checked = true;
                                     }
                                 }
                             });
                         }
-                        if(obj.files!=null && obj.files!=''){
+                        if (obj.files != null && obj.files != '') {
                             $("#field_file input").each(function () {
-                                if(obj.files.indexOf($(this).val())!=-1){
-                                    this.checked=true;
+                                if (obj.files.indexOf($(this).val()) != -1) {
+                                    this.checked = true;
                                 }
                             });
                         }
@@ -128,35 +133,35 @@ TalentTypeChange.updateFieldsAndFiles = function(){
                     yes: function (index, layero) {
                         var fields = '';
                         var files = '';
-                        $("#field_info li input").each(function(index){
-                            if($(this).is(":checked")){
+                        $("#field_info li input").each(function (index) {
+                            if ($(this).is(":checked")) {
                                 fields = fields + $(this).val() + ",";
                             }
                         });
-                        $("#field_file li input").each(function(index){
-                            if($(this).is(":checked")){
+                        $("#field_file li input").each(function (index) {
+                            if ($(this).is(":checked")) {
                                 files = files + $(this).val() + ",";
                             }
                         });
-                        if( fields=='' && files==''){
+                        if (fields == '' && files == '') {
                             Feng.info("请选择可修改的字段或附件!");
-                            return ;
+                            return;
                         }
-                        var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/updateFieldsAndFiles", function (data) {
-                            if(data.code==200){
+                        var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/updateFieldsAndFiles", function (data) {
+                            if (data.code == 200) {
                                 layer.close(index);
                                 Feng.success(data.msg);
-                            }else{
+                            } else {
                                 Feng.error(data.msg);
                             }
                         }, function (data) {
                             Feng.error("修改失败!" + data.responseJSON.message + "!");
                         });
-                        ajax.setData({"id":TalentTypeChange.seItem.id,"fields":fields,"files":files})
+                        ajax.setData({"id": TalentTypeChange.seItem.id, "fields": fields, "files": files})
                         ajax.start();
                     }
                 });
-            }else{
+            } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
@@ -167,42 +172,42 @@ TalentTypeChange.updateFieldsAndFiles = function(){
 }
 
 
-TalentTypeChange.creatFieldCheckModal = function(obj){
-    var field = obj.type==1?'<li style="width: 33%"><input type="checkbox" value="newSource"><span>新申报来源</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newOurCitySource"><span>新公布入选来源</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newFromCity"><span>新入选来源县市</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newQzBath"><span>新入选名单批次</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newTalentArrange"><span>新人才层次</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyCondition"><span>新认定条件</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyGetTime"><span>新认定条件证书取得时间</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyConditionName"><span>新认定条件名称</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newCertificateStartTime"><span>新泉州高层次人才证书发证日期</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newCertificateOutTime"><span>新泉州高层次人才证书的有效期</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newIntroductionMode"><span>新引进方式</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newGygb"><span>新是否为我市本级国有股比超过50</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newLetterTime"><span>新首次来晋行政介绍信时间</span></li>':
-        '                                    <li style="width: 33%"><input type="checkbox" value="newTalentArrange"><span>新人才层次</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyCondition"><span>新认定条件</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyGetTime"><span>新认定条件证书取得时间</span></li>\n' +
-        '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyConditionName"><span>新认定条件名称</span></li>';
+TalentTypeChange.creatFieldCheckModal = function (obj) {
+    var field = obj.type == 1 ? '<li style="width: 33%"><input type="checkbox" value="newSource"><span>新申报来源</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newOurCitySource"><span>新公布入选来源</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newFromCity"><span>新入选来源县市</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newQzBath"><span>新入选名单批次</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newTalentArrange"><span>新人才层次</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyCondition"><span>新认定条件</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyGetTime"><span>新认定条件证书取得时间</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyConditionName"><span>新认定条件名称</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newCertificateStartTime"><span>新泉州高层次人才证书发证日期</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newCertificateOutTime"><span>新泉州高层次人才证书的有效期</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newIntroductionMode"><span>新引进方式</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newGygb"><span>新是否为我市本级国有股比超过50</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newLetterTime"><span>新首次来晋行政介绍信时间</span></li>' :
+            '                                    <li style="width: 33%"><input type="checkbox" value="newTalentArrange"><span>新人才层次</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyCondition"><span>新认定条件</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyGetTime"><span>新认定条件证书取得时间</span></li>\n' +
+            '                                    <li style="width: 33%"><input type="checkbox" value="newIdentifyConditionName"><span>新认定条件名称</span></li>';
     return '<form id="firstCheckForm">\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <div id="field">\n' +
-        '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
-        '                            <div id="field_info">\n' +
-        '                                <ul>\n' + field+
-        '                                </ul>\n' +
-        '                            </div>\n' +
-        '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
-        '                            <div id="field_file">\n' +
-        '                            </div>\n' +
-        '                            <div class="form-group" style="text-align: center">\n' +
-        '                                <button type="button" class="btn btn-primary" onclick="Feng.checkAll("field")">全选</button>\n' +
-        '                                <button type="button" class="btn btn-success" onclick="Feng.unCheckAll("field")">反选</button>\n' +
-        '                            </div>\n' +
-        '                        </div>\n' +
-        '                    </div>\n' +
-        '                </form>';
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <div id="field">\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                                <ul>\n' + field +
+            '                                </ul>\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+            '                            <div id="field_file">\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group" style="text-align: center">\n' +
+            '                                <button type="button" class="btn btn-primary" onclick="Feng.checkAll("field")">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="Feng.unCheckAll("field")">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
 }
 
 /**
@@ -216,13 +221,13 @@ TalentTypeChange.openTalentTypeChangeCheck = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/toCommonCheck/' + TalentTypeChange.seItem.id + '/1',
-            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交','<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核' ,'<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+            content: Feng.ctxPath + '/admin/talentTypeChange/toCommonCheck/' + TalentTypeChange.seItem.id + '/1',
+            btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save 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.TalentTypeChangeInfoDlg.showFirstCheckModal();
-            },btn2: function(index, layero){
+            }, btn2: function (index, layero) {
                 var obj = layero.find("iframe")[0].contentWindow;
                 obj.TalentTypeChangeInfoDlg.submitCheck();
                 return false;
@@ -244,7 +249,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentTypeChange/talentTypeChange_detail/' + TalentTypeChange.seItem.id,
+            content: Feng.ctxPath + '/admin/talentTypeChange/detail/id/' + TalentTypeChange.seItem.id,
         });
         this.layerIndex = index;
         layer.full(index);
@@ -252,21 +257,21 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
 };
 
 
-TalentTypeChange.getPhones = function(){
-    var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/getPhones", function(data){
-        if(data.code == 200){
+TalentTypeChange.getPhones = function () {
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/getPhones", function (data) {
+        if (data.code == 200) {
             layer.open({
                 type: 1,
-                title:"手机号码",
+                title: "手机号码",
                 area: ['830px', '300px'], //宽高
                 fix: false, //不固定
                 maxmin: true,
-                content: "<span style='word-break:break-all'>"+data.obj+"</span>"
+                content: "<span style='word-break:break-all'>" + data.obj + "</span>"
             });
-        }else{
+        } else {
             Feng.info(data.msg);
         }
-    },function(data){
+    }, function (data) {
         Feng.error("操作失败!");
     });
     ajax.setData(TalentTypeChange.formParams());
@@ -274,21 +279,21 @@ TalentTypeChange.getPhones = function(){
 }
 
 
-TalentTypeChange.getEnterprisePhones = function(){
-    var ajax = new $ax(Feng.ctxPath + "/talentTypeChange/getEnterprisePhones", function(data){
-        if(data.code == 200){
+TalentTypeChange.getEnterprisePhones = function () {
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentTypeChange/getEnterprisePhones", function (data) {
+        if (data.code == 200) {
             layer.open({
                 type: 1,
-                title:"手机号码",
+                title: "手机号码",
                 area: ['830px', '300px'], //宽高
                 fix: false, //不固定
                 maxmin: true,
-                content: "<span style='word-break:break-all'>"+data.obj+"</span>"
+                content: "<span style='word-break:break-all'>" + data.obj + "</span>"
             });
-        }else{
+        } else {
             Feng.info(data.msg);
         }
-    },function(data){
+    }, function (data) {
         Feng.error("操作失败!");
     });
     ajax.setData(TalentTypeChange.formParams());
@@ -298,7 +303,7 @@ TalentTypeChange.getEnterprisePhones = function(){
 
 $(function () {
     var defaultColunms = TalentTypeChange.initColumn();
-    var table = new BSTable(TalentTypeChange.id, "/talentTypeChange/list/1", defaultColunms);
+    var table = new BSTable(TalentTypeChange.id, "/admin/talentTypeChange/list/process/1", defaultColunms);
     table.setPaginationType("server");
     // table.setHeight(665);
     table.setOnDblClickRow(function () {

+ 1 - 1
public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_prepare.js

@@ -744,7 +744,7 @@ TalentTypeChange.downloadPhoto = function(){
 
 $(function () {
     var defaultColunms = TalentTypeChange.initColumn();
-    var table = new BSTable(TalentTypeChange.id, "/talentTypeChange/list/4", defaultColunms);
+    var table = new BSTable(TalentTypeChange.id, "/admin/talentTypeChange/list/process/4", defaultColunms);
     table.setPaginationType("server");
     // table.setHeight(665);
     table.setSingleSelect(false);

+ 1 - 1
public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_third.js

@@ -126,7 +126,7 @@ TalentTypeChange.openTalentTypeChangeDetail = function () {
 
 $(function () {
     var defaultColunms = TalentTypeChange.initColumn();
-    var table = new BSTable(TalentTypeChange.id, "/talentTypeChange/list/3", defaultColunms);
+    var table = new BSTable(TalentTypeChange.id, "/admin/talentTypeChange/list/process/3", defaultColunms);
     table.setPaginationType("server");
     // table.setHeight(665);
     table.setOnDblClickRow(function () {