sugangqiang 2 年之前
父節點
當前提交
bf5b8d63e1

+ 23 - 43
app/admin/view/talent/talentInfo_base_check.html

@@ -11,7 +11,7 @@
         padding-right:4px;
         padding-left: 4px;
     }
-    #talentInfoForm label {
+    .panel label {
         font-size: xx-small;
     }
     .has-feedback .form-control {
@@ -189,6 +189,14 @@
                                                     </div>
                                                 </td>
                                                 <td>
+                                                    <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>
@@ -196,7 +204,7 @@
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup ">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 1"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
                                                         <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
                                                     </div>
                                                 </td>
@@ -206,58 +214,33 @@
                                                         <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
                                                     </div>
                                                 </td>
-                                            </tr>
-                                            {else/}
+                                            </tr>                         
+                                            {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
                                             <tr>
-                                                <td >
+                                                <td>
                                                     <div class="rowGroup">
-                                                        预引进类型
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
+                                                        <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
                                                     </div>
                                                 </td>
+                                            </tr> 
+                                            {/if}
+                                            {/if}
+                                            {if condition="in_array($info['talent_type'],[3])"}
+                                            <tr>
                                                 <td >
                                                     <div class="rowGroup">
-                                                        {if condition="$info['pre_import_type']==1"}意向合同{else/}创业企业名称预核准{/if}
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {/if}                                  
-                                            {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
-                                            <tr>
-                                                <td>
-                                                    <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>
-                                                <td>
+                                                <td >
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
-                                                        <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
+                                                        {if condition="$info['pre_import_type']==1"}意向合同{else/}创业企业名称预核准{/if}
                                                     </div>
                                                 </td>
                                             </tr>
-                                            {else/}
-                                            <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>    
                                             {/if}
                                         </table>
-
                                     </div>
                                     <div class="panel-body">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
@@ -285,9 +268,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div id="tab-2" class="tab-pane ">
-                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
-                        </div>
                     </div>
                 </div>
             </div>

+ 391 - 376
app/admin/view/talent/talentInfo_common_check.html

@@ -11,7 +11,7 @@
         padding-right:4px;
         padding-left: 4px;
     }
-    #talentInfoForm label {
+    .panel label {
         font-size: xx-small;
     }
     .has-feedback .form-control {
@@ -65,7 +65,7 @@
                         <div id="tab-1" class="tab-pane active">
                             <div class="panel-body" >
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">个人信息</div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
                                         <input type="hidden" name="id" id="id" value="{$info.id}">
                                         <input type="hidden" name="type" id="type" value="1">
@@ -74,15 +74,19 @@
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
-                                                    <label class="control-label spacing td-label">姓名</label>
-                                                    <input type="text" class="form-control" id="name" name="name" value="{$info.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" value="{$info.name}"/>
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    <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 class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
+                                                        <input class="form-control" value="{$info.nationName}" id="nation"/>
+                                                    </div>
                                                 </td>
                                                 <td rowspan="5" style="width: 200%">
-                                                    <img id="photoImg" onclick="Feng.showImg(this)" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <img id="photoImg" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
                                                     <hr />
                                                     附件:
                                                     <table class="fileTable"></table>
@@ -90,428 +94,439 @@
                                             </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="{$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 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="{$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>
                                                 </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="{$info.card_number}">
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件号码</span></label>
+                                                        <input class="form-control" value="{$info.card_number}" id="card_number">
+                                                    </div>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <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 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>
                                                 </td>
                                                 <td>
-                                                    <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 class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
+                                                        <input type="text" class="form-control" value="{$info.birthday}" readonly disabled  id="birthday"/>
+                                                    </div>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <td>
-                                                    <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 class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
+                                                        <input class="form-control" value="{$info.politicsName}" id="politics"/>
+                                                    </div>
                                                 </td>
                                                 <td>
-                                                    <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 class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
+                                                        <input class="form-control" value="{$info.nationalityName}" id="nationality">
+                                                    </div>
                                                 </td>
-
                                             </tr>
                                             <tr>
                                                 <td colspan="2">
-                                                    <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 class="rowGroup">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                        <input class="form-control" value="{$info.provinceName}{$info.cityName}{$info.countyName}" id="province"/>
+                                                    </div>
                                                 </td>
                                             </tr>
-
                                         </table>
                                     </div>
                                 </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
-                                    <div class="panel-body">
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
+                            </div>
+                            <div class="panel panel-default">
+                                <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
+                                <div class="panel-body">
+                                    <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}" />
-                                                </td>
-                                                <td>
+                                                    <div class="form-control" style="border: none">{$info.enterpriseTagName}</div>
+                                                </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="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
-                                                </td>
-                                                <td rowspan="5" style="width: 200%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
+                                                    <div class="form-control" style="border: none">{$info.enterpriseName}</div>
+                                                </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" id="street" name="street" value="{$info.streetName}" />
-                                                </td>
-                                                <td>
+                                                    <div class="form-control" style="border: none">{$info.streetName}</div>
+                                                </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="industry_field" name="industry_field" value="{$info.industryFieldName}">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
+                                                    <div class="form-control" style="border: none">{$info.industryFieldName}</div>
+                                                </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_type" name="talent_type" data-value="{$info.talent_type}">
+                                                    <select class="form-control" id="talent_type" data-value="{$info.talent_type}">
                                                         <option value="" selected="true">{$info.talentTypeName}</option>
                                                     </select>
-                                                </td>
-                                                <td>
-
-                                                </td>
-                                            </tr>
-                                            {if condition="in_array($info['talent_type'],[1,2])"}
-                                            <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="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
-                                                    </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="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {else/}
-                                            <tr>
-                                                <td >
-                                                    <div class="rowGroup">
-                                                        预引进类型
-                                                    </div>
-                                                </td>
-                                                <td >
-                                                    <div class="rowGroup">
-                                                        {if condition="$info['pre_import_type']==1"}意向合同{else/}创业企业名称预核准{/if}
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {/if}                                        
-                                            {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
-                                            <tr>
-                                                <td>
-                                                    <label class=" control-label spacing td-label">说明</label>
-                                                    <div style="width:100%;white-space:normal;word-wrap:break-word;word-break:break-all; ">
-                                                        {switch name="info.talent_type"}
-                                                        {case value="1"}含经晋江市认定且还在晋江市就业创业的人才,或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
-                                                        {case value="2"}含本办法出台后首次从晋江市以外引进认定的人才,或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。{/case}
-                                                        {case value="3"}含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议(合同)的人才,或拟来我市创业且提交企业名称预先核准的人才。{/case}
-                                                        {/switch}
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
-                                                        <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {else/}
-                                            <tr>
-                                                <td colspan="2">
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup">
                                                     <label class=" control-label spacing td-label">说明</label>
-                                                    <div style="width:100%;white-space:normal;word-wrap:break-word;word-break:break-all; ">
+                                                    <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>
-                                            {/if}
-                                        </table>
-                                    </div> 
-                                    <div class="panel-body">
-                                        <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>
-                                                        <textarea class="form-control" style="border: none" placeholder="填写工作简历">{$info.experience}</textarea>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
-                                                        <textarea class="form-control" style="border: none" placeholder="填写教育背景">{$info.education}</textarea>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </div>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {if condition="in_array($info['talent_type'],[1,2])"}
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup ">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 1"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
+                                                    <input type="text" class="form-control" value="{$info.tax_insurance_month}" id="tax_insurance_month"/>
+                                                </div>
+                                                <div class="rowGroup">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                    <input type="text" class="form-control" value="{$info.labor_contract_rangetime}" id="labor_contract_rangetime"/>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>{if condition="$info['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
+                                                    <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {/if}
+                                        {/if}
+                                        {if condition="in_array($info['talent_type'],[3])"}
+                                        <tr class="talentType3">
+                                            <td >
+                                                <div class="rowGroup">
+                                                    预引进类型
+                                                </div>
+                                            </td>
+                                            <td >
+                                                <div class="rowGroup">
+                                                    <input type="text" class="form-control" name="pre_import_type" id="pre_import_type" value="{if condition="$info['pre_import_type']==1"}意向合同{else/}创业企业名称预核准{/if}">
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {/if}
+                                    </table>
                                 </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
-                                    <div class="panel-body">
-                                        <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="{$info.apply_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" value="{$info.phone}" maxlength="11"/>
-                                                    </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" value="{$info.email}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 300%">
-                                                    <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="highest_degree" name="highest_degree" value="{$info.highestDegreeName}">
-                                                    </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" value="{$info.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" value="{$info.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">是否有留学经历</label>
-                                                        <input type="text" class="form-control" id="study_abroad" name="study_abroad" value="{eq name='study_abroad' value='2'}否{else/}是{/eq}"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    {if condition="$info['abroad_school']"}
-                                                    <div class="rowGroup abroad_need_this">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
-                                                        <input type="text" class="form-control" id="abroad_school" value="{$info.abroad_school}" maxlength="11"/>
-                                                    </div>
-                                                    {/if}
-                                                </td>
-                                                <td>
-                                                    {if condition="$info['abroad_major']"}
-                                                    <div class="rowGroup abroad_need_this">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
-                                                        <input type="text" class="form-control" id="abroad_major" value="{$info.abroad_major}" maxlength="11"/>
-                                                    </div>
-                                                    {/if}
-                                                </td>
-                                                <td rowspan="3" style="width: 300%">
-                                                    <table class="fileTable"></table>
-                                                </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>
-                                                        <input type="text" class="form-control date" id="import_way" name="import_way" value="{$info.importWayName}"/>
-                                                    </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="cur_entry_time" value="{$info.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" value="{$info.position}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 200%">
-                                                    <table class="fileTable"></table>
-                                                </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">专业技术职称</label>
-                                                        <input type="text" class="form-control" id="professional" value="{$info.professional}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 100%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <div class="col-sm-12 form-group-sm">
-
-
-                                            <div class="row">
-                                                <div class="col-sm-10">
+                                <div class="panel-body">
+                                    <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>
+                                                    <textarea class="form-control" style="border: none">{$info.experience}</textarea>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
+                                                    <textarea class="form-control" style="border: none">{$info.education}</textarea>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </div>
+                            <div class="panel panel-default">
+                                <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
+                                <div class="panel-body">
+                                    <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="{$info.apply_year}">
+                                                </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="{$info.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="{$info.email}"/>
+                                                </div>
+                                            </td>
+                                            <td rowspan="3" style="width: 300%">
+                                                <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" id="highest_degree" name="highest_degree" value="{$info.highest_degree}">
+                                                        <option value="" selected="true">{$info.highestDegreeName}</option>
+                                                    </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="{$info.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="{$info.major}"/>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <table style="width: 100%;border-collapse: collapse;border:1px solid #ddd;border-left:none;border-right:none;" class="table table-bordered">                                    
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class="control-label spacing td-label">是否有留学经历</label>
+                                                    <input type="text" class="form-control" id="study_abroad" name="study_abroad" value="{eq name='info.study_abroad' value='2'}否{else/}是{/eq}"/>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["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="{$info.abroad_school}"/>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["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="{$info.abroad_major}"/>
+                                                </div>
+                                            </td>
+                                            <td rowspan="3" style="width: 300%">
+                                                <table class="fileTable"></table>
+                                            </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>
+                                                    <input type="text" class="form-control date" id="import_way" name="import_way" value="{$info.importWayName}"/>
+                                                    </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="cur_entry_time" name="cur_entry_time" value="{$info.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="{$info.position}"/>
+                                                </div>
+                                            </td>
+                                            <td rowspan="3" style="width: 300%">
+                                                <table class="fileTable"></table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class="control-label spacing">职称技术资格</label>
+                                                    <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$info.pro_qua}"/>
+                                                </div>
+                                            </td>
+                                            <td rowspan="3" style="width: 100%">
+                                                <table class="fileTable"></table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class="control-label spacing">专业技术职称</label>
+                                                    <input type="text" class="form-control" id="professional" name="professional" value="{$info.professional}"/>
+                                                </div>
+                                            </td>
+                                            <td rowspan="3" style="width: 100%">
+                                                <table class="fileTable"></table>
+                                            </td>
+                                        </tr>
+                                    </table>
 
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
-                                                        <select class="form-control" id="source" >
-                                                            <option value="">{$info.sourceName}</option>
-                                                        </select>
-                                                    </div>
-                                                    {if condition="$info['source_city']"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
-                                                        <select class="form-control" id="source_city" name="source_city">
-                                                            <option value="">{$info.sourceCityName}</option>
-                                                        </select>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$info['source_county']"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
-                                                        <select class="form-control" id="source_county" name="source_county">
-                                                            <option value="">{$info.sourceCountyName}</option>
-                                                        </select>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$info['source_batch']"}                                                
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单的文件号及批次</label>
-                                                        <input type="text" class="form-control" id="source_batch" value="{$info.source_batch}"/>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$info['fujian_highcert_pubtime']"}                                                
-                                                    <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="fujian_highcert_pubtime" value="{$info.fujian_highcert_pubtime}"/>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$info['fujian_highcert_exptime']"}                                                
-                                                    <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="fujian_highcert_exptime" value="{$info.fujian_highcert_exptime}"/>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$info['quanzhou_highcert_pubtime']"}    
-                                                    <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="quanzhou_highcert_pubtime" value="{$info.quanzhou_highcert_pubtime}"/>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$info['quanzhou_highcert_exptime']"}    
-                                                    <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="quanzhou_highcert_exptime" value="{$info.quanzhou_highcert_exptime}"/>
-                                                    </div>
-                                                    {/if}
-                                                    <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">
-                                                            <option value="">{$info.talentArrangeName}</option>
-                                                        </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">
-                                                            <option value="">{$info.talentArrangeCatName}</option>
-                                                        </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_condition">
-                                                            <option value="{$info.talent_condition}">{$info.talentConditionName}</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3" {if condition='!$info["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" value="{$info.annual_salary}"/>
-                                                    </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" >
+                                                        <option value="">{$info.sourceName}</option>
+                                                    </select>
+                                                    </select>
                                                 </div>
-                                            </div>                    
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                上传附件:                                      
+                                            </td>
+                                            <td rowspan="7" style="width: 100%">
                                                 <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="" id="bank" value="{$info.bank}" placeholder="XX银行"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                        <input type="text" class="form-control" id="bank_number" value="{$info.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" value="{$info.bank_branch_name}" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                        <input type="text" class="form-control" id="bank_account" value="{$info.bank_account}" />
-                                                    </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="3">
+                                                <div class="rowGroup" {if condition="!$info['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="{$info.source_batch}"/>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="3">
+                                                <div class="rowGroup col-sm-6" {if condition="!$info['source_city']"}style="display:none;"{/if}>
+                                                     <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                    <input type="text" class="form-control" id="source_city" name="source_city" value="{$info.sourceCityName}"/>
+                                                </div>
+                                                <div class="rowGroup col-sm-6" {if condition="!$info['source_county']"}style="display:none;"{/if}>
+                                                     <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                    <input type="text" class="form-control" id="source_county" name="source_county" value="{$info.sourceCountyName}"/>
+                                                </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="{$info.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="{$info.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="{$info.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="{$info.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">
+                                                        <option value="">{$info.talentArrangeName}</option>
+                                                    </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">
+                                                        <option value="">{$info.talentArrangeCatName}</option>
+                                                    </select>
                                                 </div>
-                                            </div>                    
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                上传附件:                                      
+                                            </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="form-control" id="talent_condition">
+                                                        <option value="{$info.talent_condition}">{$info.talentConditionName}</option>
+                                                    </select>
+                                                </div>
+                                                <div class="rowGroup col-sm-12" {if condition='!$info["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="{$info.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="{$info.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="{$info.bank_number}"/>
+                                                </div>
+                                            </td>
+                                            <td rowspan="2" style="width: 200%">
                                                 <table class="fileTable"></table>
-                                            </div>
-                                        </div>
-                                    </div> 
-                                </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">附件</div>
-                                    <div class="panel-body">
-                                        <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
-                                            <thead>
-                                                <tr>
-                                                    <th data-field="selectItem" data-checkbox="true"></th>
-                                                </tr>
-                                            </thead>
-                                        </table>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
-                                    <table id="logTable">
+                                            </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="{$info.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="{$info.bank_account}"/>
+                                                </div>
+                                            </td>
+                                        </tr>
                                     </table>
                                 </div>
                             </div>
                         </div>
-                        <div id="tab-2" class="tab-pane ">
-                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
-                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
+</div>
 <script type="text/javascript">
     document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>

+ 1 - 1
app/enterprise/view/base/first.html

@@ -238,7 +238,7 @@
                                             <tr class="talentType1-2" style="display: none">
                                                 <td >
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span><span id="talentType_first" style="display: none">首次在我市</span>缴交社会保险或个人所得税月份</label>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span><span id="talentType_first" style="display: none">首次</span>在我市缴交社会保险或个人所得税月份</label>
                                                         <input type="text" class="form-control rangemonth" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
                                                     </div>
                                                 </td>

+ 37 - 23
app/enterprise/view/talent/second.html

@@ -149,7 +149,6 @@
                                         </table>
                                     </div>
                                 </div>
-                        </div>
                         <div class="panel panel-default">
                             <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
                             <div class="panel-body">
@@ -195,38 +194,53 @@
                                             </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">
+                                                <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>
                                             </div>
-
                                         </td>
                                     </tr>
-                                    {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
-                                    <tr>
-                                        <td>
+                                    {if condition="in_array($row['talent_type'],[1,2])"}
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup ">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 1"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
+                                                    <input type="text" class="form-control" value="{$row.tax_insurance_month}"  readonly disabled id="tax_insurance_month"/>
+                                                </div>
+                                                <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>
+                                            </td>
+                                        </tr>
+                                        {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
+                                                    <input type="text" class="form-control date" id="fst_work_time" value="{$row.fst_work_time}"  readonly disabled/>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {/if}
+                                    {/if}
+                                    {if condition="in_array($row['talent_type'],[3])"}
+                                    <tr class="talentType3">
+                                        <td >
+                                            <div class="rowGroup">
+                                                预引进类型
+                                            </div>
+                                        </td>
+                                        <td >
                                             <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
-                                                <input type="text" class="form-control date" id="fst_work_time" value="{$row.fst_work_time}"  readonly disabled/>
+                                                <input type="radio" name="pre_import_type" value="1" {eq name="row.pre_import_type" value="1"}checked{/eq} readonly disabled/><span style="color: red">*</span>意向合同&nbsp;&nbsp;&nbsp;&nbsp;
+                                                <input type="radio" name="pre_import_type" value="2" {eq name="row.pre_import_type" value="2"}checked{/eq} readonly disabled/><span style="color: red">*</span>创业企业名称预核准
                                             </div>
                                         </td>
                                     </tr>

+ 6 - 1
public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -78,7 +78,12 @@ TalentInfoInfoDlg.initFileTable = function () {
                 }
             } else {
                 if (data["rows"][k].isConditionFile) {
-                    var tableIndex = $("#talent_condition").parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                    var tableIndex = 0;
+                    if ($("#talent_condition").parents(".table").length > 0) {
+                        tableIndex = $("#talent_condition").parents(".table").find("table.fileTable").index(".fileTable");
+                    } else {
+                        tableIndex = $("#talent_condition").parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                    }
                     data["rows"][k].tableIndex = tableIndex;
                     data["rows"][k].trIndex = datas[tableIndex].length;
                     datas[tableIndex].push(data["rows"][k]);//放入人才条件后面的附件表