Kaynağa Gözat

硕博前端页面更新

sugangqiang 1 yıl önce
ebeveyn
işleme
cb98f841e6

+ 0 - 132
app/admin/view/living_allowance/add.html

@@ -1,132 +0,0 @@
-{extend name="layout/content"}
-{block name="content"}
-<div class="ibox float-e-margins">
-    <div class="ibox-content">
-        <div class="form-horizontal">
-
-            <div class="row">
-                <div class="col-sm-6 b-r">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">主键</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" id="id" name="id">
-                        </div>
-                    </div>
-                    <div class="hr-line-dashed"></div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label"></label>
-                        <div class="col-sm-9">
-                            <input class="form-control" id="year" name="year">
-                        </div>
-                    </div>
-                    <div class="hr-line-dashed"></div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">所属单位</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" id="year" name="enterprise_id">
-                        </div>
-                    </div>
-                    <div class="hr-line-dashed"></div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">企业名称</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" id="year" name="enterprise_name">
-                        </div>
-                    </div>
-                    <div class="hr-line-dashed"></div>
-                    <#input id="id" name="主键" underline="true"/>
-                    <#input id="year" name="" underline="true"/>
-                    <#input id="enterpriseId" name="所属单位" underline="true"/>
-                    <#input id="enterpriseName" name="企业名称" underline="true"/>
-                    <#input id="type" name="人才类型" underline="true"/>
-                    <#input id="talentType" name="人才标签" underline="true"/>
-                    <#input id="cardType" name="证件类型" underline="true"/>
-                    <#input id="idCard" name="证件号码" underline="true"/>
-                    <#input id="name" name="姓名" underline="true"/>
-                    <#input id="photo" name="头像" underline="true"/>
-                    <#input id="sex" name="性别" underline="true"/>
-                    <#input id="nation" name="民族" underline="true"/>
-                    <#input id="nationality" name="国籍" underline="true"/>
-                    <#input id="provinceCode" name="籍贯省代码" underline="true"/>
-                    <#input id="provinceName" name="籍贯省名称" underline="true"/>
-                    <#input id="cityCode" name="籍贯市代码" underline="true"/>
-                    <#input id="cityName" name="籍贯市名称" underline="true"/>
-                    <#input id="countyCode" name="籍贯县代码" underline="true"/>
-                    <#input id="countyName" name="籍贯县名称" underline="true"/>
-                    <#input id="birthday" name="出生日期" underline="true"/>
-                    <#input id="address" name="现居地址" underline="true"/>
-                    <#input id="politics" name="政治面貌" underline="true"/>
-                    <#input id="highEducation" name="最高学历" underline="true"/>
-                    <#input id="graduateSchool" name="毕业学校" underline="true"/>
-                    <#input id="major" name="专业" underline="true"/>
-                    <#input id="post" name="职务" underline="true"/>
-                    <#input id="phone" name="手机号码" underline="true"/>
-                    <#input id="email" name="邮箱" underline="true"/>
-                    <#input id="bank" name="开户银行" underline="true"/>
-                    <#input id="bankNetwork" name="开户银行网点" underline="true"/>
-                    <#input id="bankAccount" name="银行账号" underline="true"/>
-                    <#input id="bankNumber" name="银行行号" underline="true"/>
-                    <#input id="entryTime" name="本单位入职时间" underline="true"/>
-                    <#input id="quitTime" name="离职时间"/>
-                </div>
-
-                <div class="col-sm-6">
-                    <#input id="startTime" name="工作合同开始时间" underline="true"/>
-                    <#input id="endTime" name="工作合同结束时间" underline="true"/>
-                    <#input id="educationAndResume" name="教育背景及工作简历" underline="true"/>
-                    <#input id="mainHonours" name="主要业绩及取得的荣誉" underline="true"/>
-                    <#input id="firstInJJTime" name="首次来晋工作时间" underline="true"/>
-                    <#input id="isIntroduction" name="是否引进人才" underline="true"/>
-                    <#input id="industryField" name="行业领域" underline="true"/>
-                    <#input id="title" name="职称" underline="true"/>
-                    <#input id="professionalQualifications" name="国家职业资格" underline="true"/>
-                    <#input id="studyAbroad" name="是否有留学经历" underline="true"/>
-                    <#input id="studyAbroadCountry" name="留学国家" underline="true"/>
-                    <#input id="studyAbroadTime" name="留学时间" underline="true"/>
-                    <#input id="introductionMode" name="引进方式" underline="true"/>
-                    <#input id="letterTime" name="行政介绍信时间" underline="true"/>
-                    <#input id="applyCount" name="申请次数" underline="true"/>
-                    <#input id="isPublic" name="公示状态" underline="true"/>
-                    <#input id="amount" name="" underline="true"/>
-                    <#input id="isPay" name="是否发放补贴" underline="true"/>
-                    <#input id="publicBatch" name="公布批次" underline="true"/>
-                    <#input id="active" name="是否确认提交" underline="true"/>
-                    <#input id="checkState" name="审核状态" underline="true"/>
-                    <#input id="checkMsg" name="基础信息审核意见" underline="true"/>
-                    <#input id="fields" name="" underline="true"/>
-                    <#input id="files" name="" underline="true"/>
-                    <#input id="firstSubmitTime" name="首次确认提交时间" underline="true"/>
-                    <#input id="newSubmitTime" name="最新确认提交时间" underline="true"/>
-                    <#input id="outMsg" name="退件原因" underline="true"/>
-                    <#input id="highProcess" name="" underline="true"/>
-                    <#input id="isEffect" name="" underline="true"/>
-                    <#input id="description" name="备注" underline="true"/>
-                    <#input id="createTime" name="创建时间" underline="true"/>
-                    <#input id="createUser" name="创建用户" underline="true"/>
-                    <#input id="updateTime" name="修改时间" underline="true"/>
-                    <#input id="updateUser" name="修改用户" underline="true"/>
-                </div>
-            </div>
-
-            <div class="row btn-group-m-t">
-                <div class="col-sm-10">
-                    <div class="col-sm-12" style="text-align: center">
-                        <button type="button" class="btn btn-sm btn-info" onclick="LivingAllowanceInfoInfoDlg.addSubmit()" id="ensure">
-                            <i class="fa fa-check"></i>&nbsp;提交
-                        </button>
-                        <button type="button" class="btn btn-sm btn-danger" onclick="LivingAllowanceInfoInfoDlg.close()" id="cancel">
-                            <i class="fa fa-eraser"></i>&nbsp;取消
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
-
-
-<script type="text/javascript">
-    document.write('<script src="/static/modular/master/livingAllowanceInfo/livingAllowanceInfo_info.js?v=' + (new Date()).getTime() + '"><\/script>');
-</script>
-{/block}

+ 571 - 0
app/admin/view/living_allowance/detail.html

@@ -0,0 +1,571 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    #talentInfoForm label {
+        font-size: xx-small;
+    }
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    ul li {
+        list-style: none;
+        display: inline-block;
+    }
+    .imgs li{
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-right:5px;
+        margin-top:1px;
+    }
+    .control-label{
+        color: #337ab7;
+    }
+    .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;
+    }
+    .bs-callout {
+        padding: 20px;
+        margin: 20px 0;
+        border-top: 1px solid rgba(238, 238, 238, 0.74);
+        border-bottom: 1px solid #eee;
+        border-right: 1px solid #eee;
+        border-left-width: 5px;
+        border-radius: 3px;
+    }
+    .bs-callout-info {
+        border-left:1px solid #1b809e;
+    }
+    .bs-callout-info h4 {
+        color: #1b809e;
+    }
+    .bs-callout-success {
+        border-left:1px solid #1ab394;
+    }
+    .bs-callout-success h4 {
+        color: #1ab394;
+    }
+    .bs-callout-primary {
+        border-left:1px solid #5bc0de;
+    }
+    .bs-callout-primary h4 {
+        color: #5bc0de;
+    }
+    .bs-callout-wram {
+        border-left:1px solid #ffc107;
+    }
+    .bs-callout-wram h4 {
+        color: #ffc107;
+    }
+    .bs-callout-danger {
+        border-left:1px solid #c82333;
+    }
+    .bs-callout-danger h4 {
+        color: #c82333;
+    }
+</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" onclick="Feng.showMiniFileModal(CONFIG.project_master_living_allowance, $('#type').val(), $('#id').val())" aria-expanded="true">1.基础信息</a></li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="initNoBtnFileTable(CONFIG.project_master_living_allowance, 'fileTable')"  aria-expanded="false">2.附件上传</a></li>
+                            <li  class="" style="float: right;">
+                                <button type="button" class="btn btn-sm btn-info " onclick="LivingAllowanceInfoInfoDlg.showMiniFileModal()" >
+                                    <i class="fa fa-caret-square-o-down"></i>&nbsp;显示附件
+                                </button>
+                            </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()">基础信息<span style="color: red;">({$row.year}年度)</span></div>
+                                    <div class="panel-body">
+                                        <form id="talentInfoForm" class="form-horizontal"  target="hiddenIframe">
+                                            <div class="col-sm-12 form-group-sm">
+                                                <input type="hidden" name="id" id="id" value="{$row.id}">
+                                                <input type="hidden" name="enterpriseId" id="enterpriseId" value="{$row.enterpriseId}">
+                                                <input type="hidden" name="type" id="type" value="{$row.type}">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
+                                                <input type="file" name="photo" id="photo" style="display: none">
+                                                <input type="hidden" name="provinceName" id="provinceName" value="{$row.provinceName}">
+                                                <input type="hidden" name="cityName" id="cityName" value="{$row.cityName}">
+                                                <input type="hidden" name="countyName" id="countyName" value="{$row.countyName}">
+                                                <input type="hidden" name="fields" id="fields" value="{$row.fields}">
+                                                <input type="hidden" name="files" id="files" value="{$row.files}">
+                                                <input type="hidden" name="process"  value="{$process}">
+                                                <div class="row">
+                                                    <div class="col-sm-11">
+                                                        <div class="bs-callout bs-callout-info" id="callout-helper-context-color-specificity">
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
+                                                                        <input type="text" readonly="readonly" class="form-control" id="year" name="year" value="{$row.year}"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing">申报补贴年次</label>
+                                                                        <input type="text" readonly="readonly" class="form-control" value="{switch name='row.applyCount'}{case value='1'}首年{/case}{case value='2'}第二年{/case}{default /}第三年{/switch}"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报对象类型</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.declareTypeName}">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
+                                                                        <input readonly="readonly" class="form-control" value="{eq name='row.introductionMethod' value='1'}新引进{else/}其他{/eq}">
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="bs-callout bs-callout-primary" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.name}" class="form-control" id="name" name="name" />
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.cardTypeName}">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
+                                                                        <input class="form-control" readonly="readonly" value="{$row.idCard}" id="idCard" name="idCard" >
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
+                                                                        <input readonly="readonly" class="form-control" value="{eq name='row.sex' value='1'}男{else/}女{/eq}">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                                        <input type="text" readonly="readonly" class="form-control " value="{$row.birthday}" id="birthday" name="birthday"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.nationalityName}">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.provinceName}">
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.cityName}">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.countyName}">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>民族</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.nationName}">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                                        <input readonly="readonly" class="form-control" value="{$row.politicsName}">
+                                                                    </div>
+                                                                    {eq name="item.introductionMethod" value="1"}
+                                                                    <div class="rowGroup col-sm-3" id="firstInJJTimeDiv" >
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.firstInJJTime}" class="form-control " id="firstInJJTime" name="firstInJJTime"/>
+                                                                    </div>
+                                                                    {/eq}
+                                                                    {eq name="item.introductionMethod" value="2"}
+                                                                    <div class="rowGroup col-sm-3" id="backJJBusinessTimeDiv" >
+                                                                        <label class="control-label spacing" id="backJJBusinessTimeLabel"><span style="color: red">*</span>返晋创业时间</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.backJJBusinessTime}" class="form-control " id="backJJBusinessTime" name="backJJBusinessTime"/>
+                                                                    </div>
+                                                                    {/eq}
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.phone}" class="form-control" id="phone" name="phone" maxlength="11"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.email}" class="form-control" id="email" name="email"/>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="bs-callout bs-callout-success" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.enterpriseName}" class="form-control" id="enterpriseName"  name="enterpriseName" readonly="readonly"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.entryTime}" class="form-control " id="entryTime" name="entryTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>工作合同开始时间</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.startTime}" class="form-control " id="startTime" name="startTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>工作合同结束时间</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.endTime}" class="form-control " id="endTime" name="endTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>首次社保缴纳时间</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.firstSocialSecurityTime}" class="form-control " id="firstSocialSecurityTime" name="firstSocialSecurityTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
+                                                                        <input type="text" readonly="readonly" class="form-control" value="{$row.industryFieldName}" id="industryField" name="industryField">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
+                                                                        <input class="form-control" readonly="readonly"  id="address" value="{$row.streetName}" name="address">
+                                                                    </div>
+                                                                    <!--                                                                    <div class="rowGroup col-sm-3" style="display: none">-->
+                                                                    <!--                                                                        <label class=" control-label spacing"><span style="color: red">*</span>首次来晋行政介绍信时间</label>-->
+                                                                    <!--                                                                        <input type="text" value="{$row.letterTime}" class="form-control date" id="letterTime" name="letterTime"/>-->
+                                                                    <!--                                                                    </div>-->
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>职务</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.post}" class="form-control" id="post" name="post"/>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="bs-callout bs-callout-wram" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.graduateSchool}" class="form-control" id="graduateSchool" name="graduateSchool">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
+                                                                        <input readonly="readonly" class="form-control" id="highEducation" value="{$row.educationName}" name="highEducation">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>学位证书取得时间</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.studyAbroadTime}" class="form-control " id="studyAbroadTime" name="studyAbroadTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.major}" class="form-control" id="major" name="major"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing">职称</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.title}" class="form-control" id="title" name="title"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing">国家职业资格</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.professionalQualifications}" class="form-control" id="professionalQualifications" name="professionalQualifications"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing">是否有留学经历</label>
+                                                                        <select disabled="disabled" class="form-control" value="{$row.studyAbroad}" id="studyAbroad" name="studyAbroad">
+                                                                            <option value="2">否</option>
+                                                                            <option value="1">是</option>
+                                                                        </select>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <!--                                                        <div class="rowGroup col-sm-3">-->
+                                                        <!--                                                            <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>-->
+                                                        <!--                                                            <select class="form-control" id="introductionMode" name="introductionMode" data-placeholder="引进方式">-->
+                                                        <!--                                                            </select>-->
+                                                        <!--                                                        </div>-->
+                                                        <div class="bs-callout bs-callout-danger" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.bank}" class="form-control" onchange="Feng.bankChange('bank', 'bankNumber')" id="bank" name="bank" placeholder="XX银行"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.bankNumber}" class="form-control" id="bankNumber" name="bankNumber"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.bankNetwork}" class="form-control" id="bankNetwork" name="bankNetwork" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                                        <input type="text" readonly="readonly" value="{$row.bankAccount}" class="form-control" id="bankAccount" name="bankAccount" />
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-1">
+                                                        <img id="photoImg" src="{$row.photo}" onclick="$(this).viewer({fullscreen: false});"  style="height: 110px;width: 76px;padding-bottom: 5px;">
+                                                    </div>
+                                                </div>
+                                                <div class="bs-callout bs-callout-success" >
+                                                    <div class="row">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
+                                                            <textarea readonly="readonly" style="overflow: auto;word-break: break-all; " class="form-control" id="educationAndResume" name="educationAndResume" rows="2">{$row.educationAndResume}</textarea>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
+                                                            <textarea readonly="readonly" style="overflow: auto;word-break: break-all; " class="form-control" id="mainHonours" name="mainHonours" rows="2">{$row.mainHonours}</textarea>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>备注</label>
+                                                            <textarea  readonly="readonly" style="overflow: auto;word-break: break-all; " class="form-control" id="description" name="description" rows="2">{$row.description}</textarea>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="bs-callout bs-callout-info" >
+                                                    <div class="row"  id="socialSecurityDiv">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>社保缴交情况</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.socialSecurity}" id="socialSecurity" name="socialSecurity" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row"  id="personalTaxDiv">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing">个税缴交情况(首年申报无需提交)</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.personalTax}" id="personalTax" name="personalTax" />
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                {neq name="process" value="1"}
+                                                <div class="bs-callout bs-callout-success" >
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>核查征信情况</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.outMsg}" id="outMsg" name="outMsg" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>核查社保缴交情况</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.actualSocialSecurity}" id="actualSocialSecurity" name="actualSocialSecurity" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>核查个税缴交情况</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.actualTax}" id="actualTax" name="actualTax" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>核查工商注册情况</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.actualBusinessRegistration}" id="actualBusinessRegistration" name="actualBusinessRegistration" />
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="bs-callout bs-callout-info" >
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-6">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>推荐兑现状态</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{switch name='row.recommendIsPay'}{case value='-1'}不予兑现{/case}{case value='0'}未知{/case}{case value='1'}待兑现{/case}{default /}已兑现{/switch}" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-6">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>推荐兑现金额</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.recommendAmount}" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>推荐状态判定详情</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.recommendJudgmentDetails}" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>推荐金额计算详情</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.recommendAmountDesc}" />
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                {eq name="process" value="4"}
+                                                <div class="bs-callout bs-callout-info" >
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-6">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>兑现状态</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{switch name='row.isPay'}{case value='-1'}不予兑现{/case}{case value='0'}未知{/case}{case value='1'}待兑现{/case}{default /}已兑现{/switch}" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-6">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>兑现金额</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.amount}" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>状态判定详情</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.judgmentDetails}" />
+                                                        </div>
+                                                    </div>
+                                                    <div class="row" >
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>金额计算详情</label>
+                                                            <input readonly="readonly" type="text" class="form-control" value="{$row.amountDesc}" />
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                {/eq}
+                                                {/neq}
+                                                <div class="row">
+                                                    <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明:本人对输入材料的真实性负全部责任</span></label>
+                                                </div>
+                                            </div>
+                                        </form>
+                                    </div>
+
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才认定</div>
+                                    <div class="panel-body">
+                                        <table id="identifyTable">
+                                        </table>
+                                    </div>
+
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">津补贴</div>
+                                    <div class="panel-body">
+                                        <table id="allowanceTable">
+                                        </table>
+                                    </div>
+
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                    <table id="logTable">
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                <thead>
+                                    <tr>
+                                        <th data-field="selectItem" data-checkbox="true"></th>
+                                    </tr>
+                                </thead>
+                            </table>
+                            <label style="padding-top: 15px;color: red">*本系统仅支持图片、XLS、XLSX、PDF上传</label><br>
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/master/livingAllowanceInfo/livingAllowanceInfo_info.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+
+
+<template id="checkTemplate">
+    <form id="firstCheckForm">
+        <div class="form-group" style="margin: 10px;">
+            <label for="state" class="control-label">审核状态</label>
+            <input type="hidden" id="process">
+            <select class="form-control" id="state" onchange="LivingAllowanceInfoInfoDlg.toggleField()">
+                <option value="">请选择</option>
+                <option value="3">审核通过</option>
+                <option value="2">审核驳回</option>
+                <option value="-1">审核不通过</option>
+            </select>
+        </div>
+        <div class="form-group" style="margin: 10px;">
+            <label for="msg" class="control-label">审核意见</label>
+            <textarea class="form-control" id="msg"
+                      placeholder="审核状态属“审核通过”的,仅代表此步骤已操作完成,不代表用户提交的信息符合认定条件。若不符合认定条件的,请写明不符合原因。" rows="6"></textarea>
+            <div id="field" style="padding-top: 5px;display: none">
+                <label for="filed" class="control-label">可修改字段</label>
+                <div id="field_info">
+                    <ul>
+                        <li style="width:20.5%"><input type="checkbox" value="declareType"><span>申报对象类型</span></li>
+                        <li style="width:10%"><input type="checkbox" value="introductionMethod"><span>引进方式</span></li>
+                        <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>
+                        <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>
+                        <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>
+                        <li style="width:10%"><input type="checkbox" value="provinceCode"
+                                                     onchange="LivingAllowanceInfoInfoDlg.fieldCheckd(this)"><span>籍贯省</span>
+                        </li>
+                        <li style="width:10%"><input type="checkbox" value="cityCode"
+                                                     onchange="LivingAllowanceInfoInfoDlg.fieldCheckd(this)"><span>籍贯市</span>
+                        </li>
+                        <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>
+                        <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>
+                        <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>
+                        <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>
+                        <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="backJJBusinessTime"><span>返晋创业时间</span></li>
+                        <!--                        <li style="width:31%"><input type="checkbox" value="letterTime"><span>首次来晋行政介绍信时间</span></li>-->
+                        <!--                        <li style="width:10%"><input type="checkbox" value="introductionMode"><span>引进方式</span></li>-->
+                        <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>
+                        <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="firstSocialSecurityTime"><span>首次社保缴纳时间</span></li>
+                        <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>
+                        <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>
+                        <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>
+                        <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>
+                        <li style="width:20.5%"><input type="checkbox"
+                                                       value="professionalQualifications"><span>国家职业资格</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>
+                        <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>
+                        <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>
+                        <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>
+                        <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>
+                        <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
+                        <!--                        <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>-->
+                        <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>
+
+                        <li style="width:20.5%"><input type="checkbox" value="socialSecurity"><span>社保缴纳情况</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="personalTax"><span>个税缴纳情况</span></li>
+                        <!--                        <li style="width:10%"><input type="checkbox" value="description"><span>备注</span></li>-->
+                    </ul>
+                </div>
+                <label for="files" class="control-label">可修改附件</label>
+                <div id="field_file">
+                </div>
+                <div class="form-group" style="text-align: center">
+                    <button type="button" class="btn btn-primary" onclick="LivingAllowanceInfoInfoDlg.checkAll()">全选</button>
+                    <button type="button" class="btn btn-success" onclick="LivingAllowanceInfoInfoDlg.unCheckAll()">反选</button>
+                </div>
+            </div>
+        </div>
+    </form>
+</template>
+{/block}

+ 0 - 108
app/admin/view/living_allowance/edit.html

@@ -1,108 +0,0 @@
-{extend name="layout/content"}
-{block name="content"}
-<div class="ibox float-e-margins">
-    <div class="ibox-content">
-        <div class="form-horizontal">
-
-            <div class="row">
-                <div class="col-sm-6 b-r">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">主键</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" id="id" name="id" value="{$item.id}">
-                        </div>
-                    </div>
-                    <div class="hr-line-dashed"></div>
-
-                    <#input id="id" name="主键" value="${item.id}" underline="true"/>
-                    <#input id="year" name="" value="${item.year}" underline="true"/>
-                    <#input id="enterpriseId" name="所属单位" value="${item.enterpriseId}" underline="true"/>
-                    <#input id="enterpriseName" name="企业名称" value="${item.enterpriseName}" underline="true"/>
-                    <#input id="type" name="人才类型" value="${item.type}" underline="true"/>
-                    <#input id="talentType" name="人才标签" value="${item.talentType}" underline="true"/>
-                    <#input id="cardType" name="证件类型" value="${item.cardType}" underline="true"/>
-                    <#input id="idCard" name="证件号码" value="${item.idCard}" underline="true"/>
-                    <#input id="name" name="姓名" value="${item.name}" underline="true"/>
-                    <#input id="photo" name="头像" value="${item.photo}" underline="true"/>
-                    <#input id="sex" name="性别" value="${item.sex}" underline="true"/>
-                    <#input id="nation" name="民族" value="${item.nation}" underline="true"/>
-                    <#input id="nationality" name="国籍" value="${item.nationality}" underline="true"/>
-                    <#input id="provinceCode" name="籍贯省代码" value="${item.provinceCode}" underline="true"/>
-                    <#input id="provinceName" name="籍贯省名称" value="${item.provinceName}" underline="true"/>
-                    <#input id="cityCode" name="籍贯市代码" value="${item.cityCode}" underline="true"/>
-                    <#input id="cityName" name="籍贯市名称" value="${item.cityName}" underline="true"/>
-                    <#input id="countyCode" name="籍贯县代码" value="${item.countyCode}" underline="true"/>
-                    <#input id="countyName" name="籍贯县名称" value="${item.countyName}" underline="true"/>
-                    <#input id="birthday" name="出生日期" value="${item.birthday}" underline="true"/>
-                    <#input id="address" name="现居地址" value="${item.address}" underline="true"/>
-                    <#input id="politics" name="政治面貌" value="${item.politics}" underline="true"/>
-                    <#input id="highEducation" name="最高学历" value="${item.highEducation}" underline="true"/>
-                    <#input id="graduateSchool" name="毕业学校" value="${item.graduateSchool}" underline="true"/>
-                    <#input id="major" name="专业" value="${item.major}" underline="true"/>
-                    <#input id="post" name="职务" value="${item.post}" underline="true"/>
-                    <#input id="phone" name="手机号码" value="${item.phone}" underline="true"/>
-                    <#input id="email" name="邮箱" value="${item.email}" underline="true"/>
-                    <#input id="bank" name="开户银行" value="${item.bank}" underline="true"/>
-                    <#input id="bankNetwork" name="开户银行网点" value="${item.bankNetwork}" underline="true"/>
-                    <#input id="bankAccount" name="银行账号" value="${item.bankAccount}" underline="true"/>
-                    <#input id="bankNumber" name="银行行号" value="${item.bankNumber}" underline="true"/>
-                    <#input id="entryTime" name="本单位入职时间" value="${item.entryTime}" underline="true"/>
-                    <#input id="quitTime" name="离职时间" value="${item.quitTime}" />
-                </div>
-
-                <div class="col-sm-6">
-                    <#input id="startTime" name="工作合同开始时间" value="${item.startTime}" underline="true"/>
-                    <#input id="endTime" name="工作合同结束时间" value="${item.endTime}" underline="true"/>
-                    <#input id="educationAndResume" name="教育背景及工作简历" value="${item.educationAndResume}" underline="true"/>
-                    <#input id="mainHonours" name="主要业绩及取得的荣誉" value="${item.mainHonours}" underline="true"/>
-                    <#input id="firstInJJTime" name="首次来晋工作时间" value="${item.firstInJJTime}" underline="true"/>
-                    <#input id="isIntroduction" name="是否引进人才" value="${item.isIntroduction}" underline="true"/>
-                    <#input id="industryField" name="行业领域" value="${item.industryField}" underline="true"/>
-                    <#input id="title" name="职称" value="${item.title}" underline="true"/>
-                    <#input id="professionalQualifications" name="国家职业资格" value="${item.professionalQualifications}" underline="true"/>
-                    <#input id="studyAbroad" name="是否有留学经历" value="${item.studyAbroad}" underline="true"/>
-                    <#input id="studyAbroadCountry" name="留学国家" value="${item.studyAbroadCountry}" underline="true"/>
-                    <#input id="studyAbroadTime" name="留学时间" value="${item.studyAbroadTime}" underline="true"/>
-                    <#input id="introductionMode" name="引进方式" value="${item.introductionMode}" underline="true"/>
-                    <#input id="letterTime" name="行政介绍信时间" value="${item.letterTime}" underline="true"/>
-                    <#input id="applyCount" name="申请次数" value="${item.applyCount}" underline="true"/>
-                    <#input id="isPublic" name="公示状态" value="${item.isPublic}" underline="true"/>
-                    <#input id="amount" name="" value="${item.amount}" underline="true"/>
-                    <#input id="isPay" name="是否发放补贴" value="${item.isPay}" underline="true"/>
-                    <#input id="publicBatch" name="公布批次" value="${item.publicBatch}" underline="true"/>
-                    <#input id="active" name="是否确认提交" value="${item.active}" underline="true"/>
-                    <#input id="checkState" name="审核状态" value="${item.checkState}" underline="true"/>
-                    <#input id="checkMsg" name="基础信息审核意见" value="${item.checkMsg}" underline="true"/>
-                    <#input id="fields" name="" value="${item.fields}" underline="true"/>
-                    <#input id="files" name="" value="${item.files}" underline="true"/>
-                    <#input id="firstSubmitTime" name="首次确认提交时间" value="${item.firstSubmitTime}" underline="true"/>
-                    <#input id="newSubmitTime" name="最新确认提交时间" value="${item.newSubmitTime}" underline="true"/>
-                    <#input id="outMsg" name="退件原因" value="${item.outMsg}" underline="true"/>
-                    <#input id="highProcess" name="" value="${item.highProcess}" underline="true"/>
-                    <#input id="isEffect" name="" value="${item.isEffect}" underline="true"/>
-                    <#input id="description" name="备注" value="${item.description}" underline="true"/>
-                    <#input id="createTime" name="创建时间" value="${item.createTime}" underline="true"/>
-                    <#input id="createUser" name="创建用户" value="${item.createUser}" underline="true"/>
-                    <#input id="updateTime" name="修改时间" value="${item.updateTime}" underline="true"/>
-                    <#input id="updateUser" name="修改用户" value="${item.updateUser}" />
-                </div>
-            </div>
-
-            <div class="row btn-group-m-t">
-                <div class="col-sm-10">
-                    <button type="button" class="btn btn-sm btn-info" onclick="LivingAllowanceInfoInfoDlg.editSubmit()" id="ensure">
-                        <i class="fa fa-check"></i>&nbsp;提交
-                    </button>
-                    <button type="button" class="btn btn-sm btn-danger" onclick="LivingAllowanceInfoInfoDlg.close()" id="cancel">
-                        <i class="fa fa-eraser"></i>&nbsp;取消
-                    </button>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
-<script type="text/javascript">
-    document.write('<script src="/static/modular/master/livingAllowanceInfo/livingAllowanceInfo_info.js?v=' + (new Date()).getTime() + '"><\/script>');
-</script>
-{/block}

+ 0 - 311
app/admin/view/living_allowance/index.html

@@ -1,311 +0,0 @@
-{extend name="layout/content"}
-{block name="content"}
-<style type="text/css">
-    .layui-layer-btn .layui-layer-btn1 {
-        border-color: #009688;
-        background-color: #009688;
-        color: #fff;
-    }
-    #field ul li{
-        list-style: none;
-        display:inline-block;
-        margin-bottom: 5px;
-    }
-    #field ul li input{
-        vertical-align:middle;
-        margin-top:1px;
-    }
-</style>
-<div class="row">
-    <div class="col-sm-12">
-        <div class="ibox float-e-margins">
-            <div class="ibox-title">
-                <h5>硕博人才生活补贴审核</h5>
-            </div>
-            <div class="ibox-content">
-                <div class="row row-lg">
-                    <div class="col-sm-12">
-                        <div class="row">
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">姓名
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="name" placeholder="">
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">证件号码
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="card_number" placeholder="">
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            性别
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="sex">
-                                        <option value=""></option>
-                                        <option value="1">男</option>
-                                        <option value="2">女</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            民族
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="nation">
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row highSearch" style="display: none">
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            国籍/地区
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="nationality">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            籍贯省
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="provinceCode">
-                                        <option value="">请选择</option>
-                                        @for(item in provinceList){
-                                        <option value="${item.code}">${item.name}</option>
-                                        @}
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            政治面貌
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="politics">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            单位名称
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="enterpriseId">
-                                        <option value="">请选择</option>
-                                        @for(item in enterpriseList){
-                                        <option value="${item.id}">${item.name}</option>
-                                        @}
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            行业领域
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="industryField">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3" {if condition="$type eq 2"}style="display: none"{/if}>
-                                <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">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            最高学历
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="highest_education">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">专业
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="major" placeholder="">
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">职称
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="title" placeholder="">
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            是否有留学经历
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="study_abroad">
-                                        <option value="">请选择</option>
-                                        <option value="2">否</option>
-                                        <option value="1">是</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">手机号码
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="phone" placeholder="">
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">电子邮箱
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="email" placeholder="">
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            人才标签
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="talent_type">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            所属镇街
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="address">
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
-                                            审核状态
-                                        </button>
-                                    </div>
-                                    <select class="form-control" id="checkState">
-                                        <option value="" >请选择</option>
-                                        <option value="0">待提交</option>
-                                        <option value="1">待审核</option>
-                                        <option value="2">已驳回</option>
-                                        <option value="3">已通过</option>
-                                        <option value="-1">审核不通过</option>
-                                    </select>
-                                </div>
-                            </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>
-                                    <select class="form-control" id="isPublic">
-                                        <option value="">请选择</option>
-                                        <option value="1">待核查征信</option>
-                                        <option value="2">待公示</option>
-                                        <option value="3">待审批</option>
-                                        <option value="4">待发放</option>
-                                        <option value="5">已发放</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-sm-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
-                                        </button>
-                                    </div>
-                                    <input type="text" class="form-control" id="year" placeholder="">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-12" style="text-align: center">
-                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();$(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
-                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();$('.highSearch').hide();$(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
-                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="LivingAllowanceInfo.search()">搜索</button>
-                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="LivingAllowanceInfo.reset()">重置</button>
-                            </div>
-                        </div>
-                        <div class="hidden-xs" id="LivingAllowanceInfoTableToolbar" role="group">
-                            {if condition="chkCommission('/admin/living_allowance/depCheck','/livingAllowanceInfo/depCheck')"}
-                            <button type="button" class="btn btn-sm btn-primary" onclick="LivingAllowanceInfo.openCheckLivingAllowanceInfo()">
-                                <i class="fa fa-check"></i>&nbsp;审核
-                            </button>
-                            {/if}
-                            {if condition="chkCommission('/admin/living_allowance/depExport','/livingAllowanceInfo/depExport')"}
-                            <button type="button" class="btn btn-sm btn-primary" onclick="LivingAllowanceInfo.showExportModal(2)">
-                                <i class="fa fa-file-excel-o"></i>&nbsp;导出
-                            </button>
-                            {/if}
-                        </div>
-                        <table id="LivingAllowanceInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
-                            <thead>
-                                <tr>
-                                    <th data-field="selectItem" data-checkbox="true"></th>
-                                </tr>
-                            </thead>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script type="text/javascript">
-    document.write('<script src="/static/modular/master/livingAllowanceInfo/livingAllowanceInfo.js?v=' + (new Date()).getTime() + '"><\/script>');
-</script>
-{/block}

+ 0 - 293
app/enterprise/view/living_allowance/add.html

@@ -1,293 +0,0 @@
-{extend name="layout/content"}
-{block name="content"}
-<style type="text/css">
-    .spacing {
-        margin-bottom: 10px;
-        padding-right:4px;
-        padding-left: 4px;
-    }
-    #talentInfoForm label {
-        font-size: xx-small;
-    }
-    .has-feedback .form-control {
-        padding-right: 5px;
-    }
-    .control-label{
-        color: #337ab7;
-    }
-    .rowGroup{
-        padding-bottom: 5px;
-    }
-    .imgs li{
-        list-style: none;
-        float: left;
-        border: 1px solid #d8d1d1;
-        text-align: center;
-        height: 30px;
-    }
-</style>
-<div class="ibox float-e-margins">
-    <div class="ibox-content">
-        <div class="form-horizontal">
-            <div class="row">
-                <div class="col-sm-12" >
-                    <div class="tabs-container" >
-                        <ul class="nav nav-tabs">
-                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基础信息</a></li>
-                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="initFileTable(CONFIG.project_master_living_allowance, 'fileTable')"  aria-expanded="false">2.附件上传</a></li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div id="tab-1" class="tab-pane active">
-                            <div class="panel-body" >
-                                <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
-                                    <div class="panel-body">
-                                        <form id="talentInfoForm" class="form-horizontal"  target="hiddenIframe">
-                                            <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="">
-                                                <input type="hidden" name="enterpriseId" id="enterpriseId" value="${enterprise.id}">
-                                                <input type="hidden" name="type" id="type" value="${enterprise.type}">
-                                                <input type="hidden" name="checkState" id="checkState" value="">
-                                                <input type="file" name="photo" id="photo" style="display: none">
-                                                <input type="hidden" name="provinceName" id="provinceName" value="">
-                                                <input type="hidden" name="cityName" id="cityName" value="">
-                                                <input type="hidden" name="countyName" id="countyName" value="">
-                                                <input type="hidden" name="hand" id="hand" value="${hand}">
-                                                <div class="row">
-                                                    <div class="col-sm-11">
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
-                                                            <input type="text" readonly="readonly" class="form-control" id="year" name="year" value="${year}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
-                                                            <select class="form-control" id="sex" name="sex">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">男</option>
-                                                                <option value="2">女</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control date" id="birthday" name="birthday"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <select class="form-control" id="nationality" name="nationality">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
-                                                            <select class="form-control " onchange="LivingAllowanceInfoInfoDlg.afterSelectProvince()" id="provinceCode" name="provinceCode">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
-                                                            <select class="form-control" onchange="LivingAllowanceInfoInfoDlg.afterSelectCity()" id="cityCode" name="cityCode"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
-                                                            <select class="form-control" id="countyCode" name="countyCode"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <select class="form-control" id="nation" name="nation">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <select class="form-control" id="politics" name="politics">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">身份证</option>
-                                                                <option value="2">通行证</option>
-                                                                <option value="3">护照</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
-                                                            <input class="form-control" id="idCard" name="idCard">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
-                                                            <input type="text" class="form-control date" id="firstInJJTime" name="firstInJJTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" id="enterpriseName"  name="enterpriseName" readonly="readonly" value="${enterprise.name}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
-                                                            <select type="text" class="form-control" id="industryField" value="${enterprise.industryField}" name="industryField" disabled="disabled">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>人才标签</label>
-                                                            <select class="form-control" id="talentType" name="talentType" ></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
-                                                            <select class="form-control" id="address" name="address" value="${enterprise.street}" disabled="disabled"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>首次来晋行政介绍信时间</label>
-                                                            <input type="text" class="form-control date" id="letterTime" name="letterTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
-                                                            <select class="form-control" id="introductionMode" name="introductionMode" data-placeholder="引进方式">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
-                                                            <input type="text" class="form-control date" id="entryTime" name="entryTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>职务</label>
-                                                            <input type="text" class="form-control" id="post" name="post"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>工作合同开始时间</label>
-                                                            <input type="text" class="form-control date" id="startTime" name="startTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>工作合同结束时间</label>
-                                                            <input type="text" class="form-control date" id="endTime" name="endTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                            <select class="form-control" id="highEducation" name="highEducation"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>学位证书取得时间</label>
-                                                            <input type="text" class="form-control date" id="studyAbroadTime" name="studyAbroadTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
-                                                            <input type="text" class="form-control" id="graduateSchool" name="graduateSchool">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" id="major" name="major"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">职称</label>
-                                                            <input type="text" class="form-control" id="title" name="title"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">国家职业资格</label>
-                                                            <input type="text" class="form-control" id="professionalQualifications" name="professionalQualifications"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">是否有留学经历</label>
-                                                            <select class="form-control" id="studyAbroad" name="studyAbroad">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
-                                                            <input type="text" class="form-control" id="phone" name="phone" maxlength="11"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
-                                                            <input type="text" class="form-control" id="email" name="email"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                            <input type="text" class="form-control" onchange="Feng.bankChange('bank', 'bankNumber')" id="bank" name="bank" placeholder="XX银行"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                            <input type="text" class="form-control" id="bankNumber" name="bankNumber"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" id="bankNetwork" name="bankNetwork" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                            <input type="text" class="form-control" id="bankAccount" name="bankAccount" />
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-sm-1">
-                                                        <img id="photoImg" src="${ctxPath}/static/img/photo.png" onclick="$('#photo').click()" style="height: 110px;width: 76px;padding-bottom: 5px;">
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="educationAndResume" name="educationAndResume" rows="2"></textarea>
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="mainHonours" name="mainHonours" rows="2"></textarea>
-                                                    </div>
-                                                </div>
-                                                <div class="row"  id="personalTaxDiv">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>个税缴交情况</label>
-                                                        <div id="personalTax" class="xm-select-demo"></div>
-                                                    </div>
-                                                </div>
-                                                <div class="row"  id="socialSecurityDiv">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>社保缴交情况</label>
-                                                        <div id="socialSecurity" class="xm-select-demo"></div>
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明:本人对输入材料的真实性负全部责任</span></label>
-                                                </div>
-                                            </div>
-                                        </form>
-                                    </div>
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
-                                    <table id="logTable">
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        <div id="tab-2" class="tab-pane ">
-                            <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
-                                <thead>
-                                    <tr>
-                                        <th data-field="selectItem" data-checkbox="true"></th>
-                                    </tr>
-                                </thead>
-                            </table>
-                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
-                            <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
-                                <input type='hidden' id="fileId" name="fileId" >
-                                <input type='file' id="upload_file" name="fileUrl" style='display: none'>
-                                <input type='hidden' id="mainId" name="mainId" >
-                                <input type='hidden' id="fileTypeId" name="fileTypeId" >
-                                <input type='hidden' id="index" name="index" >
-                                <input type="hidden" name="backName" value="callBack">
-                                <input type="type" name="type" value="19">
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
-<script type="text/javascript">
-    document.write('<script src="/static/js/plugins/xmSelect/xm-select.js?v=' + (new Date()).getTime() + '"><\/script>');
-    document.write('<script src="/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo_info.js?v=' + (new Date()).getTime() + '"><\/script>');
-    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
-</script>
-{/block}

+ 285 - 188
app/enterprise/view/living_allowance/apply.html

@@ -25,6 +25,45 @@
         text-align: center;
         height: 30px;
     }
+    .bs-callout {
+        padding: 20px;
+        margin: 20px 0;
+        border-top: 1px solid rgba(238, 238, 238, 0.74);
+        border-bottom: 1px solid #eee;
+        border-right: 1px solid #eee;
+        border-left-width: 5px;
+        border-radius: 3px;
+    }
+    .bs-callout-info {
+        border-left:1px solid #1b809e;
+    }
+    .bs-callout-info h4 {
+        color: #1b809e;
+    }
+    .bs-callout-success {
+        border-left:1px solid #1ab394;
+    }
+    .bs-callout-success h4 {
+        color: #1ab394;
+    }
+    .bs-callout-primary {
+        border-left:1px solid #5bc0de;
+    }
+    .bs-callout-primary h4 {
+        color: #5bc0de;
+    }
+    .bs-callout-wram {
+        border-left:1px solid #ffc107;
+    }
+    .bs-callout-wram h4 {
+        color: #ffc107;
+    }
+    .bs-callout-danger {
+        border-left:1px solid #c82333;
+    }
+    .bs-callout-danger h4 {
+        color: #c82333;
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -34,7 +73,7 @@
                     <div class="tabs-container" >
                         <ul class="nav nav-tabs">
                             <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基础信息</a></li>
-                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="initFileTable(CONFIG.project_master_living_allowance, 'fileTable')"  aria-expanded="false">2.附件上传</a></li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="initFileTable(CONFIG.project_master_living_allowance,'fileTable')"  aria-expanded="false">2.附件上传</a></li>
                         </ul>
                     </div>
                     <div class="tab-content">
@@ -46,205 +85,262 @@
                                         <form id="talentInfoForm" class="form-horizontal"  target="hiddenIframe">
                                             <div class="col-sm-12 form-group-sm">
                                                 <input type="hidden" name="id" id="id" value="{$row.id}">
-                                                <input type="hidden" name="enterpriseId" id="enterpriseId" value="{$enterprise.id}">
-                                                <input type="hidden" name="type" id="type" value="{$enterprise.type}">
+                                                <input type="hidden" name="enterpriseId" id="enterpriseId" value="{$row.enterpriseId}">
+                                                <input type="hidden" name="type" id="type" value="{$row.type}">
                                                 <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
                                                 <input type="file" name="photo" id="photo" style="display: none">
                                                 <input type="hidden" name="provinceName" id="provinceName" value="{$row.provinceName}">
                                                 <input type="hidden" name="cityName" id="cityName" value="{$row.cityName}">
                                                 <input type="hidden" name="countyName" id="countyName" value="{$row.countyName}">
                                                 <input type="hidden" name="hand" id="hand" value="{$hand}">
+                                                <input type="hidden" name="fields" id="fields" value="{$row.fields}">
+                                                <input type="hidden" name="files" id="files" value="{$row.files}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
-                                                            <input type="text" readonly="readonly" class="form-control" id="year" name="year" value="{$row.year}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" value="{$row.name}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
-                                                            <select class="form-control" id="sex" name="sex" value="{$row.sex}">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">男</option>
-                                                                <option value="2">女</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control date" id="birthday" name="birthday" value="{$row.birthday}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
-                                                            <select class="form-control " value="{$row.provinceCode}" onchange="LivingAllowanceInfoInfoDlg.afterSelectProvince()" id="provinceCode" name="provinceCode">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
-                                                            <select class="form-control" value="{$row.cityCode}" onchange="LivingAllowanceInfoInfoDlg.afterSelectCity()" id="cityCode" name="cityCode"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
-                                                            <select class="form-control" value="{$row.countyCode}" id="countyCode" name="countyCode"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <select class="form-control" value="{$row.nation}" id="nation" name="nation">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <select class="form-control" value="{$row.politics}" id="politics" name="politics">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" value="{$row.cardType}" id="cardType" name="cardType">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">身份证</option>
-                                                                <option value="2">通行证</option>
-                                                                <option value="3">护照</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
-                                                            <input class="form-control" value="{$row.idCard}" id="idCard" name="idCard">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
-                                                            <input type="text" class="form-control date" value="{$row.firstInJJTime}" id="firstInJJTime" name="firstInJJTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" value="{$row.enterpriseName}" id="enterpriseName"  name="enterpriseName" readonly="readonly" value="{$enterprise.name}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
-                                                            <select type="text" class="form-control" value="{$row.industryField}" id="industryField" value="{$enterprise.industryField}" name="industryField" disabled="disabled">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>人才标签</label>
-                                                            <select class="form-control" id="talentType" value="{$row.talentType}" name="talentType"  ></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
-                                                            <select class="form-control" id="address" value="{$row.address}" name="address" disabled="disabled"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>首次来晋行政介绍信时间</label>
-                                                            <input type="text" class="form-control date" value="{$row.letterTime}" id="letterTime" name="letterTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
-                                                            <select class="form-control" id="introductionMode" value="{$row.introductionMode}" name="introductionMode" data-placeholder="引进方式">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
-                                                            <input type="text" class="form-control date" value="{$row.entryTime}" id="entryTime" name="entryTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>职务</label>
-                                                            <input type="text" class="form-control" value="{$row.post}" id="post" name="post"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>工作合同开始时间</label>
-                                                            <input type="text" class="form-control date" value="{$row.startTime}" id="startTime" name="startTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>工作合同结束时间</label>
-                                                            <input type="text" class="form-control date" value="{$row.endTime}" id="endTime" name="endTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                            <select class="form-control" id="highEducation" value="{$row.highEducation}" name="highEducation"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>学位证书取得时间</label>
-                                                            <input type="text" class="form-control date" id="studyAbroadTime" value="{$row.studyAbroadTime}" name="studyAbroadTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
-                                                            <input type="text" class="form-control" value="{$row.graduateSchool}" id="graduateSchool" name="graduateSchool">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" value="{$row.major}" id="major" name="major"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">职称</label>
-                                                            <input type="text" class="form-control" value="{$row.title}" id="title" name="title"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">国家职业资格</label>
-                                                            <input type="text" class="form-control" value="{$row.professionalQualifications}" id="professionalQualifications" name="professionalQualifications"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing">是否有留学经历</label>
-                                                            <select class="form-control" id="studyAbroad" value="{$row.studyAbroad}" name="studyAbroad">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
-                                                            <input type="text" class="form-control" value="{$row.phone}" id="phone" name="phone" maxlength="11"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
-                                                            <input type="text" class="form-control" value="{$row.email}" id="email" name="email"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                            <input type="text" class="form-control" value="{$row.bank}" onchange="Feng.bankChange('bank', 'bankNumber')" id="bank" name="bank" placeholder="XX银行"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                            <input type="text" class="form-control" value="{$row.bankNumber}" id="bankNumber" name="bankNumber"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" value="{$row.bankNetwork}" id="bankNetwork" name="bankNetwork" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                            <input type="text" class="form-control" value="{$row.bankAccount}" id="bankAccount" name="bankAccount" />
+                                                        <div class="bs-callout bs-callout-info" id="callout-helper-context-color-specificity">
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
+                                                                        <input type="text" readonly="readonly" class="form-control" id="year" name="year" value="{$row.year}"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing">申报补贴年次</label>
+                                                                        <input type="text" readonly="readonly" class="form-control" value="{if condition='!$row'}未知{else/}{switch name='row.applyCount'}{case value='1'}首年{/case}{case value='2'}第二年{/case}{default /}第三年{/switch}{/if}"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报对象类型</label>
+                                                                        <select class="form-control" value="{$row.declareType}" id="declareType" name="declareType" >
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
+                                                                        <select class="form-control" value="{$row.introductionMethod}" id="introductionMethod" name="introductionMethod" onchange="LivingAllowanceInfoInfoDlg.introductionMethodChange()">
+                                                                            <option value="">请选择</option>
+                                                                            <option value="1">新引进</option>
+                                                                            <option value="2">其他</option>
+                                                                        </select>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="bs-callout bs-callout-primary" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
+                                                                        <input type="text" value="{$row.name}" class="form-control" id="name" name="name" />
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
+                                                                        <select class="form-control" value="{$row.cardType}" id="cardType" name="cardType">
+                                                                            <option value="">请选择</option>
+                                                                            <option value="1">身份证</option>
+                                                                            <option value="2">通行证</option>
+                                                                            <option value="3">护照</option>
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
+                                                                        <input class="form-control" value="{$row.idCard}" id="idCard" name="idCard" onchange="LivingAllowanceInfoInfoDlg.getBirthdayByIdCard()">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
+                                                                        <select class="form-control" value="{$row.sex}" id="sex" name="sex">
+                                                                            <option value="">请选择</option>
+                                                                            <option value="1">男</option>
+                                                                            <option value="2">女</option>
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                                        <input type="text" class="form-control date" value="{$row.birthday}" id="birthday" name="birthday"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                                        <select class="form-control" value="{$row.nationality}" id="nationality" name="nationality">
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
+                                                                        <select class="form-control " value="{$row.provinceCode}" onchange="LivingAllowanceInfoInfoDlg.afterSelectProvince()" id="provinceCode" name="provinceCode">
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
+                                                                        <select class="form-control" value="{$row.cityCode}" onchange="LivingAllowanceInfoInfoDlg.afterSelectCity()" id="cityCode" name="cityCode"></select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
+                                                                        <select class="form-control" value="{$row.countyCode}" id="countyCode" name="countyCode"></select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>民族</label>
+                                                                        <select class="form-control" value="{$row.nation}" id="nation" name="nation">
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                                        <select class="form-control" value="{$row.politics}" id="politics" name="politics">
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3" id="firstInJJTimeDiv" style="display: none">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
+                                                                        <input type="text" value="{$row.firstInJJTime}" class="form-control date" id="firstInJJTime" name="firstInJJTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3" id="backJJBusinessTimeDiv" style="display: none">
+                                                                        <label class="control-label spacing" id="backJJBusinessTimeLabel"><span style="color: red">*</span>返晋创业时间</label>
+                                                                        <input type="text" value="{$row.backJJBusinessTime}" class="form-control date" id="backJJBusinessTime" name="backJJBusinessTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
+                                                                        <input type="text" value="{$row.phone}" class="form-control" id="phone" name="phone" maxlength="11"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
+                                                                        <input type="text" value="{$row.email}" class="form-control" id="email" name="email"/>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="bs-callout bs-callout-success" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
+                                                                        <input type="text" value="{$row.enterpriseName}" class="form-control" id="enterpriseName"  name="enterpriseName" readonly="readonly"  />
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
+                                                                        <input type="text" value="{$row.entryTime}" class="form-control date" id="entryTime" name="entryTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>工作合同开始时间</label>
+                                                                        <input type="text" value="{$row.startTime}" class="form-control date" id="startTime" name="startTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>工作合同结束时间</label>
+                                                                        <input type="text" value="{$row.endTime}" class="form-control date" id="endTime" name="endTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>首次社保缴纳时间</label>
+                                                                        <input type="text" value="{$row.firstSocialSecurityTime}" class="form-control date" id="firstSocialSecurityTime" name="firstSocialSecurityTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>行业领域</label>
+                                                                        <select type="text" value="{$row.industryField}" class="form-control" id="industryField"  name="industryField" disabled="disabled">
+                                                                        </select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
+                                                                        <select class="form-control" value="{$row.address}" id="address" name="address" disabled="disabled"></select>
+                                                                    </div>
+<!--                                                                    <div class="rowGroup col-sm-3" style="display: none">-->
+<!--                                                                        <label class=" control-label spacing"><span style="color: red">*</span>首次来晋行政介绍信时间</label>-->
+<!--                                                                        <input type="text" value="{$row.letterTime}" class="form-control date" id="letterTime" name="letterTime"/>-->
+<!--                                                                    </div>-->
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>职务</label>
+                                                                        <input type="text" value="{$row.post}" class="form-control" id="post" name="post"/>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <div class="bs-callout bs-callout-wram" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                                        <input type="text" value="{$row.graduateSchool}" class="form-control" id="graduateSchool" name="graduateSchool">
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
+                                                                        <select class="form-control" value="{$row.highEducation}" id="highEducation" name="highEducation"></select>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class=" control-label spacing"><span style="color: red">*</span>学位证书取得时间</label>
+                                                                        <input type="text" value="{$row.studyAbroadTime}" class="form-control date" id="studyAbroadTime" name="studyAbroadTime"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                                        <input type="text" value="{$row.major}" class="form-control" id="major" name="major"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing">职称</label>
+                                                                        <input type="text" value="{$row.title}" class="form-control" id="title" name="title"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing">国家职业资格</label>
+                                                                        <input type="text" value="{$row.professionalQualifications}" class="form-control" id="professionalQualifications" name="professionalQualifications"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing">是否有留学经历</label>
+                                                                        <select class="form-control" value="{$row.studyAbroad}" id="studyAbroad" name="studyAbroad">
+                                                                            <option value="2">否</option>
+                                                                            <option value="1">是</option>
+                                                                        </select>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <!--                                                        <div class="rowGroup col-sm-3">-->
+                                                        <!--                                                            <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>-->
+                                                        <!--                                                            <select class="form-control" id="introductionMode" name="introductionMode" data-placeholder="引进方式">-->
+                                                        <!--                                                            </select>-->
+                                                        <!--                                                        </div>-->
+                                                        <div class="bs-callout bs-callout-danger" >
+                                                            <div class="row">
+                                                                <div class="col-sm-12">
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
+                                                                        <input type="text" value="{$row.bank}" class="form-control" onchange="Feng.bankChange('bank','bankNumber')" id="bank" name="bank" placeholder="XX银行"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
+                                                                        <input type="text" value="{$row.bankNumber}" class="form-control" id="bankNumber" name="bankNumber"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
+                                                                        <input type="text" value="{$row.bankNetwork}" class="form-control" id="bankNetwork" name="bankNetwork" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                                    </div>
+                                                                    <div class="rowGroup col-sm-3">
+                                                                        <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                                        <input type="text" value="{$row.bankAccount}" class="form-control" id="bankAccount" name="bankAccount" />
+                                                                    </div>
+                                                                </div>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                     <div class="col-sm-1">
-                                                        <img id="photoImg" src="{$row.photo}" onclick="$('#photo').click()" style="height: 110px;width: 76px;padding-bottom: 5px;">
+                                                        <img id="photoImg" src="{$row.photo|default='/static/img/photo.png'}" onclick="$('#photo').click()" style="height: 110px;width: 76px;padding-bottom: 5px;">
                                                     </div>
                                                 </div>
-                                                <div class="row">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="educationAndResume" name="educationAndResume" rows="2">{$row.educationAndResume}</textarea>
+                                                <div class="bs-callout bs-callout-success" >
+                                                    <div class="row">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
+                                                            <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="educationAndResume" name="educationAndResume" rows="2">{$row.educationAndResume}</textarea>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; "  class="form-control" id="mainHonours" name="mainHonours" rows="2">{$row.mainHonours}</textarea>
+                                                    <div class="row">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
+                                                            <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="mainHonours" name="mainHonours" rows="2">{$row.mainHonours}</textarea>
+                                                        </div>
                                                     </div>
                                                 </div>
-                                                <div class="row"  id="personalTaxDiv">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>个税缴交情况</label>
-                                                        <div id="personalTax" class="xm-select-demo" value="{$row.personalTax}"></div>
+                                                <div class="bs-callout bs-callout-info" >
+                                                    <div class="row"  id="socialSecurityDiv">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>社保缴交情况</label>
+                                                            <div id="socialSecurity" class="xm-select-demo" value="{$row.socialSecurity}"></div>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                                <div class="row"  id="socialSecurityDiv">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>社保缴交情况</label>
-                                                        <div id="socialSecurity" class="xm-select-demo" value="{$row.socialSecurity}"></div>
+                                                    <div class="row"  id="personalTaxDiv">
+                                                        <div class="rowGroup col-sm-12">
+                                                            <label class=" control-label spacing">个税缴交情况(首年申报无需提交)</label>
+                                                            <div id="personalTax" class="xm-select-demo" value="{$row.personalTax}"></div>
+                                                        </div>
                                                     </div>
                                                 </div>
                                                 <div class="row">
@@ -267,15 +363,16 @@
                                     </tr>
                                 </thead>
                             </table>
+                            <label style="padding-top: 15px;color: red">*本系统仅支持图片、XLS、XLSX、PDF上传</label><br>
                             <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
                             <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
                                 <input type='hidden' id="fileId" name="fileId" >
-                                <input type='file' id="upload_file" name="fileUrl" style='display: none'>
+                                <input type='file'  multiple id="upload_file" name="fileUrl" style='display: none'>
                                 <input type='hidden' id="mainId" name="mainId" >
                                 <input type='hidden' id="fileTypeId" name="fileTypeId" >
                                 <input type='hidden' id="index" name="index" >
                                 <input type="hidden" name="backName" value="callBack">
-                                <input type="type" name="type" value="19">
+                                <input type="hidden" name="type" value="19">
                             </form>
                         </div>
                     </div>
@@ -286,8 +383,8 @@
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <script type="text/javascript">
-    document.write('<script src="/static/js/plugins/xmSelect/xm-select.js?v=' + (new Date()).getTime() + '"><\/script>');
-    document.write('<script src="/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo_info.js?v=' + (new Date()).getTime() + '"><\/script>');
-    document.write('<script src="/static/modular/common/upload.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/js/plugins/xmSelect/xm-select.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo_info.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/common/upload.js?v='+(new Date()).getTime()+'"><\/script>');
 </script>
 {/block}

+ 1 - 1
app/enterprise/view/living_allowance/index.html

@@ -25,7 +25,7 @@
                                         <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">身份证号码
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="card_number" placeholder="">
+                                    <input type="text" class="form-control" id="idCard" placeholder="">
                                 </div>
                             </div>
                             <div class="col-sm-3">

+ 122 - 29
public/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo.js

@@ -2,8 +2,8 @@
  * 硕博人才生活补贴申报管理初始化
  */
 var LivingAllowanceInfo = {
-    id: "LivingAllowanceInfoTable", //表格id
-    seItem: null, //选中的条目
+    id: "LivingAllowanceInfoTable",	//表格id
+    seItem: null,		//选中的条目
     table: null,
     layerIndex: -1
 };
@@ -15,6 +15,20 @@ LivingAllowanceInfo.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
         {title: '申报年度', field: 'year', visible: true, align: 'center', valign: 'middle', width: '80px'},
+        {title: '申报补贴年次', field: 'applyCount', visible: true, align: 'center', valign: 'middle', width: '100px',
+            formatter: function (value, row, index) {
+                if(value == 1){
+                    return "首年";
+                }
+                if(value == 2){
+                    return "第二年";
+                }
+                if(value == 3){
+                    return "第三年";
+                }
+            }
+        },
+        {title: '申报类型', field: 'declareTypeName', visible: true, align: 'center', valign: 'middle', width: '80px'},
         {
             title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
@@ -26,15 +40,6 @@ LivingAllowanceInfo.initColumn = function () {
         //         return value == 1?"晋江市优秀人才":"集成电路优秀人才";
         //     }
         // },
-        {
-            title: '人才标签',
-            field: 'talentTypeName',
-            visible: true,
-            align: 'center',
-            valign: 'middle',
-            'class': 'uitd_showTip',
-            width: "100px"
-        },
         {
             title: '证件号码',
             field: 'idCard',
@@ -99,32 +104,102 @@ LivingAllowanceInfo.initColumn = function () {
             width: "100px"
         },
         {
-            title: '申请次数',
-            field: 'applyCount',
+            title: '兑现状态',
+            field: 'isPay',
             visible: true,
             align: 'center',
             valign: 'middle',
             'class': 'uitd_showTip',
-            width: "100px"
+            width: "80px",
+            formatter : function (value,row,index) {
+                if(value == -1){
+                    return "<span style='color: red'>不予兑现</span>"
+                }
+                if(value == 0){
+                    return "<span style='color: grey'>未知</span>"
+                }
+                if(value == 1){
+                    return "<span style='color: green'>待兑现</span>"
+                }
+                if(value == 2){
+                    return "<span style='color: darkred'>已兑现</span>"
+                }
+            }
         },
         {
-            title: '审核状态',
-            field: 'checkStateName',
+            title: '兑现金额',
+            field: 'amount',
             visible: true,
             align: 'center',
             valign: 'middle',
             'class': 'uitd_showTip',
-            width: "100px"
+            width: "100px",
         },
         {
-            title: '公示状态',
-            field: 'isPublicName',
+            title: '判断描述',
+            field: 'amountDesc',
             visible: true,
             align: 'center',
             valign: 'middle',
             'class': 'uitd_showTip',
-            width: "100px"
+            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'>待提交</span>"
+                }else if(value==10 || value==5){
+                    return "<span class='label label-danger'>已驳回</span>"
+                }else{
+                    if(row.isPublic>=4){
+                        if(value==-1){
+                            return "<span class='label label-danger'>审核不通过</span>"
+                        }else if(value==35){
+                            return "<span class='label label-primary'>审核通过</span>"
+                        }else{
+                            return "<span class='label label-success'>审核中</span>"
+                        }
+                    }else{
+                        return "<span class='label label-success'>审核中</span>"
+                    }
+                }
+            }
+        },
+        {title: '审核意见', field: 'checkMsg', visible: false, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"100px",
+            formatter : function (value,row,index) {
+                if(value==1){
+                    return ""
+                }else if(value==10 || value==5){
+                    return value;
+                }else{
+                    if(row.isPublic>=5){
+                        if(value==-1){
+                            return value
+                        }else if(value==35){
+                            return value;
+                        }else{
+                            return ""
+                        }
+                    }else{
+                        return ""
+                    }
+                }
+            }
+        },
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',width:"80px",
+            formatter : function (value,row,index){
+                return "<span class='label label-success' onclick=\"LivingAllowanceInfo.showLog('"+value+"')\" >" +
+                    "<i class=\"fa fa-book\"></i>日志" +
+                    "</span>";
+            }
+        }
     ];
 };
 
@@ -146,14 +221,14 @@ LivingAllowanceInfo.check = function () {
  * 点击添加硕博人才生活补贴申报
  */
 LivingAllowanceInfo.openAddLivingAllowanceInfo = function () {
-    var ajax = new $ax("/common/batch/checkBatchValid", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/api/commonBatch/valiateIsAdd", function (data) {
         if (data.code == 200) {
             var index = layer.open({
                 type: 2,
                 title: '添加人才生活补贴申报',
                 fix: false, //不固定
                 maxmin: true,
-                content: '/enterprise/living_allowance/apply?year=' + data.batch,
+                content: Feng.ctxPath + '/api/livingAllowanceInfo/livingAllowanceInfo_add?year=' + data.obj,
                 btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
                 btnAlign: 'c',
                 btn1: function (index, layero) {
@@ -188,7 +263,7 @@ LivingAllowanceInfo.openAddLivingAllowanceInfo = function () {
  */
 LivingAllowanceInfo.openLivingAllowanceInfoDetail = function () {
     if (this.check()) {
-        var ajax = new $ax("/common/batch/checkBatchValid", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/api/commonBatch/valiateIsEditOrSubmit", function (data) {
             if (data.code == 200) {
                 var index = layer.open({
                     type: 2,
@@ -196,7 +271,7 @@ LivingAllowanceInfo.openLivingAllowanceInfoDetail = function () {
                     area: ['800px', '420px'], //宽高
                     fix: false, //不固定
                     maxmin: true,
-                    content: '/enterprise/living_allowance/apply/id/' + LivingAllowanceInfo.seItem.id,
+                    content: Feng.ctxPath + '/api/livingAllowanceInfo/livingAllowanceInfo_update/' + LivingAllowanceInfo.seItem.id + "/update",
                     btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
                     btnAlign: 'c',
                     btn1: function (index, layero) {
@@ -224,7 +299,6 @@ LivingAllowanceInfo.openLivingAllowanceInfoDetail = function () {
         });
         ajax.set("type", CONFIG.project_master_living_allowance);
         ajax.set("year", LivingAllowanceInfo.seItem.year);
-        ajax.set("first_submit_time", LivingAllowanceInfo.seItem.firstSubmitTime);
         ajax.start();
     }
 };
@@ -240,7 +314,7 @@ LivingAllowanceInfo.openLivingAllowanceInfoSelect = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: '/enterprise/living_allowance/view/id/' + LivingAllowanceInfo.seItem.id,
+            content: Feng.ctxPath + '/api/livingAllowanceInfo/livingAllowanceInfo_update/' + LivingAllowanceInfo.seItem.id + "/select",
             btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
             btnAlign: 'c',
         });
@@ -260,13 +334,13 @@ LivingAllowanceInfo.delete = function () {
             return;
         }
         var operation = function () {
-            var ajax = new $ax("/enterprise/living_allowance/delete", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/api/livingAllowanceInfo/delete", function (data) {
                 Feng.success("删除成功!");
                 LivingAllowanceInfo.table.refresh();
             }, function (data) {
                 Feng.error("删除失败!" + data.responseJSON.message + "!");
             });
-            ajax.set("id", LivingAllowanceInfo.seItem.id);
+            ajax.set("livingAllowanceInfoId", LivingAllowanceInfo.seItem.id);
             ajax.start();
         }
         Feng.confirm("删除后无法恢复,确认删除吗?", operation);
@@ -283,9 +357,28 @@ LivingAllowanceInfo.search = function () {
     LivingAllowanceInfo.table.refresh({query: queryData});
 };
 
+LivingAllowanceInfo.reset = function (){
+    $("#name").val("");
+    $("#idCard").val("");
+}
+
+LivingAllowanceInfo.showLog = function (id){
+    layer.open({
+        type: 1,
+        title:"日志",
+        fixed:false,
+        content: '<table id="'+id+'"></table>',
+        area: ['80%', '80%'],
+        maxmin: true,
+        success :function (layero, index) {
+            Feng.getCheckLog(id,{"type":CONFIG.project_master_living_allowance,"mainId":id,"typeFileId":"","active":1})
+        }
+    });
+}
+
 $(function () {
     var defaultColunms = LivingAllowanceInfo.initColumn();
-    var table = new BSTable(LivingAllowanceInfo.id, "/enterprise/living_allowance/list", defaultColunms);
+    var table = new BSTable(LivingAllowanceInfo.id, "/api/livingAllowanceInfo/list", defaultColunms);
     table.setOnDblClickRow(function () {
         LivingAllowanceInfo.openLivingAllowanceInfoSelect();
     });

+ 224 - 110
public/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo_info.js

@@ -3,11 +3,12 @@
  */
 var LivingAllowanceInfoInfoDlg = {
     livingAllowanceInfoInfoData: {},
+    locked: false,
     validateFields: {
         enterpriseId: {validators: {notEmpty: {message: '所属企业不能为空'}}},
         enterpriseName: {validators: {notEmpty: {message: '所属企业不能为空'}}},
+        declareType: {validators: {notEmpty: {message: '申报类型不能为空'}}},
         type: {validators: {notEmpty: {message: '人才类别不能为空'}}},
-        talentType: {validators: {notEmpty: {message: '人才标签不能为空'}}},
         name: {validators: {notEmpty: {message: '姓名不能为空'}}},
         nation: {validators: {notEmpty: {message: '民族不能为空'}}},
         provinceCode: {validators: {notEmpty: {message: '户籍省份不能为空'}}},
@@ -57,8 +58,16 @@ var LivingAllowanceInfoInfoDlg = {
         sex: {validators: {notEmpty: {message: '性别不能为空'}}},
         nationality: {validators: {notEmpty: {message: '国籍/地区不能为空'}}},
         birthday: {validators: {notEmpty: {message: '出生日期不能为空'}}},
+        firstSocialSecurityTime: {validators: {notEmpty: {message: '首次社保缴纳时间不能为空'}}},
         politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
-        post: {validators: {notEmpty: {message: '职务不能为空'}}},
+        post: {validators: {
+            notEmpty: {message: '职务不能为空'},
+            regexp:{
+                regexp:/^[\u4e00-\u9fa5]{0,}$/,
+                message: "职务必须为汉字"
+            }
+
+        }},
         email: {
 
             validators: {
@@ -87,12 +96,12 @@ var LivingAllowanceInfoInfoDlg = {
                     message: '银行行号不能为空'
                 },
                 regexp: {
-                    regexp: /^\d+$/,
+                    regexp: /^\d{12}$/,
                     message: "银行行号格式不正确"
                 }
             }
         },
-        introductionMode: {
+        introductionMethod: {
             validators: {
                 notEmpty: {
                     message: '引进方式不能为空'
@@ -102,11 +111,18 @@ var LivingAllowanceInfoInfoDlg = {
         startTime: {validators: {notEmpty: {message: '工作合同开始时间不能为空'}}},
         mainHonours: {validators: {notEmpty: {message: '主要业绩及取得的荣誉不能为空'}}},
         educationAndResume: {validators: {notEmpty: {message: '教育背景及工作简历不能为空'}}},
-        firstInJJTime: {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}},
+        // firstInJJTime: {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}},
         industryField: {validators: {notEmpty: {message: '行业领域不能为空'}}}
     },
     tax: null,
-    socialSecurity: null
+    socialSecurity: null,
+    getBirthdayByIdCard() {
+        var cardType = $("#cardType").val();
+        if (cardType == 1) {
+            var idCard = $("#idCard").val();
+            $("#birthday").val(idCard.substring(6, 10) + "-" + idCard.substring(10, 12) + "-" + idCard.substring(12, 14));
+        }
+    }
 };
 
 /**
@@ -149,53 +165,56 @@ LivingAllowanceInfoInfoDlg.close = function () {
  */
 LivingAllowanceInfoInfoDlg.collectData = function () {
     this
-            .set('id')
-            .set('year')
-            .set('enterpriseId')
-            .set('enterpriseName')
-            .set('type')
-            .set('talentType')
-            .set('cardType')
-            .set('idCard')
-            .set('name')
-            .set('photo')
-            .set('sex')
-            .set('nation')
-            .set('nationality')
-            .set('provinceCode')
-            .set('cityCode')
-            .set('countyCode')
-            .set('birthday')
-            .set('address')
-            .set('politics')
-            .set('highEducation')
-            .set('graduateSchool')
-            .set('major')
-            .set('post')
-            .set('phone')
-            .set('email')
-            .set('bank')
-            .set('bankNetwork')
-            .set('bankAccount')
-            .set('bankNumber')
-            .set('entryTime')
-            // .set('quitTime')
-            .set('startTime')
-            .set('endTime')
-            .set('educationAndResume')
-            .set('mainHonours')
-            .set('firstInJJTime')
-            // .set('isIntroduction')
-            .set('industryField')
-            .set('title')
-            .set('professionalQualifications')
-            .set('studyAbroad')
-            // .set('studyAbroadCountry')
-            .set('studyAbroadTime')
-            .set('introductionMode')
-            .set('letterTime')
-            // .set('applyCount')
-            ;
+        .set('id')
+        .set('year')
+        .set('enterpriseId')
+        .set('enterpriseName')
+        .set('type')
+        .set('declareType')
+        .set('cardType')
+        .set('idCard')
+        .set('name')
+        .set('photo')
+        .set('sex')
+        .set('nation')
+        .set('nationality')
+        .set('provinceCode')
+        .set('cityCode')
+        .set('countyCode')
+        .set('birthday')
+        .set('address')
+        .set('politics')
+        .set('highEducation')
+        .set('graduateSchool')
+        .set('major')
+        .set('post')
+        .set('phone')
+        .set('email')
+        .set('bank')
+        .set('bankNetwork')
+        .set('bankAccount')
+        .set('bankNumber')
+        .set('entryTime')
+        // .set('quitTime')
+        .set('startTime')
+        .set('endTime')
+        .set('educationAndResume')
+        .set('mainHonours')
+        .set('firstInJJTime')
+        // .set('isIntroduction')
+        .set('industryField')
+        .set('title')
+        .set('professionalQualifications')
+        .set('studyAbroad')
+        // .set('studyAbroadCountry')
+        .set('studyAbroadTime')
+        .set('backJJBusinessTime')
+        .set('introductionMethod')
+        .set('firstSocialSecurityTime')
+    // .set('introductionMode')
+    // .set('letterTime')
+    // .set('applyCount')
+    ;
     if ($("#provinceCode").val() != null && $("#provinceCode").val() != '') {
         this.livingAllowanceInfoInfoData["provinceName"] = $("#provinceCode").find("option:selected").text();
     }
@@ -212,10 +231,10 @@ LivingAllowanceInfoInfoDlg.collectData = function () {
     // }
     var personalTax = personalTaxVal.map(function (item) {
         return item.value;
-    }).join(",");
+    }).sort().join(",");
     var socialSecurity = socialSecurityVal.map(function (item) {
         return item.value;
-    }).join(",");
+    }).sort().join(",");
     LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData["personalTax"] = personalTax;
     LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData["socialSecurity"] = socialSecurity;
 }
@@ -230,24 +249,68 @@ LivingAllowanceInfoInfoDlg.validate = function () {
     return $("#talentInfoForm").data('bootstrapValidator').isValid();
 }
 
-/**
- * 提交添加
- */
-LivingAllowanceInfoInfoDlg.addSubmit = function () {
+LivingAllowanceInfoInfoDlg.upsertValidate = function (){
     this.clearData();
     this.collectData();
     if (!LivingAllowanceInfoInfoDlg.validate()) {
         return;
     }
+    if(Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.socialSecurity)){
+        Feng.info("社保缴交情况不能为空!");
+        return;
+    }
+    if (LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.introductionMethod == 1) {
+        if (Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.firstInJJTime)) {
+            Feng.info("首次来晋时间不能为空!");
+            return;
+        }
+        var dateArr = new Array(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.firstSocialSecurityTime,
+            LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.entryTime,
+            LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.startTime);
+        dateArr.sort(function (a, b) {
+            return a > b ? 1 : -1
+        });
+        if (new Date(dateArr[0]).getTime() < new Date("2021-11-16").getTime()) {
+            Feng.info("不符合2021年11月16日起新引进的人才条件,无法申报");return ;
+        }
+    }
+    if (LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.introductionMethod == 2) {
+        if (Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.backJJBusinessTime)) {
+            Feng.info("返晋创业时间不能为空!");
+            return;
+        }
+        if(new Date("2021-11-16").getTime() > new Date(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.backJJBusinessTime).getTime()){
+            Feng.info("引进方式为其他的必须满足:返晋创业时间在2021-11-16至2022-11-15之间!");return ;
+        }
+        if(new Date("2022-11-15").getTime() < new Date(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.backJJBusinessTime).getTime()){
+            Feng.info("引进方式为其他的必须满足:返晋创业时间在2021-11-16至2022-11-15之间!");return ;
+        }
+    }
+    if (Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.id) && Feng.isEmptyStr($("#photo").val())) {
+        Feng.info("头像不能为空!");
+        return;
+    }
     var formData = new FormData();
     Object.keys(this.livingAllowanceInfoInfoData).forEach((key) => {
         formData.append(key, this.livingAllowanceInfoInfoData[key]);
     });
-    if (Feng.isEmptyStr(LivingAllowanceInfoInfoDlg.livingAllowanceInfoInfoData.id) && Feng.isEmptyStr($("#photo").val())) {
-        Feng.info("头像不能为空!");
+    formData.append('file', $('#photo')[0].files[0]);
+    return formData;
+}
+
+
+/**
+ * 提交添加
+ */
+LivingAllowanceInfoInfoDlg.addSubmit = function () {
+    var formData = LivingAllowanceInfoInfoDlg.upsertValidate();
+    if(formData == null){
         return;
     }
-    formData.append('file', $('#photo')[0].files[0]);
+    if (LivingAllowanceInfoInfoDlg.locked) {
+        return;
+    }
+    LivingAllowanceInfoInfoDlg.locked = true;
     $.ajax({
         url: Feng.ctxPath + "/api/livingAllowanceInfo/upsert",
         type: "POST",
@@ -256,6 +319,7 @@ LivingAllowanceInfoInfoDlg.addSubmit = function () {
         data: formData,
         success: function (data) {
             LivingAllowanceInfoInfoDlg.setNoChangeField();
+            LivingAllowanceInfoInfoDlg.locked = false;
             if (data.code == 200) {
                 Feng.success(data.msg);
                 window.parent.LivingAllowanceInfo.table.refresh();
@@ -266,6 +330,7 @@ LivingAllowanceInfoInfoDlg.addSubmit = function () {
                 Feng.info(data.msg);
             }
         }, error: function (data) {
+            LivingAllowanceInfoInfoDlg.locked = false;
             Feng.error("保存失败!" + data.responseJSON.message + "!");
         }
     });
@@ -280,22 +345,54 @@ LivingAllowanceInfoInfoDlg.submitToCheck = function () {
         Feng.info("请先填写基础信息并上传附件");
         return;
     }
-    if (!validateIsEdit())
+    if (!validateIsEdit()) return;
+    var formData = LivingAllowanceInfoInfoDlg.upsertValidate();
+    if(formData == null){
         return;
+    }
+    $.ajax({
+        url: Feng.ctxPath + "/api/livingAllowanceInfo/upsert",
+        type: "POST",
+        processData: false,
+        contentType: false,
+        data: formData,
+        async:true,
+        success: function (data) {
+            if (data.code == 200) {
+                LivingAllowanceInfoInfoDlg.submitFun();
+            } else {
+                Feng.info(data.msg);
+            }
+        }, error: function (data) {
+            LivingAllowanceInfoInfoDlg.locked = false;
+            Feng.error("提交失败!" + data.responseJSON.message + "!");
+        }
+    });
+
+}
+
+LivingAllowanceInfoInfoDlg.submitFun = function (){
     var operation = function () {
-        var ajax = new $ax(Feng.ctxPath + "/enterprise/living_allowance/submitToCheck", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/api/livingAllowanceInfo/submitToCheck", function (data) {
             if (data.code == 200) {
                 Feng.success(data.msg);
                 // $("#checkState").val(data.obj);
                 window.parent.LivingAllowanceInfo.table.refresh();
                 LivingAllowanceInfoInfoDlg.close();
+            } else if (data.code == 600) {
+                layer.confirm(data.msg, {
+                    btn: ['我已知晓'] //按钮
+                }, function () {
+                    window.parent.LivingAllowanceInfo.table.refresh();
+                    LivingAllowanceInfoInfoDlg.close();
+                });
             } else {
                 Feng.error(data.msg);
             }
         }, function (data) {
             Feng.error("提交审核失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("id", id);
+        ajax.set("id", $("#id").val());
         ajax.start();
     }
     Feng.confirm("请确认基础信息已核对无误,相应附件已上传,一旦提交,无法修改", operation);
@@ -308,13 +405,13 @@ LivingAllowanceInfoInfoDlg.setNoChangeField = function () {
     var checkState = $("#checkState").val();
     var fields = $("#fields").val();
     if (checkState == 10) {
-        $("input,textarea").each(function () {
-            $(this).attr("readonly", "readonly");
-        });
-        $("select").each(function () {
+        // $("input,textarea").each(function () {
+        //     $(this).attr("readonly", "readonly");
+        // });
+        $("select,input,textarea").not(":file,:hidden").each(function () {
             $(this).attr("disabled", "disabled");
         });
-        if (fields != null && fields != '') {
+        if (Feng.isNotEmptyStr(fields)) {
             var arr = fields.split(",");
             for (var key in arr) {
                 var name = $("#" + arr[key]).prop("tagName");
@@ -322,9 +419,11 @@ LivingAllowanceInfoInfoDlg.setNoChangeField = function () {
                     $("#" + arr[key]).removeAttr("disabled");
                 }
                 if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                    $("#" + arr[key]).removeAttr("readonly");
+                    $("#" + arr[key]).removeAttr("disabled");
                 }
             }
+            LivingAllowanceInfoInfoDlg.tax.update({disabled: fields.indexOf("personalTax") == -1});
+            LivingAllowanceInfoInfoDlg.socialSecurity.update({disabled: fields.indexOf("socialSecurity") == -1});
         }
     }
 }
@@ -348,9 +447,28 @@ LivingAllowanceInfoInfoDlg.afterSelectProvince = function () {
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/common/tool/findCityByProvinceSelect/code/" + province
+        "url": Feng.ctxPath + "/api/commonLocation/findCityByProvinceSelect/" + province
     });
 }
+
+LivingAllowanceInfoInfoDlg.introductionMethodChange = function () {
+    var introductionMethod = $("#introductionMethod").val();
+    if (Feng.isEmptyStr(introductionMethod)) {
+        $("#backJJBusinessTime,#firstInJJTime").val("");
+        $("#backJJBusinessTimeDiv,#firstInJJTimeDiv").css("display", "none");
+        return;
+    }
+    if (introductionMethod == 1) {
+        $("#backJJBusinessTime").val("");
+        $("#backJJBusinessTimeDiv").css("display", "none");
+        $("#firstInJJTimeDiv").css("display", "block");
+        return;
+    }
+    $("#firstInJJTime").val("");
+    $("#firstInJJTimeDiv").css("display", "none");
+    $("#backJJBusinessTimeDiv").css("display", "block");
+}
+
 /**
  * 加载县
  */
@@ -365,7 +483,7 @@ LivingAllowanceInfoInfoDlg.afterSelectCity = function () {
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/common/tool/findCountyByCitySelect/code/" + city
+        "url": Feng.ctxPath + "/api/commonLocation/findCountyByCitySelect/" + city
     });
 }
 
@@ -381,8 +499,14 @@ LivingAllowanceInfoInfoDlg.validId = function () {
 
 LivingAllowanceInfoInfoDlg.initTaxAndSocialSecurity = function () {
     var year = $("#year").val().substr(0, 4);
+    var nowYear = new Date().getFullYear();
+    var nowMonth = new Date().getMonth() + 1;
+    let maxMonth = 12;
+    if (year == nowYear) {
+        maxMonth = nowMonth;
+    }
     var data = new Array();
-    for (var i = 1; i <= 12; i++) {
+    for (var i = 1; i <= maxMonth; i++) {
         var month = year + "-" + (i < 10 ? "0" + i : i);
         data.push({name: month, value: month, selected: false, disabled: false});
     }
@@ -400,20 +524,20 @@ LivingAllowanceInfoInfoDlg.initTaxAndSocialSecurity = function () {
 function validUploadButton(type, row, fileId) {
     var files = $("#files").val();
     var checkState = $("#checkState").val();
-    if ((Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 2 && files.indexOf(row.id) != -1)) && $("#hand").val() != "select") {
+    if ((Feng.isEmptyStr(checkState) || checkState == 1 || (checkState == 10 && files.indexOf(row.id) != -1)) && $("#hand").val() != "select") {
         return type == 1 ?
-                "<button type='button' onclick=\"checkFile(this,'" + row.id + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
-                "<i class=\"fa fa-upload\"></i>上传" +
-                "</button>"
-                :
-                "<button type=\'button\' onclick=\"checkFile(this,'" + row.id + "','" + fileId + "')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
-                "<i class=\"fa fa-paste\"></i>修改" +
-                "</button>" +
-                "<button type='button' onclick=\"deleteFile('" + fileId + "','" + CONFIG.project_master_living_allowance + "')\" class=\"btn btn-xs btn-danger\">" +
-                "<i class=\"fa fa-times\"></i>删除" +
-                "</button>";
+            "<button type='button' onclick=\"checkFile(this,'" + row.id + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
+            "<i class=\"fa fa-upload\"></i>上传" +
+            "</button>"
+            :
+            // "<button type=\'button\' onclick=\"checkFile(this,'" + row.id + "','" + fileId + "')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
+            // "<i class=\"fa fa-paste\"></i>修改" +
+            // "</button>" +
+            "<button type='button' onclick=\"deleteFile('" + fileId + "','" + CONFIG.project_master_living_allowance + "')\" class=\"btn btn-xs btn-danger\">" +
+            "<i class=\"fa fa-times\"></i>删除" +
+            "</button>";
     } else {
-        return type == 1 ? "" : "";
+        return "";
     }
 }
 
@@ -422,34 +546,34 @@ function validUploadButton(type, row, fileId) {
  */
 function validateIsEdit() {
     var checkState = $("#checkState").val();
-    if (checkState != 0 && checkState != 2) {
-        Feng.error("您的申报正在审核中或已审核完成,无法操作");
-        return false;
+    if (checkState != 1 && checkState != 5 && checkState != 10) {
+        if (checkState == -1) {
+            Feng.error("您的申报审核不通过,无法再修改");
+            return false;
+        } else if (checkState >= 35) {
+            Feng.error("您的申报已审核通过,无法再修改");
+            return false;
+        } else {
+            Feng.error("您的申报正在审核中,请耐心等待");
+            return false;
+        }
     }
     return true;
 }
 
 $(function () {
     Feng.initValidatorTip("talentInfoForm", LivingAllowanceInfoInfoDlg.validateFields);
-    var hand = $("#hand").val();
     var id = $("#id").val();
-    var checkState = $("#checkState").val();
     //批量加载字典表数据
     var arr = [
         {"name": "nation", "code": "un_nation"},
         {"name": "nationality", "code": "un_nationality"},
         {"name": "politics", "code": "un_political"},
-        {"name": "highEducation", "code": "un_master_education"},
+        {"name": "declareType", "code": "un_master_education"},
+        {"name": "highEducation", "code": "un_education"},
         {"name": "introductionMode", "code": "un_introduction_mode"},
         {"name": "industryField", "code": "un_industryField"},
         {"name": "address", "code": "un_street"}];
-    if (hand == "select")
-        arr.push({"name": "talentType", "code": "un_jbt_talentType"});
-    if (hand == "update" && checkState != 0 && checkState != 2)
-        arr.push({
-            "name": "talentType",
-            "code": "un_jbt_talentType"
-        });
     Feng.findChildDictBatch(JSON.stringify(arr))
     //加载省份
     Feng.addAjaxSelect({
@@ -459,18 +583,8 @@ $(function () {
         "type": "GET",
         "url": Feng.ctxPath + "/api/commonLocation/getProvinceSelect"
     });
-    if (hand == 'add' || (hand == 'update' && (checkState == 0 || checkState == 2))) {
-        //加载人才标签
-        Feng.addAjaxSelect({
-            "id": "talentType",
-            "displayCode": "code",
-            "displayName": "name",
-            "type": "GET",
-            "url": Feng.ctxPath + "/api/talentInfo/findTalentTypeByEnterprise"
-        });
-    }
-    LivingAllowanceInfoInfoDlg.setNoChangeField();
     LivingAllowanceInfoInfoDlg.initTaxAndSocialSecurity();
+    LivingAllowanceInfoInfoDlg.setNoChangeField();
     //批量加载时间控件
     $(".date").each(function () {
         laydate.render({

+ 1 - 1
public/static/modular/master/livingAllowanceInfo/livingAllowanceInfo.js

@@ -1325,7 +1325,7 @@ $(function () {
         $(".chosen-container-single .chosen-single").css("padding", "4px 0px 0px 4px");
     });
     $("#enterpriseId").chosen({
-        search_contains: true,       //关键字模糊搜索。设置为true,只要选项包含搜索词就会显示;设置为false,则要求从选项开头开始匹配
+        search_contains: true,       //关键字模糊搜索。设置为true,只要选项包含搜索词就会显示;设置为false,则要求从选项开头开始匹配
         disable_search: false,
         width: "100%",
         enable_split_word_search: true