sugangqiang 2 năm trước cách đây
mục cha
commit
1f3eee0138

+ 1 - 0
app/admin/controller/Talent.php

@@ -987,6 +987,7 @@ class Talent extends AdminController {
                         $process = 1;
                         break;
                     case 6:
+                        $fields = DictApi::getTalentFields(2);
                         $process = 2;
                         break;
                     case 7:

+ 16 - 8
app/admin/view/talent/talentInfo_common_check.html

@@ -399,8 +399,8 @@
                                             <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 class="form-control" id="source">
+                                                        <option value="{$info.source}">{$info.sourceName}</option>
                                                     </select>
                                                     </select>
                                                 </div>
@@ -409,14 +409,17 @@
                                                 <table class="fileTable"></table>
                                             </td>
                                         </tr>
+                                        {if condition="$info['source_batch']"}
                                         <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>
+                                                <div class="rowGroup">
+                                                    <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>
+                                        {/if}
+                                        {if condition="$info['source_city'] || $info['source_county']"}
                                         <tr>
                                             <td colspan="3">
                                                 <div class="rowGroup col-sm-6" {if condition="!$info['source_city']"}style="display:none;"{/if}>
@@ -429,30 +432,35 @@
                                                 </div>
                                             </td>
                                         </tr>
+                                        {/if}
+                                        {if condition="in_array($row['source'],[1,3])"}
                                         <tr>
                                             <td colspan="3">
-                                                <div class="rowGroup col-sm-6 fujian_highcert" style="display: none">
+                                                <div class="rowGroup col-sm-6 fujian_highcert">
                                                     <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">
+                                                <div class="rowGroup col-sm-6 fujian_highcert">
                                                     <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>
+                                        {/if}
+                                        {if condition="in_array($row['source'],[2,4])"}
                                         <tr>
                                             <td colspan="3">
-                                                <div class="rowGroup col-sm-6 quanzhou_highcert" style="display: none">
+                                                <div class="rowGroup col-sm-6 quanzhou_highcert">
                                                     <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">
+                                                <div class="rowGroup col-sm-6 quanzhou_highcert">
                                                     <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>
+                                        {/if}
                                         <tr>
                                             <td colspan="3">
                                                 <div class="rowGroup col-sm-6">

+ 2 - 1
app/common/controller/Api.php

@@ -179,6 +179,7 @@ class Api extends BaseController {
     public function findCommonFileType() {
         $param = $this->request->param();
         $id = $param["mainId"];
+        $source = $param["source"];
         $order = $param["order"];
         $project = $param["project"];
         $type = $param["type"];
@@ -193,7 +194,7 @@ class Api extends BaseController {
         $where[] = ["active", "=", 1];
         $where[] = ["delete", "=", 0];
         $where[] = ["type", "=", $type];
-        if ($talent_condition) {
+        if ($talent_condition && $source == 5) {
             $condition_info = Db::table("new_talent_condition")->findOrEmpty($talent_condition);
             if ($condition_info["bindFileTypes"]) {
                 $whr[] = ["id", "in", $condition_info["bindFileTypes"]];

+ 2 - 3
app/enterprise/controller/Talent.php

@@ -121,7 +121,7 @@ class Talent extends EnterpriseController {
                 exit;
             }
 
-            if ($condition_info["bindFileTypes"]) {
+            if ($condition_info["bindFileTypes"] && $info["source"] == 5) {
                 $whr[] = ["id", "in", $condition_info["bindFileTypes"]];
                 $whr[] = ["must", "=", 1];
             }
@@ -226,8 +226,7 @@ class Talent extends EnterpriseController {
                     break;
             }
 
-            $condition_info = Db::table("new_talent_condition")->findOrEmpty($params["talent_condition"]);
-
+            $condition_info = Db::table("new_talent_condition")->findOrEmpty($param["talent_condition"]);
             if ($condition_info["isSalary"] == 1) {
                 $data["annual_salary"] = $param["annual_salary"];
             } else {

+ 418 - 268
app/enterprise/view/talent/view.html

@@ -11,7 +11,7 @@
         padding-right:4px;
         padding-left: 4px;
     }
-    #talentInfoForm label {
+    .panel label {
         font-size: xx-small;
     }
     .has-feedback .form-control {
@@ -34,6 +34,21 @@
     }
     .imgs li>div{float:left;}
     .info td{background:#f5f5f5 !important;}
+    .table .td-label{
+        display: block;
+        text-align: left;
+        border-bottom: 1px solid #ccc;
+        margin-bottom: 10px;
+    }
+    .word-wrap{
+        width:100%;
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
+    ul{
+        padding: 0;
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -45,337 +60,472 @@
                         <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">
-                                        <form id="talentInfoForm" class="form-horizontal" autocomplete="off">
-                                            <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="{$row.id}">
-                                                <input type="hidden" name="type" id="type" value="1">
-                                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
-                                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterpriseTag}">
-                                                <div class="row">
-                                                    <div class="col-sm-10">
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" value="{$row.name}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType" value="{$row.card_type}">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">身份证</option>
-                                                                <option value="2">通行证</option>
-                                                                <option value="3">护照</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</span></label>
-                                                            <input class="form-control" id="card_number" name="card_type" value="{$row.card_number}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
-                                                            <input type="text" class="form-control" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control" id="birthday" name="birthday" value="{$row.birthday}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <input class="form-control" id="nation" name="nation" value="{$row.nationName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <input class="form-control" id="politics" name="politics" value="{$row.politicsName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <input class="form-control" id="nationality" name="nationality" value="{$row.nationalityName}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
-                                                            <input class="form-control" id="province" name="province" value="{$row.provinceName}{$row.cityName}{$row.countyName}"/>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-sm-2">
-                                                        <img id="photoImg" src="{$row.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                    </div>
-                                                </div>
-                                                <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                    附件:                                      
+                                        <input type="hidden" name="id" id="id" value="{$row.id}">
+                                        <input type="hidden" name="type" id="type" value="1">
+                                        <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
+                                        <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterpriseTag}">
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>姓名</label>
+                                                        <input type="text" class="form-control" id="name" value="{$row.name}"  readonly disabled/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
+                                                        <input class="form-control" value="{$row.nationName}" readonly disabled id="nation"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="5" style="width: 200%">
+                                                    <img id="photoImg" src="{$row.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <hr />
+                                                    附件:
                                                     <table class="fileTable"></table>
-                                                </div>
-                                            </div>
-                                        </form>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
+                                                        <select class="form-control" value="{$row.card_type}" readonly disabled  id="card_type">
+                                                            <option value="">请选择</option>
+                                                            <option value="1" {eq name="row.card_type" value="1"} selected="" {/eq}>身份证</option>
+                                                            <option value="2" {eq name="row.card_type" value="2"} selected="" {/eq}>通行证</option>
+                                                            <option value="3" {eq name="row.card_type" value="3"} selected="" {/eq}>护照</option>
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>证件号码</span></label>
+                                                        <input class="form-control" value="{$row.card_number}" readonly disabled  id="card_number">
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>性别</label>
+                                                        <input type="text" class="form-control" value="{eq name='info.sex' value='1'}男{else/}女{/eq}"  readonly disabled  id="sex"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
+                                                        <input type="text" class="form-control" value="{$row.birthday}" readonly disabled  id="birthday"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
+                                                        <input class="form-control" value="{$row.politicsName}" readonly disabled  id="politics"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
+                                                        <input class="form-control" value="{$row.nationalityName}" readonly disabled id="nationality">
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                        <input class="form-control" value="{$row.provinceName}{$row.cityName}{$row.countyName}" readonly disabled id="province"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </div>
                                 </div>
                                 <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">
-                                        <div class="col-sm-12 form-group-sm">
-                                            <div class="row">
-                                                <div class="col-sm-10">
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>单位标签</label>
-                                                        <input type="text" class="form-control" id="enterprise_tag" name="enterprise_tag" value="{$row.enterpriseTagName}" />
-                                                    </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="enterprise_name" name="enterprise_name" value="{$row.enterpriseName}" />
-                                                    </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="street" name="street" value="{$row.streetName}" />
-                                                    </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="industry_field" name="industry_field" value="{$row.industryFieldName}">
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
-                                                        <select class="form-control" id="talent_type" name="talent_type" data-value="{$row.talent_type}">
+                                        <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>
+                                                        <div class="form-control" style="border: none">{$row.enterpriseTagName}</div>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
+                                                        <div class="form-control" style="border: none">{$row.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>
+                                                        <div class="form-control" style="border: none">{$row.streetName}</div>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                                                        <div class="form-control" style="border: none">{$row.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" readonly disabled id="talent_type" data-value="{$row.talent_type}">
                                                             <option value="" selected="true">{$row.talentTypeName}</option>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-9" id="tipsBlock">
-                                                        <label class=" control-label spacing">说明</label>
-                                                        {switch name="row.talent_type"}
-                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才,或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
-                                                        {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才,或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
-                                                        {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议(合同)的人才,或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
-                                                        {/switch}
-                                                    </div>
-                                                    {if condition="in_array($row['talent_type'],[1,2])"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
-                                                        <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}" />
-                                                    </div>
-                                                    {else/}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                        <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="in_array($row['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
-                                                    <div class="rowGroup col-sm-3">
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <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['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" name="fst_work_time" value="{$row.fst_work_time}"/>
-                                                    </div>
-                                                    {/if}
-                                                </div>
-                                            </div>
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                附件:                                      
-                                                <table class="fileTable"></table>
-                                            </div>
-                                        </div>
-                                    </div> 
+                                                        <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">
+                                                        <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>
+                                            {/if}
+                                        </table>
+                                    </div>
                                     <div class="panel-body">
-                                        <div class="col-sm-12 form-group-sm">
-                                            <div class="row">
-                                                <div class="rowGroup col-sm-6">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>工作简历</label>
-                                                    <textarea class="form-control" style="border: none">{$row.experience}</textarea>
-                                                </div>
-                                                <div class="rowGroup col-sm-6">
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
-                                                    <textarea class="form-control" style="border: none">{$row.education}</textarea>
-                                                </div>
-                                            </div>
-                                        </div>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>工作简历</label>
+                                                        <textarea class="form-control" style="border: none" readonly disabled>{$row.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" readonly disabled>{$row.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">
-                                        <div class="col-sm-12 form-group-sm">
-                                            <div class="row">
-                                                <div class="col-sm-10">                          
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>申报年度</label>
                                                         <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$row.apply_year}" readonly disabled>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
-                                                        <input type="text" class="form-control" id="phone" value="{$row.phone}" maxlength="11"/>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
+                                                        <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
-                                                        <input type="text" class="form-control" id="email" value="{$row.email}"/>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
+                                                        <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
+                                                </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">
                                                             <option value="">{$row.highestDegreeName}</option>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
-                                                        <input type="text" class="form-control" id="graduate_school" value="{$row.graduate_school}">
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
-                                                        <input type="text" class="form-control" id="major" value="{$row.major}"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing">是否有留学经历</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
+                                                        <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
+                                                        <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </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>
                                                         <select class="form-control" id="study_abroad" >
                                                             <option value="">{eq name="study_abroad" value="2"}否{else/}是{/eq}</option>
                                                         </select>
-                                                    </div>                                                
-                                                    {if condition="$row['abroad_school']"}   
-                                                    <div class="rowGroup col-sm-3 abroad_need_this">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>留学毕业院校</label>
-                                                        <input type="text" class="form-control" id="abroad_school" value="{$row.abroad_school}" maxlength="11"/>
-                                                    </div>
-                                                    {/if}                                                
-                                                    {if condition="$row['abroad_major']"}   
-                                                    <div class="rowGroup col-sm-3 abroad_need_this">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>留学专业</label>
-                                                        <input type="text" class="form-control" id="abroad_major" value="{$row.abroad_major}" maxlength="11"/>
-                                                    </div>
-                                                    {/if}
-                                                </div>
-                                            </div>                     
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                上传附件:                                      
-                                                <table class="fileTable"></table>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col-sm-10">                                                    
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
-                                                        <input type="text" class="form-control date" id="cur_entry_time" value="{$row.cur_entry_time}"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位现任职务</label>
-                                                        <input type="text" class="form-control" id="position" value="{$row.position}"/>
-                                                    </div>
-                                                    {if condition="$row['professional']"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing">专业技术职称</label>
-                                                        <input type="text" class="form-control" id="professional" value="{$row.professional}"/>
-                                                    </div>{/if}
-                                                </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>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
+                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
+                                                        <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
+                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
+                                                        <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
+                                                    </div>
+                                                </td>
+                                                <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>
                                                         <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
                                                             <option value="">{$row.importWayName}</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="source" >
-                                                            <option value="">{$row.sourceName}</option>
-                                                        </select>
+                                                </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="{$row.cur_entry_time}"/>
                                                     </div>
-                                                    {if condition="$row['source_city']"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
+                                                        <input type="text" class="form-control" id="position" name="position" value="{$row.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="{$row.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="{$row.professional}"/>
+                                                    </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 colspan="3">
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
+                                                        <div class="form-control" style="border: none;background:#eee;">{$row.sourceName}</div>
+                                                        <input type="hidden" id="source" value="{$row.source}">
+                                                    </div>
+                                                </td>
+                                                <td rowspan="7" style="width: 100%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr> 
+                                            {if condition="$row['source_batch']"}
+                                            <tr>
+                                                <td colspan="3">
+                                                    <div class="rowGroup">
+                                                        <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>
+                                            {/if}
+                                            {if condition="$row['source_city'] || $row['source_county']"}
+                                            <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">
                                                             <option value="">{$row.sourceCityName}</option>
                                                         </select>
                                                     </div>
-                                                    {/if}
-                                                    {if condition="$row['source_county']"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                    <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">
                                                             <option value="">{$row.sourceCountyName}</option>
                                                         </select>
                                                     </div>
-                                                    {/if}
-                                                    {if condition="$row['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="{$row.source_batch}"/>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$row['fujian_highcert_pubtime']"}                                                
-                                                    <div class="rowGroup col-sm-3">
+                                                </td>
+                                            </tr>
+                                            {/if}
+                                            {if condition="in_array($row['source'],[1,3])"}
+                                            <tr>
+                                                <td colspan="3">
+                                                    <div class="rowGroup col-sm-6 fujian_highcert">
                                                         <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
-                                                        <input type="text" class="form-control date" id="fujian_highcert_pubtime" value="{$row.fujian_highcert_pubtime}"/>
+                                                        <input type="text" class="form-control date" id="fujian_highcert_pubtime" name="fujian_highcert_pubtime" value="{$row.fujian_highcert_pubtime}"/>
                                                     </div>
-                                                    {/if}
-                                                    {if condition="$row['fujian_highcert_exptime']"}                                                
-                                                    <div class="rowGroup col-sm-3">
+                                                    <div class="rowGroup col-sm-6 fujian_highcert">
                                                         <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
-                                                        <input type="text" class="form-control date" id="fujian_highcert_exptime" value="{$row.fujian_highcert_exptime}"/>
-                                                    </div>
-                                                    {/if}
-                                                    {if condition="$row['quanzhou_highcert_pubtime']"}    
-                                                    <div class="rowGroup col-sm-3">
+                                                        <input type="text" class="form-control date" id="fujian_highcert_exptime" name="fujian_highcert_exptime" value="{$row.fujian_highcert_exptime}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            {/if}
+                                            {if condition="in_array($row['source'],[2,4])"}
+                                            <tr>
+                                                <td colspan="3">
+                                                    <div class="rowGroup col-sm-6 quanzhou_highcert">
                                                         <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
-                                                        <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" value="{$row.quanzhou_highcert_pubtime}"/>
+                                                        <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" name="quanzhou_highcert_pubtime" value="{$row.quanzhou_highcert_pubtime}"/>
                                                     </div>
-                                                    {/if}
-                                                    {if condition="$row['quanzhou_highcert_exptime']"}    
-                                                    <div class="rowGroup col-sm-3">
+                                                    <div class="rowGroup col-sm-6 quanzhou_highcert">
                                                         <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
-                                                        <input type="text" class="form-control date" id="quanzhou_highcert_exptime" value="{$row.quanzhou_highcert_exptime}"/>
-                                                    </div>
-                                                    {/if}
-                                                    <div class="rowGroup col-sm-3">
+                                                        <input type="text" class="form-control date" id="quanzhou_highcert_exptime" name="quanzhou_highcert_exptime" value="{$row.quanzhou_highcert_exptime}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            {/if}
+                                            <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="">{$row.talentArrangeName}</option>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-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_category" name="talent_arrange_category">
                                                             <option value="">{$row.talentArrangeCatName}</option>
                                                         </select>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="3">
+                                                    <div class="rowGroup col-sm-9">
                                                         <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                        <select class="form-control" id="talent_condition" value="{$row.talent_condition}">
-                                                            <option value="">{$row.talentConditionName}</option>
-                                                        </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" 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">
+                                                        <input type='hidden' name='talent_condition' id='talent_condition' value='{$row.talent_condition}'>
+                                                        <div class='form-control' style='border: none;background:#eee;'>{$row.talentConditionName}</div>
+                                                    </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="" id="bank" value="{$row.bank}" placeholder="XX银行"/>
+                                                        <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">
+                                                </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" value="{$row.bank_number}"/>
+                                                        <input type="text" class="form-control" id="bank_number" name="bank_number" value="{$row.bank_number}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-3">
+                                                </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" value="{$row.bank_branch_name}" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                        <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">
+                                                </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" value="{$row.bank_account}" />
-                                                    </div>
-                                                </div>
-                                            </div>                    
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                上传附件:                                      
-                                                <table class="fileTable"></table>
-                                            </div>
-                                        </div>
-                                    </div> 
+                                                        <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
                                 </div>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>

+ 6 - 3
public/static/modular/gate/talentBase/talentInfo_select.js

@@ -57,7 +57,11 @@ TalentInfoInfoDlg.initFileTable = function () {
                 datas[tableIndex].push(data["rows"][k]);
             } else {
                 if (data["rows"][k].isConditionFile) {
-                    var tableIndex = $("#talent_condition").parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                    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]);//放入人才条件后面的附件表
@@ -119,7 +123,7 @@ TalentInfoInfoDlg.initFileTable = function () {
     queryData["mainId"] = $("#id").val();
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
-    queryData["talent_condition"] = $("#talent_condition option:selected").val();
+    queryData["talent_condition"] = $("#talent_condition").val();
     queryData['checkState'] = $("#checkState").val();
     ajax.set(queryData);
     ajax.start();
@@ -131,7 +135,6 @@ TalentInfoInfoDlg.downloadFile = function (id, type) {
 
 
 $(function () {
-    $(":input").prop("disabled", true);
     $("#talent_type option").eq(0).prop("selected", true);
     var id = $("#id").val();
     var checkState = $("#checkState").val();

+ 21 - 1
public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -372,6 +372,7 @@ TalentInfoInfoDlg.initFileTable = function () {
     var queryData = {};
     queryData["mainId"] = $("#id").val();
     queryData['project'] = CONFIG.project_rcrd;
+    queryData["source"] = $("#source").val();
     queryData['type'] = $("#type").val();
     queryData["talent_condition"] = $("#talent_condition option:selected").val();
     queryData['checkState'] = $("#checkState").val();
@@ -454,11 +455,21 @@ TalentInfoInfoDlg.getIdentifyCondition = function () {
     $("#talent_condition").trigger('chosen:updated');
 }
 
-
 TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
     $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     $("#annual_salary").parents(".rowGroup").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
+
+    var source = $("#source").val();
+    if (source == "" || typeof source == "undefined") {
+        layer.alert("请先选择申报来源");
+        $("#talent_condition").val("");
+        $("#talent_condition").trigger('chosen:updated');
+        return;
+    }
+    TalentInfoInfoDlg.ajaxGetConditionFile(source);
+}
+TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
     var condition = $("#talent_condition option:selected").val();
     if (condition != "") {
         var ajax = new $ax("/common/api/getTalentCondtionUploadFile", function (data) {
@@ -481,6 +492,9 @@ TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
                     }
                 });
             }
+            if (source != "5") {
+                return;
+            }
             var conditionFileTable = $("#talent_condition").parents(".table").find(".fileTable");
             var tableIndex = conditionFileTable.index(".fileTable");
             var tbody = conditionFileTable.find("tbody");
@@ -534,6 +548,7 @@ TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
         var queryData = {};
         queryData["mainId"] = $("#id").val();
         queryData['project'] = CONFIG.project_rcrd;
+        queryData["source"] = source;
         queryData['type'] = $("#type").val();
         queryData["talent_condition"] = condition;
         ajax.set(queryData);
@@ -624,6 +639,11 @@ TalentInfoInfoDlg.sourceChange = function () {
         });
         $('#talentInfoForm').bootstrapValidator('addField', "source_county", {validators: {notEmpty: {message: '入选来源县市区不能为空'}}});
     }
+    if (source != 5) {
+        $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
+    } else {
+        TalentInfoInfoDlg.ajaxGetConditionFile(source);
+    }
 }
 
 //校验是否保存基础信息

+ 2 - 1
public/static/modular/gate/talentInfo/talentInfo_select.js

@@ -147,7 +147,8 @@ TalentInfoInfoDlg.initFileTable = function () {
     queryData["mainId"] = $("#id").val();
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
-    queryData["talent_condition"] = $("#talent_condition option:selected").val();
+    queryData["source"] = $("#source").val();
+    queryData["talent_condition"] = $("#talent_condition").val();
     queryData['checkState'] = $("#checkState").val();
     ajax.set(queryData);
     ajax.start();

+ 11 - 5
public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -22,7 +22,7 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                 if (row.must == 2) {
                     str = str + '<i class="fa fa-paste"></i>' + value;
                 }
-                str = str + '<br /><span id="desc_'+row.rel+'">' + row.description + '</span></div>'
+                str = str + '<br /><span id="desc_' + row.rel + '">' + row.description + '</span></div>'
                 return str;
             }
         },
@@ -60,9 +60,9 @@ TalentInfoInfoDlg.initFileTable = function () {
             }
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                if($("#" + rel).parents(".table").length > 0){
+                if ($("#" + rel).parents(".table").length > 0) {
                     var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
-                }else{
+                } else {
                     var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
                 }
                 data["rows"][k].tableIndex = tableIndex;
@@ -150,6 +150,7 @@ TalentInfoInfoDlg.initFileTable = function () {
     queryData["mainId"] = $("#id").val();
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
+    queryData["source"] = $("#source").val();
     queryData["talent_condition"] = $("#talent_condition option:selected").val();
     queryData['checkState'] = $("#checkState").val();
     ajax.set(queryData);
@@ -327,9 +328,14 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     }
                     if (obj.files != null && obj.files != '') {
                         $("#field_file input").each(function () {
-                            if (obj.files.indexOf($(this).val()) != -1) {
-                                this.checked = true;
+                            for (var key in obj.files) {
+                                if ($(this).val() == obj.files[key]) {
+                                    this.checked = true;
+                                }
                             }
+                            //if (obj.files.indexOf($(this).val()) != -1) {
+                                //this.checked = true;
+                            //}
                         });
                     }
                 },