sugangqiang 2 년 전
부모
커밋
fb6c526b21

+ 13 - 13
app/admin/view/file_type/add.html

@@ -19,7 +19,7 @@
                                 <option value="2">集成电路优秀人才</option>
                             </select>
                         </div>
-                        <div class="input-group input-group-sm project1" style="display:none;">
+                        <div class="input-group input-group-sm" style="display:none;">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
                                     申报阶段
@@ -29,6 +29,18 @@
                                 <option value="">---请选择---</option>
                             </select>
                         </div>
+                        <div class="input-group input-group-sm project1" style="display:none;">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    是否为认定条件
+                                </button>
+                            </div>
+                            <select class="form-control" id="isConditionFile" name="isConditionFile" selectVal="{$info.isConditionFile}">
+                                <option value="">---请选择---</option>
+                                <option value="0">否(不与人才层级条件联动)</option>
+                                <option value="1">是(与人才层级条件联动)</option>
+                            </select>
+                        </div>
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
@@ -74,18 +86,6 @@
                                 {/volist}
                             </select>
                         </div>
-                        <div class="input-group input-group-sm project1" style="display:none;">
-                            <div class="input-group-btn">
-                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                    是否为认定条件
-                                </button>
-                            </div>
-                            <select class="form-control" id="isConditionFile" name="isConditionFile" selectVal="{$info.isConditionFile}">
-                                <option value="">---请选择---</option>
-                                <option value="0">否(不与人才层级条件联动)</option>
-                                <option value="1">是(与人才层级条件联动)</option>
-                            </select>
-                        </div>
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">

+ 13 - 13
app/admin/view/file_type/edit.html

@@ -19,7 +19,7 @@
                                 <option value="2">集成电路优秀人才</option>
                             </select>
                         </div>
-                        <div class="input-group input-group-sm project1" style="display:none;">
+                        <div class="input-group input-group-sm" style="display:none;">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
                                     申报阶段
@@ -35,6 +35,18 @@
                                 {/eq}
                             </select>
                         </div>
+                        <div class="input-group input-group-sm project1" style="display:none;">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    是否为认定条件
+                                </button>
+                            </div>
+                            <select class="form-control" id="isConditionFile" name="isConditionFile" selectVal="{$info.isConditionFile}">
+                                <option value="">---请选择---</option>
+                                <option value="0">否(不与人才层级条件联动)</option>
+                                <option value="1">是(与人才层级条件联动)</option>
+                            </select>
+                        </div>
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
@@ -80,18 +92,6 @@
                                 {/volist}
                             </select>
                         </div>
-                        <div class="input-group input-group-sm project1" style="display:none;">
-                            <div class="input-group-btn">
-                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                    是否为认定条件
-                                </button>
-                            </div>
-                            <select class="form-control" id="isConditionFile" name="isConditionFile" selectVal="{$info.isConditionFile}">
-                                <option value="">---请选择---</option>
-                                <option value="0">否(不与人才层级条件联动)</option>
-                                <option value="1">是(与人才层级条件联动)</option>
-                            </select>
-                        </div>
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">

+ 7 - 7
app/admin/view/talent/talentInfo_common_check.html

@@ -420,7 +420,7 @@
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                    <div class="form-control" style="border: none;background:#eee;">{$info.position}</div>
+                                                    <div class="form-control" style="border: none;background:#eee;" id="position">{$info.position}</div>
                                                 </div>
                                             </td>
                                             <td rowspan="3" style="width: 300%">
@@ -433,7 +433,7 @@
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class="control-label spacing">职称技术资格</label>
-                                                    <div class="form-control" style="border: none;background:#eee;">{$info.pro_qua}</div>
+                                                    <div class="form-control" style="border: none;background:#eee;" id="pro_qua">{$info.pro_qua}</div>
                                                 </div>
                                             </td>
                                             <td rowspan="3" style="width: 100%">
@@ -446,7 +446,7 @@
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class="control-label spacing">专业技术职称</label>
-                                                    <div class="form-control" style="border: none;background:#eee;">{$info.professional}</div>
+                                                    <div class="form-control" style="border: none;background:#eee;" id="professional">{$info.professional}</div>
                                                 </div>
                                             </td>
                                             <td rowspan="3" style="width: 100%">
@@ -503,13 +503,13 @@
                                                 <div class="rowGroup col-sm-6">
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
-                                                        <div class="form-control" style="border: none;background:#eee;">{$info.sourceName}</div>
+                                                        <div class="form-control" style="border: none;background:#eee;" id="source">{$info.sourceName}</div>
                                                     </div>
                                                 </div>
                                                 {else/}
                                                 <div class="rowGroup col-sm-9">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
-                                                    <div class="form-control" style="border: none;background:#eee;">{$info.sourceName}</div>
+                                                    <div class="form-control" style="border: none;background:#eee;" id="source">{$info.sourceName}</div>
                                                 </div>
                                                 {/if}
                                                 {if condition="$info['source_city'] || $info['source_county']"}
@@ -575,7 +575,7 @@
                                                 </div>
                                                 <div class="rowGroup col-sm-6">
                                                     <label class="control-label spacing"><span style="color: red">*</span>人才条款</label>
-                                                    <div class="form-control" style="border: none;background:#eee;">{$info.talentArrangeCatName}</div>
+                                                    <div class="form-control" style="border: none;background:#eee;" id="talent_arrange_category">{$info.talentArrangeCatName}</div>
                                                 </div>
                                             </td>
                                         </tr>
@@ -583,7 +583,7 @@
                                             <td colspan="3" style="overflow: inherit">
                                                 <div class="rowGroup col-sm-9">
                                                     <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                    <div class="form-control" style="border: none;background:#eee;">{$info.talentConditionName}</div>
+                                                    <div class="form-control" style="border: none;background:#eee;" id="talent_condition">{$info.talentConditionName}</div>
                                                 </div>
                                             </td>
                                             <td {if condition='!$info["annual_salary"]'}style="display:none;"{/if}>

+ 372 - 191
app/admin/view/talent_allowance/talentAllowanceInfo.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .layui-layer-btn .layui-layer-btn1 {
         border-color: #009688;
@@ -24,48 +25,108 @@
             <div class="ibox-content">
                 <div class="row row-lg">
                     <div class="col-sm-12">
-                        <input type="hidden" id="process" value="${process}">
-                        <input type="hidden" id="type" value="${type}">
-                        @if(process == 4){
-                        <input type="hidden" id="typeNameTem" value="${message.typeName}">
-                        <input type="hidden" id="webTem" value="${message.address}">
-                        <input type="hidden" id="depTem" value="${message.dep}">
-                        <input type="hidden" id="phoneTem" value="${message.phone}">
-                        <input type="hidden" id="emailTem" value="${message.email}">
-                        @}
+                        <input type="hidden" id="process" value="{$process}">
+                        <input type="hidden" id="type" value="{$type}">
+                        {eq name="process" value="4"}
+                        <input type="hidden" id="typeNameTem" value="{$message.typeName}">
+                        <input type="hidden" id="webTem" value="{$message.address}">
+                        <input type="hidden" id="depTem" value="{$message.dep}">
+                        <input type="hidden" id="phoneTem" value="{$message.phone}">
+                        <input type="hidden" id="emailTem" value="{$message.email}">
+                        {/eq}
                         <div class="row">
                             <div class="col-sm-3">
-                                <#NameCon id="year" name="年度"/>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="year" placeholder="">
+                                </div>
                             </div>
-                                <div class="col-sm-3"
-                                     @if(process!=1){
-                                        style="display: none"
-                                    @}
-                                >
-                                    <#NameCon id="companyName" name="审核单位"/>
+                            <div class="col-sm-3" {eq name="process" value="1"}style="display: none"{/eq}>
+                                 <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">审核单位
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="companyName" placeholder="">
                                 </div>
+                            </div>
                             <div class="col-sm-3">
-                                <#NameCon id="enterpriseName" name="单位名称"/>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">单位名称
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="enterpriseName" placeholder="">
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="name" name="姓名"/>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="">
+                                </div>
                             </div>
-                            @if(type==1){
-                                <div class="col-sm-3">
-                                    <#SelectCon id="talentType" name="人才标签"></#SelectCon>
+                            {eq name="type" value="1"}
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才标签
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talentType">
+                                    </select>
                                 </div>
-                            @}
+                            </div>
+                            {/eq}
                             <div class="col-sm-3">
-                                <#SelectCon id="talentArrange" name="人才层次" onchange="TalentAllowanceInfo.getIdentifyCondition()"></#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talentArrange" onchange="TalentAllowanceInfo.getIdentifyCondition()">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="identifyCondition" name="认定条件"></#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            认定条件
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="identifyCondition">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="address" name="所属镇街"></#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            所属镇街
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="address">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="introductionMode" name="引进方式"></#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            引进方式
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="introductionMode">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
@@ -86,9 +147,16 @@
                                 </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="checkState" name="审核状态">
-                                    <option value="">请选择</option>
-                                    @if(process==1){
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            审核状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="checkState">
+                                        <option value="">请选择</option>
+
+                                        {eq name="process" value="1"}
                                         <option value="-2">待提交</option>
                                         <option value="1">待审核</option>
                                         <option value="2">已驳回</option>
@@ -96,189 +164,303 @@
                                         <option value="4">上级驳回</option>
                                         <option value="9">重新提交</option>
                                         <option value="-1">审核不通过</option>
-                                    @}
-                                    @if(process==2){
+                                        {/eq}
+
+                                        {eq name="process" value="2"}
                                         <option value="1">待审核</option>
                                         <option value="2">已驳回</option>
                                         <option value="3">已通过</option>
                                         <option value="4">上级驳回</option>
                                         <option value="9">重新提交</option>
                                         <option value="-1">审核不通过</option>
-                                    @}
-                                    @if(process==3){
+                                        {/eq}
+
+                                        {eq name="process" value="3"}
                                         <option value="1">待审核</option>
                                         <option value="2">已驳回</option>
                                         <option value="3">已通过</option>
                                         <option value="4">公示驳回</option>
                                         <option value="9">重新提交</option>
                                         <option value="-1">审核不通过</option>
-                                    @}
-                                    @if(process==4){
+                                        {/eq}
+                                        {eq name="process" value="4"}
                                         <option value="3">已通过</option>
                                         <option value="-1">审核不通过</option>
-                                    @}
-                                </#SelectCon>
+                                        {/eq}
+                                    </select>
+                                </div>
                             </div>
-                            @if(process==3 || process == 4){
-                                <div class="col-sm-3">
-                                    <#SelectCon id="recommendAllowanceType" name="推荐津补贴类型">
+                            {if condition="in_array($process,[3,4])"}
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            推荐津补贴类型
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="recommendAllowanceType">
                                         <option value="">请选择</option>
                                         <option value="1">人才津贴</option>
                                         <option value="2">一次性交通补贴</option>
                                         <option value="3">不予兑现</option>
-                                    </#SelectCon>
+                                    </select>
                                 </div>
-                            @}
-                            @if(process == 4){
-                                <div class="col-sm-3">
-                                    <#SelectCon id="publicState" name="公示状态">
+                            </div>
+                            {/if}
+
+                            {eq name="process" value="4"}
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            公示状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="publicState">
                                         <option value="">请选择</option>
                                         <option value="1">待核查征信</option>
                                         <option value="2">待公示</option>
                                         <option value="3">公示中</option>
                                         <option value="4">待兑现</option>
                                         <option value="5">已兑现</option>
-                                    </#SelectCon>
+                                    </select>
                                 </div>
-                                <div class="col-sm-3">
-                                    <#SelectCon id="isSupple" name="是否补件">
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            是否补件
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="isSupple">
                                         <option value="">请选择</option>
                                         <option value="1">是</option>
                                         <option value="2">否</option>
-                                    </#SelectCon>
+                                    </select>
                                 </div>
+                            </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="isPublicCheck" name="是否公示再审核">
-                                    <option value="">请选择</option>
-                                    <option value="1">是</option>
-                                    <option value="2">否</option>
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            是否公示再审核
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="isPublicCheck">
+                                        <option value="">请选择</option>
+                                        <option value="1">是</option>
+                                        <option value="2">否</option>
+                                    </select>
+                                </div>
                             </div>
-                            @}
+                            {/eq}
                             <div class="col-sm-3">
-                                <#button name="搜索" icon="fa-search" clickFun="TalentAllowanceInfo.search()"/>
-                                <#button name="重置" icon="fa-trash" clickFun="TalentAllowanceInfo.reset()"/>
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.search()" id="">
+                                    <i class="fa fa-search"></i>&nbsp;搜索
+                                </button>
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.reset()" id="">
+                                    <i class="fa fa-trash"></i>&nbsp;重置
+                                </button>
                             </div>
                         </div>
                         <div class="hidden-xs" id="TalentAllowanceInfoTableToolbar" role="group">
-                            @if(process==1){
-                                @if(shiro.hasPermission("/talentAllowance/firstCheck")){
-                                    <#button name="审核" icon="fa-edit" clickFun="TalentAllowanceInfo.openCheckTalentAllowanceInfo()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/firstCancleCheck")){
-                                    <#button name="撤销审核" icon="fa-cancle" clickFun="TalentAllowanceInfo.firstCancleCheck()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/firstSbSubmit")){
-                                    <#button name="批量提交审核(社保局)" icon="fa-angle-double-up" clickFun="TalentAllowanceInfo.showDataModal(1)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/firstExportProject")){
-                                    <#button name="导出社保录入模板" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showDataModal(2)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/firstImportProject")){
-                                    <#button name="导入社保核查结果" icon="fa-upload" clickFun="TalentAllowanceInfo.showImportModal(1)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/exportSbProject")){
-                                    <#button name="导出社保核查结果" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showDataModal(3)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/updateFieldsAndFiles")){
-                                    <#button name="修改驳回字段" icon="fa-edit" clickFun="TalentAllowanceInfo.updateFieldsAndFiles()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/firstExport")){
-                                    <#button name="导出基础信息" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.exportBasicInfo()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/firstExportProjectData")){
-                                    <#button name="导出项目核查结果" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showDataModal(4)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/firstSelect")){
-                                    <#button name="查看" icon="fa-eye" clickFun="TalentAllowanceInfo.select()" space="true"/>
-                                @}
-                            @}
-                            @if(process==2){
-                                @if(shiro.hasPermission("/talentAllowance/visitCheck")){
-                                    <#button name="审核" icon="fa-edit" clickFun="TalentAllowanceInfo.openCheckTalentAllowanceInfo()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/visitSbSubmit")){
-                                    <#button name="批量提交审核" icon="fa-angle-double-up" clickFun="TalentAllowanceInfo.showDataModal(5)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/visitExportProject")){
-                                    <#button name="导出项目录入模板" icon="fa-upload" clickFun="TalentAllowanceInfo.showDataModal(6)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/visitImportProject")){
-                                    <#button name="导入项目核查结果" icon="fa-upload" clickFun="TalentAllowanceInfo.showImportModal(2)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/visitExport")){
-                                    <#button name="导出基础信息" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.exportBasicInfo()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/visitExportProjectData")){
-                                    <#button name="导出项目核查结果" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showDataModal(7)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/visitSelect")){
-                                    <#button name="查看" icon="fa-eye" clickFun="TalentAllowanceInfo.select()" space="true"/>
-                                @}
-                            @}
-                            @if(process==3){
-                                @if(shiro.hasPermission("/talentAllowance/reviewCheck")){
-                                    <#button name="审核" icon="fa-edit" clickFun="TalentAllowanceInfo.openCheckTalentAllowanceInfo()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/reviewCancleCheck")){
-                                    <#button name="撤销审核" icon="fa-reply" clickFun="TalentAllowanceInfo.reviewCancleCheck()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/reviewExport")){
-                                    <#button name="导出基础信息" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.exportBasicInfo()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/reviewExportProjectData")){
-                                    <#button name="导出项目核查结果" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showDataModal(8)"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/reviewSelect")){
-                                    <#button name="查看" icon="fa-eye" clickFun="TalentAllowanceInfo.select()" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/repair")){
-                                    <#button name="修复" icon="fa-eye" clickFun="TalentAllowanceInfo.repair()" space="true"/>
-                                @}
-                            @}
-                            @if(process==4){
-                                @if(shiro.hasPermission("/talentAllowance/prepareHczx")){
-                                    <#button name="导出核查征信" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showPrepareDataModal(1)" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/hczxReject")){
-                                    <#button name="征信失信" icon="fa-external-link" clickFun="TalentAllowanceInfo.showHczxRejectModal()" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/hczxPass")){
-                                    <#button name="征信通过" icon="fa-external-link" clickFun="TalentAllowanceInfo.showPrepareDataModal(2)" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/publicExportBeforeNoCash")){
-                                    <#button name="公示预览(不予兑现)" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showPrepareDataModal(7)" space="false"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/publicExportBefore")){
-                                    <#button name="公示预览(兑现)" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showPrepareDataModal(8)" space="false"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/preparePublicNoCash")){
-                                    <#button name="公示(不予兑现)" icon="fa-opencart" clickFun="TalentAllowanceInfo.showPrepareDataModal(3)" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/preparePublic")){
-                                    <#button name="公示(兑现)" icon="fa-opencart" clickFun="TalentAllowanceInfo.showPrepareDataModal(4)" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/prepareCheck")){
-                                    <#button name="公示再审核" icon="fa-check-square-o" clickFun="TalentAllowanceInfo.afterCheck()" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/publicPass")){
-                                    <#button name="公示通过" icon="fa-compass" clickFun="TalentAllowanceInfo.showPrepareDataModal(5)" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/cash")){
-                                    <#button name="兑现" icon="fa-money" clickFun="TalentAllowanceInfo.showPrepareDataModal(6)" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/prepareSelect")){
-                                    <#button name="查看" icon="fa-eye" clickFun="TalentAllowanceInfo.select()" space="true"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/prepareExport")){
-                                    <#button name="导出基础信息" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.exportBasicInfo()"/>
-                                @}
-                                @if(shiro.hasPermission("/talentAllowance/prepareExportProjectData")){
-                                    <#button name="导出项目核查结果" icon="fa-file-excel-o" clickFun="TalentAllowanceInfo.showDataModal(9)"/>
-                                @}
-                            @}
+                            {eq name="process" value="1"}                            
+                            {if condition="chkCommission('/admin/talentAllowance/firstCheck','/talentAllowance/firstCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.openCheckTalentAllowanceInfo()" id="">
+                                <i class="fa fa-edit"></i>&nbsp;审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/firstCancleCheck','/talentAllowance/firstCancleCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.firstCancleCheck()" id="">
+                                <i class="fa fa-cancle"></i>&nbsp;撤销审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/firstSbSubmit','/talentAllowance/firstSbSubmit')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(1)" id="">
+                                <i class="fa fa-angle-double-up"></i>&nbsp;批量提交审核(社保局)
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/firstExportProject','/talentAllowance/firstExportProject')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(2)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出社保录入模板
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/firstImportProject','/talentAllowance/firstImportProject')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showImportModal(1)" id="">
+                                <i class="fa fa-upload"></i>&nbsp;导入社保核查结果
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/exportSbProject','/talentAllowance/exportSbProject')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(3)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出社保核查结果
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/updateFieldsAndFiles','/talentAllowance/updateFieldsAndFiles')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.updateFieldsAndFiles()" id="">
+                                <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/firstExport','/talentAllowance/firstExport')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.exportBasicInfo()" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出基础信息
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/firstExportProjectData','/talentAllowance/firstExportProjectData')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(4)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出项目核查结果
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/firstSelect','/talentAllowance/firstSelect')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.select()" id="">
+                                <i class="fa fa-eye"></i>&nbsp;查看
+                            </button>
+                            {/if}
+                            {/eq}
+                            {eq name="process" value="2"}
+                            {if condition="chkCommission('/admin/talentAllowance/visitCheck','/talentAllowance/visitCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.openCheckTalentAllowanceInfo()" id="">
+                                <i class="fa fa-edit"></i>&nbsp;审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/visitSbSubmit','/talentAllowance/visitSbSubmit')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(5)" id="">
+                                <i class="fa fa-angle-double-up"></i>&nbsp;批量提交审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/visitExportProject','/talentAllowance/visitExportProject')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(6)" id="">
+                                <i class="fa fa-upload"></i>&nbsp;导出项目录入模板
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/visitImportProject','/talentAllowance/visitImportProject')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showImportModal(2)" id="">
+                                <i class="fa fa-upload"></i>&nbsp;导入项目核查结果
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/visitExport','/talentAllowance/visitExport')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.exportBasicInfo()" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出基础信息
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/visitExportProjectData','/talentAllowance/visitExportProjectData')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(7)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出项目核查结果
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/visitSelect','/talentAllowance/visitSelect')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.select()" id="">
+                                <i class="fa fa-eye"></i>&nbsp;查看
+                            </button>
+                            {/if}
+                            {/eq}
+                            {eq name="process" value="3"}
+                            {if condition="chkCommission('/admin/talentAllowance/reviewCheck','/talentAllowance/reviewCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.openCheckTalentAllowanceInfo()" id="">
+                                <i class="fa fa-edit"></i>&nbsp;审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/reviewCancleCheck','/talentAllowance/reviewCancleCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.reviewCancleCheck()" id="">
+                                <i class="fa fa-reply"></i>&nbsp;撤销审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/reviewExport','/talentAllowance/reviewExport')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.exportBasicInfo()" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出基础信息
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/reviewExportProjectData','/talentAllowance/reviewExportProjectData')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(8)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出项目核查结果
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/reviewSelect','/talentAllowance/reviewSelect')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.select()" id="">
+                                <i class="fa fa-eye"></i>&nbsp;查看
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/repair','/talentAllowance/repair')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.repair()" id="">
+                                <i class="fa fa-eye"></i>&nbsp;修复
+                            </button>
+                            {/if}
+                            {/eq}
+                            {eq name="process" value="4"}
+                            {if condition="chkCommission('/admin/talentAllowance/prepareHczx','/talentAllowance/prepareHczx')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(1)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出核查征信
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/hczxReject','/talentAllowance/hczxReject')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showHczxRejectModal()" id="">
+                                <i class="fa fa-external-link"></i>&nbsp;征信失信
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/hczxPass','/talentAllowance/hczxPass')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(2)" id="">
+                                <i class="fa fa-external-link"></i>&nbsp;征信通过
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/publicExportBeforeNoCash','/talentAllowance/publicExportBeforeNoCash')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(7)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;公示预览(不予兑现)
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/publicExportBefore','/talentAllowance/publicExportBefore')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(8)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;公示预览(兑现)
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/preparePublicNoCash','/talentAllowance/preparePublicNoCash')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(3)" id="">
+                                <i class="fa fa-opencart"></i>&nbsp;公示(不予兑现)
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/preparePublic','/talentAllowance/preparePublic')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(4)" id="">
+                                <i class="fa fa-opencart"></i>&nbsp;公示(兑现)
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/prepareCheck','/talentAllowance/prepareCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.afterCheck()" id="">
+                                <i class="fa fa-check-square-o"></i>&nbsp;公示再审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/publicPass','/talentAllowance/publicPass')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(5)" id="">
+                                <i class="fa fa-compass"></i>&nbsp;公示通过
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/cash','/talentAllowance/cash')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showPrepareDataModal(6)" id="">
+                                <i class="fa fa-money"></i>&nbsp;兑现
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/prepareSelect','/talentAllowance/prepareSelect')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.select()" id="">
+                                <i class="fa fa-eye"></i>&nbsp;查看
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/prepareExport','/talentAllowance/prepareExport')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.exportBasicInfo()" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出基础信息
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentAllowance/prepareExportProjectData','/talentAllowance/prepareExportProjectData')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(9)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出项目核查结果
+                            </button>
+                            {/if}
+                            {/eq}
                         </div>
-                        <#table id="TalentAllowanceInfoTable"/>
+                        <table id="TalentAllowanceInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
                     </div>
                 </div>
             </div>
@@ -347,15 +529,15 @@
             <div class="modal-body">
                 <form id="import-form" action="${ctxPath}/talentAllowanceInfoImport/importProject" method="post" enctype="multipart/form-data" target="hiddenIframe">
                     <input type="file" id="file" name="file" onchange="$('#fileName').val($('#file').val());" class="hidden">
-                    <input type="hidden" name="process" value="${process}">
+                    <input type="hidden" name="process" value="{$process}">
                     <div class="form-group row">
-<!--                        <div class="col-sm-1"></div>-->
+                        <!--                        <div class="col-sm-1"></div>-->
                         <div class="col-sm-12">
                             <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>
+                                    <button class="btn btn-secondary" type="button" onclick="$('#file').click()"><i class="fa fa-search"></i>选择文件</button>
+                                </span>
                             </div>
                         </div>
                     </div>
@@ -377,7 +559,7 @@
         </div>
     </div>
 </div>
-@if(process == 4){
+{eq name="process" value="4"}
 <!--需要核查征信的名单-->
 <div class="modal fade " id="exportPrepareModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog modal-lg" role="document" style="min-width: 1200px;">
@@ -422,12 +604,12 @@
                     </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" id="typeName" value="{$message.typeName}" maxlength="20">已完成初步审核,现通过
+                            <input type="text" class="form-control input-sm" id="web" placeholder="公示平台(如聚财网/人才晋江公众号)" value="{$message.address}" maxlength="40">将审核结果予以公示,公示时间
                             <input type="text" class="form-control input-sm time" id="publicStartTime" maxlength="15">至<input type="text" class="form-control input-sm time" id="publicEndTime" maxlength="15">。公示期间如有异议,请及时向
-                            <input type="text" class="form-control input-sm" id="dep" placeholder="xx单位/部门" value="${message.dep}" maxlength="30">反映。电话
-                            <input type="text" class="form-control input-sm" id="publicPhone" value="${message.phone}" maxlength="30">,电子邮箱
-                            <input type="text" class="form-control input-sm" id="publicemail" value="${message.email}" maxlength="20">。
+                            <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="publicPhone" value="{$message.phone}" maxlength="30">,电子邮箱
+                            <input type="text" class="form-control input-sm" id="publicemail" value="{$message.email}" maxlength="20">。
                         </label>
                     </div>
                 </form>
@@ -439,7 +621,7 @@
         </div>
     </div>
 </div>
-@}
+{/eq}
 <!--公示再审核模态框-->
 <div class="modal fade " id="checkModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
@@ -484,9 +666,8 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo_supple.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowancePrepare.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_supple.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowancePrepare.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
-
-@}
+{/block}

+ 5 - 4
app/admin/view/talent_allowance/talentAllowanceInfo_info.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -587,7 +588,7 @@
 
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo_info.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_info.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
-@}
+{/block}

+ 5 - 4
app/admin/view/talent_allowance/talentAllowanceInfo_public_check.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -583,8 +584,8 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo_public_check.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_public_check.js?v='+(new Date()).getTime()+'"><\/script>');
     // document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
-@}
+{/block}

+ 5 - 4
app/admin/view/talent_allowance/talentAllowanceInfo_select.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -356,7 +357,7 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentAllowance/talentAllowanceInfo_select.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentAllowance/talentAllowanceInfo_select.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
-@}
+{/block}

+ 3 - 3
app/enterprise/view/talent/view.html

@@ -421,7 +421,7 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                        <div class="form-control" style="border: none;height:auto;background:#eee;">{$row.position}</div>
+                                                        <div class="form-control" style="border: none;height:auto;background:#eee;" id="position">{$row.position}</div>
                                                     </div>
                                                 </td>
                                                 <td rowspan="3" style="width: 300%">
@@ -434,7 +434,7 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing">职称技术资格</label>                        
-                                                        <div class="form-control" style="border: none;height:auto;background:#eee;">{$row.pro_qua}</div>
+                                                        <div class="form-control" style="border: none;height:auto;background:#eee;" id="pro_qua">{$row.pro_qua}</div>
                                                     </div>
                                                 </td>
                                                 <td rowspan="3" style="width: 100%">
@@ -447,7 +447,7 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing">专业技术职称</label>                                                        
-                                                        <div class="form-control" style="border: none;height:auto;background:#eee;">{$row.professional}</div>
+                                                        <div class="form-control" style="border: none;height:auto;background:#eee;" id="professional">{$row.professional}</div>
                                                     </div>
                                                 </td>
                                                 <td rowspan="3" style="width: 100%">

+ 5 - 4
app/enterprise/view/talent_allowance/add.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -470,7 +471,7 @@
 <!--<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info.js"></script>-->
 <!--<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
-@}
+{/block}

+ 5 - 4
app/enterprise/view/talent_allowance/edit.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -486,7 +487,7 @@
 <!--<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info.js"></script>-->
 <!--<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
-@}
+{/block}

+ 4 - 3
app/enterprise/view/talent_allowance/patch.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -248,7 +249,7 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_patch.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowance_patch.js?v='+(new Date()).getTime()+'"><\/script>');
     // document.write('<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowance_info_supple.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
-@}
+{/block}

+ 5 - 4
app/enterprise/view/talent_allowance/view.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .spacing {
         margin-bottom: 10px;
@@ -240,7 +241,7 @@
     </div>
 </div>
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/gate/talentAllowance/common/talentAllowanceInfo_select.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentAllowance/common/talentAllowanceInfo_select.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
-@}
+{/block}