更新第二步布局

app/enterprise/view/talent/second.html

@@ -349,7 +349,7 @@
                                                 <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
                                             </div>
                                         </td>
-                                        <td rowspan="3" style="width: 200%">
+                                        <td rowspan="3" style="width: 300%">
                                             <table class="fileTable"></table>
                                         </td>
                                     </tr>
@@ -367,92 +367,125 @@
                                         </td>
                                     </tr>
                                 </table>
-                                <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="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>
-
-                                    <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.getLayerCatdByLayer()" 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="form-control" id="talent_arrange_category" name="talent_arrange_category" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange_category}"></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 class="rowGroup col-sm-3" {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
-                                        <label class="control-label spacing"><span style="color: red">*</span>年薪</label>
-                                        <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
-                                    </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" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" placeholder="XX银行" value="{$row.bank}"/>
-                                        </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="bank_number" name="bank_number" value="{$row.bank_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="bank_branch_name" name="bank_branch_name" placeholder="XX银行XX省XX市XX支行/分行/分理处" value="{$row.bank_branch_name}"/>
-                                        </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="bank_account" name="bank_account"  value="{$row.bank_account}"/>
-                                        </div>
-                                    </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 colspan="3">
+                                            <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="7" style="width: 100%">
+                                            <table class="fileTable"></table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="3">
+                                            <div class="rowGroup" {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>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="3">
+                                            <div class="rowGroup col-sm-6" {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-6" {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>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="3">
+                                            <div class="rowGroup col-sm-6 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-6 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>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="3">
+                                            <div class="rowGroup col-sm-6 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-6 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>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="3">
+                                            <div class="rowGroup col-sm-6">
+                                                <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
+                                                <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>
+                                            </div>
+                                            <div class="rowGroup col-sm-6">
+                                                <label class="control-label spacing"><span style="color: red">*</span>人才条款</label>
+                                                <select class="form-control" id="talent_arrange_category" name="talent_arrange_category" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange_category}"></select>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="3" style="overflow: inherit">
+                                            <div class="rowGroup col-sm-9">
+                                                <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}" style="width: 80%"></select>
+                                            </div>
+                                            <div class="rowGroup col-sm-12" {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
+                                                <label class="control-label spacing"><span style="color: red">*</span>年薪</label>
+                                                <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
+                                            </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"><span style="color: red">*</span>开户银行</label>
+                                                <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" placeholder="XX银行" value="{$row.bank}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
+                                                <input type="text" class="form-control" id="bank_number" name="bank_number" value="{$row.bank_number}"/>
+                                            </div>
+                                        </td>
+                                        <td rowspan="2" style="width: 200%">
+                                            <table class="fileTable"></table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
+                                                <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" placeholder="XX银行XX省XX市XX支行/分行/分理处" value="{$row.bank_branch_name}"/>
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <div class="rowGroup">
+                                                <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
                             </div>
                         </div>
                         </form>

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

@@ -29,7 +29,7 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
         {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
             formatter: function (value, row, index) {
                 if (value == null || value == '' || value == 'null') {
-                    return '无';
+                    return '';
                 }
                 return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
                         "<i class=\"fa fa-download\"></i>下载" +