Merge branch 'master' of http://59.57.98.130:3000/jjhc/report

app/admin/view/talent/talentInfo_base_check.html

@@ -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">
@@ -56,124 +68,161 @@
                     </div>
                     <div class="tab-content">
                         <div id="tab-1" class="tab-pane active">
-                            <div class="panel-body" >
+                            <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" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
-                                            <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="{$info.id}">
-                                                <input type="hidden" name="type" id="type" value="1">
-                                                <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
-                                                <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" id="name" name="name" value="{$info.name}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="card_type" name="cardType" value="{$info.card_type}">
-                                                                {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
-                                                                {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
-                                                                {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
-                                                            <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
-                                                        </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="sex" name="sex" value="{eq name='info.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" class="form-control" id="birthday" name="birthday" value="{$info.birthday}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
-                                                            <input class="form-control" id="province" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-sm-2">
-                                                        <img id="photoImg" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                    </div>
-                                                </div>
-                                                <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                    附件：
+                                        <input type="hidden" name="id" id="id" value="{$info.id}">
+                                        <input type="hidden" name="type" id="type" value="1">
+                                        <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                        <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" name="name" value="{$info.name}" />
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
+                                                        <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="5" style="width: 200%">
+                                                    <img id="photoImg" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <hr />
                                                     <table class="fileTable"></table>
-                                                </div>
-                                            </div>
-                                        </form>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
+                                                        {eq name="info.card_type" value="1"}<input class="form-control" id="card_type" name="cardType" value="身份证"/>{/eq}
+                                                        {eq name="info.card_type" value="2"}<input class="form-control" id="card_type" name="cardType" value="通行证"/>{/eq}
+                                                        {eq name="info.card_type" value="3}<input class="form-control" id="card_type" name="cardType" value="护照"/>{/eq}
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <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="{$info.card_number}">
+                                                    </div>
+                                                </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" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
+                                                    </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="birthday" name="birthday" value="{$info.birthday}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
+                                                        <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
+                                                        <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯</label>
+                                                        <input class="form-control" id="province" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
+                                                    </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="col-sm-12 form-group-sm">
-                                            <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>
+                                        <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="enterprise_tag" name="enterprise_tag" value="{$info.enterpriseTagName}" />
                                                     </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" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>所属街道</label>
+                                                </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" id="street" name="street" value="{$info.streetName}" />
                                                     </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" id="industry_field" name="industry_field" value="{$info.industryFieldName}">
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
-                                                        <select class="form-control" id="talent_type" name="talent_type" >
-                                                            <option value="" selected="true">{$info.talentTypeName}</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-9" id="tipsBlock">
-                                                        <label class=" control-label spacing">说明</label>
-                                                        {switch name="info.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}
+                                                </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" id="talent_type" name="talent_type" value="{$info.talentTypeName}" />
                                                     </div>
+                                                </td>
+                                                <td>
                                                     {if condition="in_array($info['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" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
+                                                    <div class="rowGroup">
+                                                        <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/}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                        <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
+                                                    <div class="rowGroup">
+                                                        <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>
                                                     {/if}
-                                                </div>
-                                            </div>
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                附件：
-                                                <table class="fileTable"></table>
-                                            </div>
-                                        </div>
+
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <div class="word-wrap" id="typeTips">
+                                                        {switch name="info.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">

app/admin/view/talent/talentInfo_common_check.html

@@ -40,6 +40,12 @@
     }
     .imgs li>div{float:left;}
     .info td{background:#f5f5f5 !important;}
+    .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">
@@ -167,12 +173,12 @@
                                                 </td>
                                                 <td>
                                                     {if condition="in_array($info['talent_type'],[1,2])"}
-                                                    <div class="rowGroup col-sm-3">
+                                                    <div class="rowGroup ">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
                                                         <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
                                                     </div>
                                                     {else/}
-                                                    <div class="rowGroup col-sm-3">
+                                                    <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
                                                         <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
                                                     </div>

app/enterprise/view/base/first.html

@@ -150,7 +150,6 @@
                                                         </select>
                                                     </div>
                                                 </td>
-
                                             </tr>
                                             <tr>
                                                 <td colspan="2">

app/enterprise/view/talent/second.html

@@ -244,7 +244,7 @@
                                                 <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
                                             </div>
                                         </td>
-                                        <td rowspan="3" style="width: 200%">
+                                        <td rowspan="3" style="width: 300%">
                                             <table class="fileTable"></table>
                                         </td>
                                     </tr>
@@ -335,87 +335,58 @@
                                         </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>
-
-                                    </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>
+                                <div class="row">
+                                    <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>
+                                    <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>
 
-                                    </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="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 fujian_highcert" style="display: none">
+                                        <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 fujian_highcert" style="display: none">
+                                        <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 quanzhou_highcert" style="display: none">
+                                        <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 quanzhou_highcert" style="display: none">
+                                        <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 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">

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

@@ -520,8 +520,8 @@ TalentInfoInfoDlg.changeStudyAbroad = function () {
 TalentInfoInfoDlg.sourceChange = function () {
     var source = $("#source").val();
     $("#source_batch").val("").parent().parent().parent().css("display", "none");
-    $("#fujian_highcert").css("display", "none");
-    $("#quanzhou_highcert").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");
@@ -535,7 +535,7 @@ TalentInfoInfoDlg.sourceChange = function () {
         case "1":
         case "3":
             $("#source_batch").parent().parent().parent().css("display", "block");
-            $("#fujian_highcert").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: '福建省高层次人才证书有效期不能为空'}}});
@@ -543,7 +543,7 @@ TalentInfoInfoDlg.sourceChange = function () {
         case "2":
         case "4":
             $("#source_batch").parent().parent().parent().css("display", "block");
-            $("#quanzhou_highcert").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: '泉州高层次人才证书有效期不能为空'}}});

public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -13,14 +13,17 @@ var TalentInfoInfoDlg = {
 TalentInfoInfoDlg.initFileTypeColumn = function () {
     return [
         {field: 'selectItem', checkbox: false, visible: false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "50%", '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%",
@@ -33,7 +36,6 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                         "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "32%", 'class': 'uitd_showTip'},
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
             formatter: function (value, row, index) {
                 return "";