提交模板修改（未完成）

app/enterprise/view/base/first.html

@@ -23,6 +23,9 @@
     .rowGroup{
         padding-bottom: 5px;
     }
+    .has-feedback label~.form-control-feedback{
+        top: 35px;
+    }
     .imgs>li{
         list-style: none;
         float: left;
@@ -76,13 +79,17 @@
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>姓名</label>
-                                                    <input type="text" class="form-control" id="name" name="name" value="{$row.name}" />
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>姓名</label>
+                                                        <input type="text" class="form-control" id="name" name="name" value="{$row.name}" />
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
-                                                    <select class="form-control" id="nation" name="nation" value='{$row.nation}'>
-                                                    </select>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
+                                                        <select class="form-control" id="nation" name="nation" value='{$row.nation}'>
+                                                        </select>
+                                                    </div>
                                                 </td>
                                                 <td rowspan="5" style="width: 200%">
                                                     <img id="photoImg" {if condition="$row['headimgurl']"} src="/storage/{$row.headimgurl}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click();" style="height:147px;width:105px;margin:0 auto;display:block;">
@@ -93,58 +100,70 @@
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
-                                                    <select class="form-control" id="card_type" name="card_type" value='{$row.card_type}'>
-                                                        <option value="">请选择</option>
-                                                        <option value="1">身份证</option>
-                                                        <option value="2">通行证</option>
-                                                        <option value="3">护照</option>
-                                                    </select>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
+                                                        <select class="form-control" id="card_type" name="card_type" value='{$row.card_type}'>
+                                                            <option value="">请选择</option>
+                                                            <option value="1">身份证</option>
+                                                            <option value="2">通行证</option>
+                                                            <option value="3">护照</option>
+                                                        </select>
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
-                                                    <input class="form-control" id="card_number" name="card_number" value='{$row.card_number}'>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
+                                                        <input class="form-control" id="card_number" name="card_number" value='{$row.card_number}'>
+                                                    </div>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><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 class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><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>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
-                                                    <input type="text" class="form-control date" id="birthday" name="birthday" value='{$row.birthday}'/>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
+                                                        <input type="text" class="form-control date" id="birthday" name="birthday" value='{$row.birthday}'/>
+                                                    </div>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
-                                                    <select class="form-control" id="politics" name="politics" value='{$row.politics}'>
-                                                    </select>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
+                                                        <select class="form-control" id="politics" name="politics" value='{$row.politics}'>
+                                                        </select>
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
-                                                    <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
-                                                    </select>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
+                                                        <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
+                                                        </select>
+                                                    </div>
                                                 </td>
 
                                             </tr>
                                             <tr>
                                                 <td colspan="2">
-                                                    <div class="rowGroup col-sm-3">
+                                                    <div class="rowGroup col-sm-4">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯省</label>
                                                         <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="province" name="province" value='{$row.province}'>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
+                                                    <div class="rowGroup col-sm-4">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯市</label>
                                                         <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="city" name="city" value='{$row.city}'></select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
+                                                    <div class="rowGroup col-sm-4">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯县</label>
                                                         <select class="form-control" id="county" name="county" value='{$row.county}'></select>
                                                     </div>
@@ -161,13 +180,17 @@
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                    <select class="form-control" id="enterprise_tag"  value="{$row.enterprise.enterpriseTag}" disabled="disabled">
-                                                    </select>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
+                                                        <select class="form-control" id="enterprise_tag"  value="{$row.enterprise.enterpriseTag}" disabled="disabled">
+                                                        </select>
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                    <input type="text" class="form-control" id="enterprise_name"  name="enterprise_name" readonly="readonly" value="{$row.enterprise.name}" />
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
+                                                        <input type="text" class="form-control" id="enterprise_name"  name="enterprise_name" readonly="readonly" value="{$row.enterprise.name}" />
+                                                    </div>
                                                 </td>
                                                 <td rowspan="4" style="width: 200%">
                                                     <table class="fileTable"></table>
@@ -175,37 +198,46 @@
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                    <select class="form-control" id="address" name="address" value="{$row.enterprise.street}" disabled="disabled"></select>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                                                        <select class="form-control" id="address" name="address" value="{$row.enterprise.street}" disabled="disabled"></select>
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                    <select type="text" class="form-control" id="industry_field" value="{$row.enterprise.industryFieldNew}" name="industry_field" disabled="disabled">
-                                                    </select>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                                                        <select type="text" class="form-control" id="industry_field" value="{$row.enterprise.industryFieldNew}" name="industry_field" disabled="disabled">
+                                                        </select>
+                                                    </div>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
-                                                    <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()">
-                                                        <option value="">请选择</option>
-                                                        {volist name="row.talent_type_list" id="item"}
-                                                        <option value="{$item.code}">{$item.name}</option>
-                                                        {/volist}
-                                                    </select>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
+                                                        <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()">
+                                                            <option value="">请选择</option>
+                                                            {volist name="row.talent_type_list" id="item"}
+                                                            <option value="{$item.code}">{$item.name}</option>
+                                                            {/volist}
+                                                        </select>
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    {if condition="in_array($info['talent_type'],[1,2])"}
-                                                    <div class="rowGroup col-sm-3">
+
+                                                    <div class="rowGroup " style="display: none">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
                                                         <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
                                                     </div>
-                                                    {else/}
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                    <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
-                                                    {/if}
+
+                                                    <div class="rowGroup" style="display: none">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                        <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
+                                                    </div>
+
                                                 </td>
                                             </tr>
+
                                             <tr>
                                                 <td colspan="2">
                                                     <label class=" control-label spacing td-label">说明</label>

app/enterprise/view/talent/second.html

@@ -1,6 +1,6 @@
 {extend name="layout/content"}
 {block name="content"}
-<style type="text/css">
+<style type="text/css" xmlns="http://www.w3.org/1999/html">
     .panel-heading{
         color:#333;
         background-color:#f5f5f5;
@@ -34,6 +34,18 @@
     }
     .imgs li>div{float:left;}
     .info td{background:#f5f5f5 !important;}
+    .table .td-label{
+        display: block;
+        text-align: left;
+        border-bottom: 1px solid #ccc;
+        margin-bottom: 10px;
+    }
+    .word-wrap{
+        width:100%;
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -43,26 +55,42 @@
                     <div class="tab-content">
                         <div id="tab-1" class="tab-pane active">
                             <form id="talentInfoForm" action="/enterprise/talent/second" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                <input type="hidden" name="id" id="id" value="{$row.id}">
+                                <input type="hidden" name="year" id="year" value="{$year}">
+                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
+                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
+                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
+                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
+                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
+                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
-                                        <div class="row">
-                                            <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="{$row.id}">
-                                                <input type="hidden" name="year" id="year" value="{$year}">
-                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
-                                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
-                                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
-                                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
-                                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
-                                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
-                                                <div class="col-sm-10">
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>姓名</label>
                                                         <input type="text" class="form-control" id="name" value="{$row.name}"  readonly disabled/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
+                                                        <input class="form-control" value="{$row.nationName}" readonly disabled id="nation"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="5" style="width: 200%">
+                                                    <img id="photoImg" src="{$row.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <hr />
+                                                    附件：
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
                                                         <select class="form-control" value="{$row.card_type}" readonly disabled  id="card_type">
                                                             <option value="">请选择</option>
                                                             <option value="1" {eq name="row.card_type" value="1"} selected="" {/eq}>身份证</option>
@@ -70,235 +98,324 @@
                                                             <option value="3" {eq name="row.card_type" value="3"} selected="" {/eq}>护照</option>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
                                                         <input class="form-control" value="{$row.card_number}" readonly disabled  id="card_number">
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>性别</label>
                                                         <input type="text" class="form-control" value="{eq name='info.sex' value='1'}男{else/}女{/eq}"  readonly disabled  id="sex"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
                                                         <input type="text" class="form-control" value="{$row.birthday}" readonly disabled  id="birthday"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
                                                         <input class="form-control" value="{$row.politicsName}" readonly disabled  id="politics"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                        <input class="form-control" value="{$row.nationName}" readonly disabled id="nation"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
                                                         <input class="form-control" value="{$row.nationalityName}" readonly disabled id="nationality">
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <div class="rowGroup">
                                                         <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
                                                         <input class="form-control" value="{$row.provinceName}{$row.cityName}{$row.countyName}" readonly disabled id="province"/>
                                                     </div>
-                                                </div>
-                                                <div class="col-sm-2">
-                                                    <img id="photoImg" src="{$row.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                            上传附件：                                      
-                                            <table class="fileTable"></table>
-                                        </div>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </div>
                                 </div>
                         </div>
                         <div class="panel panel-default">
                             <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
                             <div class="panel-body">
-                                <div class="row">
-                                    <div class="col-sm-10 form-group-sm">
-                                        <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}"  readonly disabled id="enterprise"/>
-                                        </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.enterpriseTagName}"  readonly disabled id="enterprise_tag"/>
-                                        </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.streetName}"  readonly disabled id="street"/>
-                                        </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.industryFieldName}" readonly disabled id="industry_field">
-                                        </div>
-                                        <div class="rowGroup col-sm-3">
-                                            <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
-                                            <select class="form-control" readonly disabled id="talent_type">
-                                                <option value="" selected="true">{$row.talentTypeName}</option>
-                                            </select>
-                                        </div>
-                                        <div class="rowGroup col-sm-9" id="tipsBlock">
-                                            <label class=" control-label spacing">说明</label>
-                                            {switch name="row.talent_type"}
-                                            {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
-                                            {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
-                                            {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
-                                            {/switch}
-                                        </div>
-                                        {if condition="in_array($row['talent_type'],[1,2])"}
-                                        <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.tax_insurance_month}"  readonly disabled id="tax_insurance_month"/>
-                                        </div>
-                                        {else/}
-                                        <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.labor_contract_rangetime}"  readonly disabled id="labor_contract_rangetime"/>
-                                        </div>
-                                        {/if}
-                                    </div>
-                                </div>
-                                <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                    上传附件：                                      
-                                    <table class="fileTable"></table>
-                                </div>
+                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
+                                                <input type="text" class="form-control" value="{$row.enterpriseTagName}"  readonly disabled id="enterprise_tag"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
+                                                <input type="text" class="form-control" value="{$row.enterpriseName}"  readonly disabled id="enterprise"/>
+                                            </div>
+                                        </td>
+                                        <td rowspan="4" style="width: 200%">
+                                            <table class="fileTable"></table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                                                <input type="text" class="form-control" value="{$row.streetName}"  readonly disabled id="street"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                                                <input type="text" class="form-control" value="{$row.industryFieldName}" readonly disabled id="industry_field">
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
+                                                <select class="form-control" readonly disabled id="talent_type">
+                                                    <option value="" selected="true">{$row.talentTypeName}</option>
+                                                </select>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            {if condition="in_array($row['talent_type'],[1,2])"}
+                                            <div class="rowGroup ">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                <input type="text" class="form-control" value="{$row.tax_insurance_month}"  readonly disabled id="tax_insurance_month"/>
+                                            </div>
+                                            {else/}
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                <input type="text" class="form-control" value="{$row.labor_contract_rangetime}"  readonly disabled id="labor_contract_rangetime"/>
+                                            </div>
+                                            {/if}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2">
+                                            <label class=" control-label spacing td-label">说明</label>
+                                            <div class="word-wrap" id="typeTips">
+                                                {switch name="row.talent_type"}
+                                                {case value="1"}含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
+                                                {case value="2"}含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。{/case}
+                                                {case value="3"}含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。{/case}
+                                                {/switch}
+                                            </div>
+
+                                        </td>
+                                    </tr>
+
+                                </table>
                             </div>
                         </div>
                         <div class="panel panel-default">
                             <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
                             <div class="panel-body">
-                                <div class="row">
-                                    <div class="col-sm-10">                          
-                                        <div class="rowGroup col-sm-3">
-                                            <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
-                                            <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}" readonly disabled>
-                                        </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="fst_work_time" name="fst_work_time" value="{$row.fst_work_time}"/>
-                                        </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" value="{$row.phone}"/>
-                                        </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"  value="{$row.email}"/>
-                                        </div>
-                                        <div class="rowGroup col-sm-3">
-                                            <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                            <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></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="graduate_school" name="graduate_school" value="{$row.graduate_school}">
-                                        </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" value="{$row.major}"/>
-                                        </div>
-                                        <div class="rowGroup col-sm-3">
-                                            <label class="control-label spacing">是否有留学经历</label>
-                                            <select class="form-control" id="study_abroad" name="study_abroad" onchange="TalentInfoInfoDlg.changeStudyAbroad()" autocomplete='off'>
-                                                <option value="2" {eq name='row.study_abroad' value='2'}selected="selected"{/eq}>否</option>
-                                                <option value="1" {eq name='row.study_abroad' value='1'}selected="selected"{/eq}>是</option>
-                                            </select>
-                                        </div>
-                                        <div class="rowGroup col-sm-3 abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                            <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
-                                            <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
-                                        </div>
-                                        <div class="rowGroup col-sm-3 abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                            <label class="control-label spacing"><span style="color: red">*</span>专业</label>
-                                            <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
-                                        </div>
-                                    </div>
-                                </div>                                
-                                <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                    上传附件：                                      
-                                    <table class="fileTable"></table>
-                                </div>
-                                <div class="row">
-                                    <div class="col-sm-10">
-                                        <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="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
-                                        </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="position" name="position" value="{$row.position}"/>
-                                        </div>
-                                        <div class="rowGroup col-sm-3">
-                                            <label class="control-label spacing">专业技术职称</label>
-                                            <input type="text" class="form-control" id="professional" name="professional" value="{$row.professional}"/>
-                                        </div>
-                                    </div>
-                                </div>                        
-                                <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                    上传附件：                                      
-                                    <table class="fileTable"></table>
-                                </div>
-                                <div class="row">
-                                    <div class="col-sm-10">
-                                        <div class="rowGroup col-sm-3">
-                                            <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
-                                            <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式" value="{$row.import_way}">
-                                            </select>
-                                        </div>   
-                                        <div class="rowGroup col-sm-3">
-                                            <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
-                                            <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="{$row.source}">
-                                            </select>
-                                        </div>
+                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>申报年度</label>
+                                                <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}" readonly disabled>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
+                                                <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
+                                                <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
+                                            </div>
+                                        </td>
+                                        <td rowspan="3" style="width: 200%">
+                                            <table class="fileTable"></table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
+                                                <input type="hidden" id="talent_edu" />
+                                                <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
+                                                <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
+                                                <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label">是否有留学经历</label>
+                                                <select class="form-control" id="study_abroad" name="study_abroad" onchange="TalentInfoInfoDlg.changeStudyAbroad()" autocomplete='off'>
+                                                    <option value="2" {eq name='row.study_abroad' value='2'}selected="selected"{/eq}>否</option>
+                                                    <option value="1" {eq name='row.study_abroad' value='1'}selected="selected"{/eq}>是</option>
+                                                </select>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
+                                                <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
+                                                <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
+                                                <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式" value="{$row.import_way}">
+                                                </select>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>首次来晋工作时间</label>
+                                                <input type="text" class="form-control date" id="fst_work_time" name="fst_work_time" value="{$row.fst_work_time}"/>
+                                            </div>
+                                        </td>
+                                        <td rowspan="3" style="width: 200%">
+                                            <table class="fileTable"></table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
+                                                <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
+                                                <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2">
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label">专业技术职称</label>
+                                                <input type="text" class="form-control" id="professional" name="professional" value="{$row.professional}"/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
+                                                <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="{$row.source}">
+                                                </select>
+                                            </div>
+                                        </td>
+                                        <td rowspan="2"  style="width: 200%">
+                                            <table class="fileTable"></table>
+                                        </td>
+                                    </tr>
+                                    <tr {if condition="!$row['source_batch']"}style="display:none;"{/if}>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label" ><span style="color: red">*</span>入选名单批次</label>
+                                                <input type="text" class="form-control" id="source_batch" name="source_batch" value="{$row.source_batch}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup" {if condition="!$row['source_city']"}style="display:none;"{/if}>
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>入选来源地级市</label>
+                                                <select class="form-control" id="source_city" name="source_city" value="{$row['source_city']}">
+                                                    <option value="">{$row.sourceCityName}</option>
+                                                </select>
+                                            </div>
+                                            <div class="rowGroup" {if condition="!$row['source_county']"}style="display:none;"{/if}>
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>入选来源县市区</label>
+                                                <select class="form-control" id="source_county" name="source_county" value="{$row['source_county']}">
+                                                    <option value="">{$row.sourceCountyName}</option>
+                                                </select>
+                                            </div>
+                                        </td>
 
+                                    </tr>
+                                    <tr id="fujian_highcert" style="display: none">
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
+                                                <input type="text" class="form-control date" id="fujian_highcert_pubtime" name="fujian_highcert_pubtime" value="{$row.fujian_highcert_pubtime}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup" >
+                                                <label class=" control-label spacing td-label" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
+                                                <input type="text" class="form-control date" id="fujian_highcert_exptime" name="fujian_highcert_exptime" value="{$row.fujian_highcert_exptime}"/>
+                                            </div>
+                                        </td>
 
-                                        <div class="rowGroup col-sm-3" {if condition="!$row['source_city']"}style="display:none;"{/if}>
-                                            <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
-                                            <select class="form-control" id="source_city" name="source_city" value="{$row['source_city']}">
-                                                <option value="">{$row.sourceCityName}</option>
-                                            </select>
-                                        </div>
-                                        <div class="rowGroup col-sm-3" {if condition="!$row['source_county']"}style="display:none;"{/if}>
-                                            <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
-                                            <select class="form-control" id="source_county" name="source_county" value="{$row['source_county']}">
-                                                <option value="">{$row.sourceCountyName}</option>
-                                            </select>
-                                        </div>                                              
-                                        <div class="rowGroup col-sm-3" {if condition="!$row['source_batch']"}style="display:none;"{/if}>
-                                            <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
-                                            <input type="text" class="form-control" id="source_batch" name="source_batch" value="{$row.source_batch}"/>
-                                        </div>                                       
-                                        <div class="rowGroup col-sm-3" {if condition="!$row['fujian_highcert_pubtime']"}style="display:none;"{/if}>
-                                            <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
-                                            <input type="text" class="form-control date" id="fujian_highcert_pubtime" name="fujian_highcert_pubtime" value="{$row.fujian_highcert_pubtime}"/>
-                                        </div>                                      
-                                        <div class="rowGroup col-sm-3" {if condition="!$row['fujian_highcert_exptime']"}style="display:none;"{/if}>
-                                            <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
-                                            <input type="text" class="form-control date" id="fujian_highcert_exptime" name="fujian_highcert_exptime" value="{$row.fujian_highcert_exptime}"/>
-                                        </div>
-                                        <div class="rowGroup col-sm-3" {if condition="!$row['quanzhou_highcert_pubtime']"}style="display:none;"{/if}>
-                                            <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
-                                            <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" name="quanzhou_highcert_pubtime" value="{$row.quanzhou_highcert_pubtime}"/>
-                                        </div>
-                                        <div class="rowGroup col-sm-3" {if condition="!$row['quanzhou_highcert_exptime']"}style="display:none;"{/if}>
-                                            <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
-                                            <input type="text" class="form-control date" id="quanzhou_highcert_exptime" name="quanzhou_highcert_exptime" value="{$row.quanzhou_highcert_exptime}"/>
-                                        </div>
-                                        <div class="rowGroup col-sm-3">
-                                            <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                            <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange}"></select>
-                                        </div>
-                                        <div class="rowGroup col-sm-3">
-                                            <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                            <select class="chosen" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.getIdentifyNeedsFileTypes()" value="{$row.talent_condition}"></select>
-                                        </div>
-                                    </div>
-                                </div>                        
-                                <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                    上传附件：                                      
-                                    <table class="fileTable"></table>
-                                </div>
+                                    </tr>
+                                    <tr id="quanzhou_highcert"  style="display: none">
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class=" control-label spacing td-label" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
+                                                <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" name="quanzhou_highcert_pubtime" value="{$row.quanzhou_highcert_pubtime}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup" >
+                                                <label class=" control-label spacing td-label" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
+                                                <input type="text" class="form-control date" id="quanzhou_highcert_exptime" name="quanzhou_highcert_exptime" value="{$row.quanzhou_highcert_exptime}"/>
+                                            </div>
+                                        </td>
+
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>人才层次</label>
+                                                <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange}"></select>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing td-label"><span style="color: red">*</span>认定条件</label>
+                                                <select class="chosen" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.getIdentifyNeedsFileTypes()" value="{$row.talent_condition}"></select>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
                                 <div class="row">
                                     <div class="col-sm-10">
                                         <div class="rowGroup col-sm-3">

public/static/modular/gate/talentBase/talentInfo_info.js

@@ -376,7 +376,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
         case "1":
             $("#tipsBlock").css('display', 'block');
             $("#typeTips").html("含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。");
-            $("#material_name").html("社保或个税的缴交记录");
+            $("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料");
             $("#tax_insurance_month").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
@@ -387,7 +387,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
         case "2":
             $("#tipsBlock").css('display', 'block');
             $("#typeTips").html("含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
-            $("#material_name").html("社保或个税的缴交记录");
+            $("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料与来我市前工作情况证明，例如原工作单位出具的工作证明、离职证明或原创（领）办企业的营业执照复印件、经市场监管部门备案的公司章程复印件等证明材料");
             $("#tax_insurance_month").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
@@ -398,7 +398,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
         case "3":
             $("#tipsBlock").css('display', 'block');
             $("#typeTips").html("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。")
-            $("#material_name").html("社保或个税的缴交记录");
+            $("#desc_talent_type").html("请先提供意向合作协议（合同）或企业名称预先核准材料，落地我市后再补齐上述材料");
             $("#labor_contract_rangetime").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
             break;
@@ -485,7 +485,7 @@ TalentInfoInfoDlg._initFileTypeColumn = function () {
                 if (row.must == 2) {
                     str = str + '<i class="fa fa-paste"></i>' + value;
                 }
-                str = str + '<br />' + row.description + '</div>'
+                str = str + '<br /><span id="desc_'+row.rel+'">' + row.description + '</span></div>'
                 return str;
             }
         },
@@ -520,6 +520,7 @@ TalentInfoInfoDlg.initFile = function () {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
                 var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
+                data["rows"][k].rel = rel;
                 data["rows"][k].tableIndex = tableIndex;
                 data["rows"][k].trIndex = datas[tableIndex].length;
                 datas[tableIndex].push(data["rows"][k]);

public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -235,14 +235,17 @@ TalentInfoInfoDlg.validate = function () {
 TalentInfoInfoDlg.initFileTypeColumn = function () {
     return [
         {field: 'selectItem', checkbox: false, visible: false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+        {title: '名称', field: 'name', visible: true, align: 'left', valign: 'middle', width: "82%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
+                let str = '<div class="word-wrap">';
                 if (row.must == 1) {
-                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                    str = str + '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
                 }
                 if (row.must == 2) {
-                    return '<i class="fa fa-paste"></i>' + value;
+                    str = str + '<i class="fa fa-paste"></i>' + value;
                 }
+                str = str + '<br /><span id="desc_'+row.rel+'">' + row.description + '</span></div>'
+                return str;
             }
         },
         {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
@@ -255,7 +258,6 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                         "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
             formatter: function (value, row, index) {
                 return row.step == 1 ? "" : TalentInfoInfoDlg.validUploadButton(1, value, '', row.tableIndex, row.trIndex);
@@ -275,8 +277,9 @@ TalentInfoInfoDlg.initFileTable = function () {
         }
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
+            console.log(rel)
             if ($("#" + rel).length > 0) {
-                if(rel == 'card_number' || rel == 'name'){
+                if(rel == 'card_number' || rel == 'name' || rel == 'talent_type' || rel == 'talent_edu' || rel=='fst_work_time'){
                     var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
                 }else{
                     var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
@@ -516,11 +519,9 @@ TalentInfoInfoDlg.changeStudyAbroad = function () {
 
 TalentInfoInfoDlg.sourceChange = function () {
     var source = $("#source").val();
-    $("#source_batch").val("").parent().css("display", "none");
-    $("#fujian_highcert_pubtime").val("").parent().css("display", "none");
-    $("#fujian_highcert_exptime").val("").parent().css("display", "none");
-    $("#quanzhou_highcert_pubtime").val("").parent().css("display", "none");
-    $("#quanzhou_highcert_exptime").val("").parent().css("display", "none");
+    $("#source_batch").val("").parent().parent().parent().css("display", "none");
+    $("#fujian_highcert").css("display", "none");
+    $("#quanzhou_highcert").css("display", "none");
     $("#source_city").val("").parent().css("display", "none");
     $("#source_county").val("").parent().css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "source_batch");
@@ -533,18 +534,16 @@ TalentInfoInfoDlg.sourceChange = function () {
     switch (source) {
         case "1":
         case "3":
-            $("#source_batch").parent().css("display", "block");
-            $("#fujian_highcert_pubtime").parent().css("display", "block");
-            $("#fujian_highcert_exptime").parent().css("display", "block");
+            $("#source_batch").parent().parent().parent().css("display", "block");
+            $("#fujian_highcert").css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "fujian_highcert_pubtime", {validators: {notEmpty: {message: '福建省高层次人才证书发证日期不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "fujian_highcert_exptime", {validators: {notEmpty: {message: '福建省高层次人才证书有效期不能为空'}}});
             break;
         case "2":
         case "4":
-            $("#source_batch").parent().css("display", "block");
-            $("#quanzhou_highcert_pubtime").parent().css("display", "block");
-            $("#quanzhou_highcert_exptime").parent().css("display", "block");
+            $("#source_batch").parent().parent().parent().css("display", "block");
+            $("#quanzhou_highcert").css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "quanzhou_highcert_pubtime", {validators: {notEmpty: {message: '泉州高层次人才证书发证日期不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "quanzhou_highcert_exptime", {validators: {notEmpty: {message: '泉州高层次人才证书有效期不能为空'}}});