单位并审修改

app/admin/controller/Talent.php

@@ -736,8 +736,33 @@ class Talent extends AdminController {
 //审核驳回并记录需要修改的字段和上传文件
             $checkState = TalentState::SCND_SUBMIT; //退回待初审
             $log_checkState = TalentState::FST_VERIFY_PASS; //当前状态不变
-            $data["modify_files"] = $params["files"];
-            $data["modify_fields"] = $params["fields"];
+            $talent_condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
+            if (!$talent_condition["companyWithFileType"])
+                return json(["msg" => "尚未设置单位可审的附件，请联系管理员设置后再进行审批"]);
+            $cwfts = explode(";", $talent_condition["companyWithFileType"]);
+            $company_setting = [];
+            foreach ($cwfts as $cwft) {
+                $_company_setting = explode(":", $cwft);
+                if ($_company_setting[0] == $this->user["companyId"]) {
+                    $company_setting = explode(",", $_company_setting[1]);
+                    break;
+                }
+            }
+            if (!$company_setting)
+                return json(["msg" => "尚未设置单位可审的附件，请联系管理员设置后再进行审批"]);
+            //$data["modify_fields"] = $params["fields"];
+            $original_modify_files = explode(",", $talent_info["modify_files"]);
+            $_current_modify_files = explode(",", $params["files"]);
+
+            $unselect_files = array_diff($company_setting, $_current_modify_files); //比较设置和当前提交的,取差值集，既是可选而未选的附件集合
+            $new_modify_files = array_unique(array_merge($original_modify_files, $_current_modify_files)); //合并当前提交及库中原来保存的值
+
+            foreach ($new_modify_files as $key => $item) {
+                if (in_array($item, $unselect_files))
+                    unset($new_modify_files[$key]);
+            }
+
+            $data["modify_files"] = implode(",", array_unique($new_modify_files));
         }
 
         $fst_dept_check_time = $talent_info["first_dept_check_time"];
@@ -971,19 +996,21 @@ class Talent extends AdminController {
                         } else {
                             $process = 4;
                         }
-                        $fields = DictApi::getTalentFields(3);
+                        $fields = DictApi::getTalentFields($process);
                         break;
                     case 9:
-                        $fields = DictApi::getTalentFields(3);
                         $process = 4;
+                        $fields = DictApi::getTalentFields($process);
                         break;
                 }
                 if ($checkState != 2) {
                     $enterprise = \app\common\model\Enterprise::findOrEmpty($talent_info["enterprise_id"]);
-                    $fields = DictApi::getTalentFields(2);
+                    //$fields = DictApi::getTalentFields(2);
                     $field_tmp = [];
-                    foreach ($fields as $key => $field) {
-                        $field_tmp[] = ["key" => $key, "value" => $field];
+                    if ($fields) {
+                        foreach ($fields as $key => $field) {
+                            $field_tmp[] = ["key" => $key, "value" => $field];
+                        }
                     }
                     $where = [];
                     $whr = [];
@@ -993,11 +1020,28 @@ class Talent extends AdminController {
                     $where[] = ["active", "=", 1];
                     $where[] = ["type", "=", $enterprise["type"]];
                     $where[] = ["isConditionFile", "<>", 1];
-                    if ($condition && $condition["bindFileTypes"]) {
-                        $whr[] = ["id", "in", explode(",", $condition["bindFileTypes"])];
-                        $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->select();
+                    if ($process == 3) {
+                        $where = [];
+                        $cwfts = explode(";", $condition["companyWithFileType"]);
+                        foreach ($cwfts as $cwft) {
+                            $_company_setting = explode(":", $cwft);
+                            if ($_company_setting[0] == $this->user["companyId"]) {
+                                $where[] = ["id", "in", explode(",", $_company_setting[1])];
+                                break;
+                            }
+                        }
+                        if ($where) {
+                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                        } else {
+                            $files = [];
+                        }
                     } else {
-                        $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                        if ($condition && $condition["bindFileTypes"]) {
+                            $whr[] = ["id", "in", explode(",", $condition["bindFileTypes"])];
+                            $files = \think\facade\Db::table("new_common_filetype")->whereOr([$where, $whr])->select();
+                        } else {
+                            $files = \think\facade\Db::table("new_common_filetype")->where($where)->select();
+                        }
                     }
                 }
                 $talent_info["files"] = array_filter(explode(",", $talent_info["modify_files"]));
@@ -1018,7 +1062,7 @@ class Talent extends AdminController {
         $fields = $params["export"];
         if (!$fields)
             return json(["msg" => "请选择要导出的数据"]);
-        $names = DictApi::getTalentFields(3);
+        $names = DictApi::getTalentFields(4);
         $names["industryFieldNew"] = "产业领域";
         $names["enterpriseName"] = "单位名称";
         $names["enterpriseTag"] = "单位标签";

app/admin/controller/TalentCondition.php

@@ -73,22 +73,26 @@ class TalentCondition extends AdminController {
             return json(["msg" => "请选择人才层次"]);
         if (!$params["name"])
             return json(["msg" => "请填写名称"]);
-        if ($params["companyIds"] && $params["bindFileTypes"]) {
-            $bindFileTypes = array_filter(explode(",", $params["bindFileTypes"]));
-            $total = count($bindFileTypes);
-            $tmp = [];
-            foreach ($params["relation"] as $_companyId => $_relation) {
-                $_relations = explode(",", $_relation);
-                for ($i = 0; $i < count($_relations); $i++) {
-                    if (in_array($_relations[$i], $bindFileTypes))
-                        $tmp[] = $_relations[$i];
-                }
-            }
-            $_valid_count = count(array_unique($tmp));
-            if ($_valid_count != $total) {
-                return json(["msg" => "选择了审核单位及审核附件后，每个附件必须与其中一个审核单位关联"]);
+        if (!$params["companyIds"]) {
+            return json(["msg" => "没有设置审核单位"]);
+        }
+        if (!$params["bindFileTypes"]) {
+            return json(["msg" => "没有设置审核附件"]);
+        }
+        $bindFileTypes = array_filter(explode(",", $params["bindFileTypes"]));
+        $total = count($bindFileTypes);
+        $tmp = [];
+        foreach ($params["relation"] as $_companyId => $_relation) {
+            $_relations = explode(",", $_relation);
+            for ($i = 0; $i < count($_relations); $i++) {
+                if (in_array($_relations[$i], $bindFileTypes))
+                    $tmp[] = $_relations[$i];
             }
         }
+        $_valid_count = count(array_unique($tmp));
+        if ($_valid_count != $total) {
+            return json(["msg" => "选择了审核单位及审核附件后，每个附件必须与其中一个审核单位关联"]);
+        }
         return true;
     }
 

app/admin/view/talent/dept_fst_verify.html

@@ -241,7 +241,7 @@
                                 <li style="width:12%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
                                 <li style="width:12%"><input type="checkbox" value="ourCitySourceName"><span>公布入选来源</span></li>
                                 <li style="width:12%"><input type="checkbox" value="fromCityName"><span>入选来源县市</span></li>
-                                <li style="width:12%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
+                                <li style="width:12%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
                                 <li style="width:12%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>

app/admin/view/talent/dept_verify.html

@@ -231,7 +231,7 @@
                                 <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>产业领域</span></li>
                                 <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
                                 <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
+                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>

app/admin/view/talent/fst_verify.html

@@ -251,7 +251,7 @@
                                 <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>产业领域</span></li>
                                 <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
                                 <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
+                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>

app/admin/view/talent/pre_list.html

@@ -674,7 +674,7 @@
                                 <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
                                 <li style="width:24%"><input type="checkbox" value="ourCitySourceName"><span>公布入选来源</span></li>
                                 <li style="width:24%"><input type="checkbox" value="fromCityName"><span>入选来源县市</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
+                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>

app/admin/view/talent/re_verify.html

@@ -236,7 +236,7 @@
                                 <li style="width:24%"><input type="checkbox" value="industryFieldName"><span>产业领域</span></li>
                                 <li style="width:24%"><input type="checkbox" value="streetName"><span>所属镇街</span></li>
                                 <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
+                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>

app/admin/view/talent/talentInfo_base_check.html

@@ -224,9 +224,10 @@
                                                     </div>
                                                 </td>
                                             </tr>
-                                            {/if}
+                                            {/if}                                  
+                                            {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
                                             <tr>
-                                                <td colspan="2">
+                                                <td>
                                                     <label class=" control-label spacing td-label">说明</label>
                                                     <div class="word-wrap" id="typeTips">
                                                         {switch name="info.talent_type"}
@@ -237,11 +238,49 @@
                                                     </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">
+                                                    <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">
+                                            <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>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>

app/admin/view/talent/talentInfo_common_check.html

@@ -203,7 +203,27 @@
                                                     </div>
                                                 </td>
                                             </tr>
-                                            {/if}
+                                            {/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">
                                                     <label class=" control-label spacing td-label">说明</label>
@@ -217,9 +237,27 @@
 
                                                 </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>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
@@ -269,6 +307,8 @@
                                                     </div>
                                                 </td>
                                             </tr>
+                                        </table>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">                                            
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup">
@@ -279,7 +319,7 @@
                                                 <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>
+                                                        <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}
@@ -287,14 +327,15 @@
                                                 <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>
+                                                        <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>
-                                             </tr>
-
-
+                                                <td rowspan="3" style="width: 300%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
                                         </table>
 
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
@@ -305,17 +346,6 @@
                                                         <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="fst_work_time" name="fst_work_time" value="{$info.fst_work_time}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 200%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                            <tr>
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
@@ -328,16 +358,23 @@
                                                         <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 colspan="2">
+                                                <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">
 
@@ -369,7 +406,7 @@
                                                     {/if}
                                                     {if condition="$info['source_batch']"}                                                
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
+                                                        <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}

app/admin/view/talent/talentInfo_common_check_new.html

@@ -220,13 +220,13 @@
                                                     </div>                                                
                                                     {if condition="$info['abroad_school']"}   
                                                     <div class="rowGroup col-sm-3 abroad_need_this">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                        <label class="control-label spacing"><span style="color: red">*</span>留学毕业院校</label>
                                                         <input type="text" class="form-control" id="abroad_school" value="{$info.abroad_school}" maxlength="11"/>
                                                     </div>
                                                     {/if}                                                
                                                     {if condition="$info['abroad_major']"}   
                                                     <div class="rowGroup col-sm-3 abroad_need_this">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                        <label class="control-label spacing"><span style="color: red">*</span>留学专业</label>
                                                         <input type="text" class="form-control" id="abroad_major" value="{$info.abroad_major}" maxlength="11"/>
                                                     </div>
                                                     {/if}
@@ -289,7 +289,7 @@
                                                     {/if}
                                                     {if condition="$info['source_batch']"}                                                
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
+                                                        <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}

app/admin/view/talent/talentInfo_library.html

@@ -276,7 +276,7 @@
                                 <li style="width:24%"><input type="checkbox" value="sourceName"><span>申报来源</span></li>
                                 <li style="width:24%"><input type="checkbox" value="ourCitySourceName"><span>公布入选来源</span></li>
                                 <li style="width:24%"><input type="checkbox" value="fromCityName"><span>入选来源县市</span></li>
-                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>
+                                <li style="width:24%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>
                                 <li style="width:24%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>
                                 <li style="width:24%"><input type="checkbox" value="talentArrangeName"><span>人才层次</span></li>

app/admin/view/talent_condition/add.html

@@ -64,7 +64,7 @@
                                         
                                     </tbody>
                                 </table>
-                                <span style='color:#ff0000'>*1.同时设置了审核单位与附件后，所选附件必须关联其中一个审核单位。<br>*2.审核单位可关联复数附件，但是附件只能关联一个审核单位。</span>
+                                <span style='color:#ff0000'>*审核单位可关联复数附件，但是附件只能关联一个审核单位。</span>
                             </div>
                         </div>
                     </div>

app/admin/view/talent_condition/edit.html

@@ -63,7 +63,7 @@
 
                                     </tbody>
                                 </table>
-                                <span style='color:#ff0000'>*1.同时设置了审核单位与附件后，所选附件必须关联其中一个审核单位。<br>*2.审核单位可关联复数附件，但是附件只能关联一个审核单位。</span>
+                                <span style='color:#ff0000'>*审核单位可关联复数附件，但是附件只能关联一个审核单位。</span>
                             </div>
                         </div>
                     </div>

app/common/api/DictApi.php

@@ -154,7 +154,10 @@ class DictApi {
             "city" => "籍贯市",
             "county" => "籍贯县",
             "nation" => "民族",
-            "politics" => "政治面貌"
+            "politics" => "政治面貌",
+            "experience" => "工作简历",
+            "education" => "教育背景",
+            "fst_work_time" => "首次来晋工作时间",
         ];
         $dict2 = [
             "talent_arrange" => "人才层次",
@@ -174,17 +177,17 @@ class DictApi {
             "email" => "电子邮箱",
             "apply_year" => "申报年度",
             "import_way" => "引进方式",
-            "fst_work_time" => "首次来晋工作时间",
             "cur_entry_time" => "本单位入职时间",
             "position" => "本单位现任职务",
             "source" => "申报来源",
             "source_city" => "入选来源地级市",
             "source_county" => "入选来源县市区",
-            "source_batch" => "入选名单批次",
+            "source_batch" => "入选名单的文件号及批次",
             "fujian_highcert_pubtime" => "福建省高层次人才证书发证日期",
             "fujian_highcert_exptime" => "福建省高层次人才证书有效期",
             "quanzhou_highcert_pubtime" => "泉州高层次人才证书发证日期",
-            "quanzhou_highcert_exptime" => "泉州高层次人才证书有效期"
+            "quanzhou_highcert_exptime" => "泉州高层次人才证书有效期",
+            "annual_salary" => "年薪"
         ];
         if ($step == 1) {
             return $dict1;
@@ -192,6 +195,9 @@ class DictApi {
         if ($step == 2) {
             return $dict2;
         }
+        if ($step == 3) {
+            return null;
+        }
         return array_merge($dict1, $dict2);
     }
 

app/common/api/VerifyApi.php

@@ -43,6 +43,7 @@ class VerifyApi {
             }
             $enterprise = Enterprise::findOrEmpty($info["enterprise_id"])->toArray();
             $info["enterpriseName"] = $enterprise["name"];
+            $info["enterpriseTag"] = $enterprise["enterpriseTag"];
             if ($enterprise["street"]) {
                 $info["street"] = $enterprise["street"];
                 $info["streetName"] = DictApi::selectByParentCode("street")[$enterprise["street"]];

app/enterprise/controller/Base.php

@@ -34,6 +34,13 @@ class Base extends EnterpriseController {
         $param = $request->param();
         $id = isset($param["id"]) ? $param["id"] : 0;
         $info = self::chkIsOwner($id, $this->user["uid"]);
+        $ep = EnterpriseApi::getOne($this->user["uid"]);
+        $tagList = DictApi::selectByParentCode('enterprise_tag');
+        $streetList = DictApi::selectByParentCode('street');
+        $industryFieldNew = DictApi::selectByParentCode('industry_field');
+        $ep->enterpristTagName = $tagList[$ep->enterpriseTag];
+        $ep->streetName = $streetList[$ep->street];
+        $ep->industryFieldNewName = $industryFieldNew[$ep->industryFieldNew];
         if ($info) {
             $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
         }
@@ -71,13 +78,24 @@ class Base extends EnterpriseController {
             $data["headimgurl"] = $info["headimgurl"];
             if ($request->file()) {
                 $headimg = $request->file("photo");
+                $upload = new \app\common\api\UploadApi();
+                $result = $upload->uploadOne($headimg, "image", "talent/photo");
+                $file = imagecreatefromstring(file_get_contents("storage/" . $result->filepath));
+                $width = imagesx($file);
+                $height = imagesy($file);
+                //免冠二寸照长宽413：579
+                if ($width * 579 != $height * 413) {
+                    @unlink("storage/" . $result->filepath); //像素不符合，删除上传文件
+                    $res = ["msg" => "近期免冠半身彩照（二寸）不符合二寸像素标准。*<span style='color:#ff0000;'>二寸像素标准[413*579]</span>"];
+                    echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                    exit;
+                }
                 if ($info && $info["headimgurl"]) {
+                    //如果新照片符合像素要求，则删除旧照片
                     $old_head_url = "storage/" . $info["headimgurl"];
                     if (file_exists($old_head_url))
-                        unlink($old_head_url);
+                        @unlink($old_head_url);
                 }
-                $upload = new \app\common\api\UploadApi();
-                $result = $upload->uploadOne($headimg, "image", "talent/photo");
                 $data["headimgurl"] = $result->filepath;
             }
             if (!$data["headimgurl"]) {
@@ -85,7 +103,10 @@ class Base extends EnterpriseController {
                 echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
                 exit;
             }
-            $no_empty = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "nation", "politics"];
+            $no_empty = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "nation", "politics", "experience", "education"];
+            if (in_array($ep["enterpriseTag"], ['mtdw', 'gyqyh', 'mbfqy', 'jrjg'])) {
+                $no_empty[] = "fst_work_time";
+            }
 
             if (in_array($param["talent_type"], [1, 2])) {
                 list($date1, $date2) = explode(" - ", $param["tax_insurance_month"]);
@@ -192,6 +213,9 @@ class Base extends EnterpriseController {
             $data["county"] = $param["county"];
             $data["nation"] = $param["nation"];
             $data["politics"] = $param["politics"];
+            $data["fst_work_time"] = $param["fst_work_time"];
+            $data["experience"] = $param["experience"];
+            $data["education"] = $param["education"];
             if ($info["real_state"] == 4) {
                 //真实状态4是驳回，需要判断什么字段可以提交                
                 $modify_fields = array_filter(explode(",", $info["modify_fields"]));
@@ -250,13 +274,7 @@ class Base extends EnterpriseController {
             exit();
         }
         $checkState = $info["checkState"] ?: 0;
-        $ep = EnterpriseApi::getOne($this->user["uid"]);
-        $tagList = DictApi::selectByParentCode('enterprise_tag');
-        $streetList = DictApi::selectByParentCode('street');
-        $industryFieldNew = DictApi::selectByParentCode('industry_field');
-        $ep->enterpristTagName = $tagList[$ep->enterpriseTag];
-        $ep->streetName = $streetList[$ep->street];
-        $ep->industryFieldNewName = $industryFieldNew[$ep->industryFieldNew];
+
         $info["enterprise"] = $ep;
         $info["talent_type_list"] = \app\common\api\DictApi::findChildDictByCode("talent_type");
         return view("first", ["year" => date("Y"), "checkState" => $checkState, "row" => $info]);

app/enterprise/controller/Talent.php

@@ -47,10 +47,10 @@ class Talent extends EnterpriseController {
 
             $field_dict = \app\common\api\DictApi::getTalentFields(2);
             //可以用匹配键的方式，可以少很多代码。。先这样吧。
-            $all_valid_keys = ["applay_year", "fst_work_time", "import_way", "cur_entry_time", "position",
+            $all_valid_keys = ["applay_year", "import_way", "cur_entry_time", "position",
                 "source", "source_batch", "fujian_highcert_pubtime", "fujian_highcert_exptime", "quanzhou_highcert_pubtime", "quanzhou_highcert_exptime", "source_city", "source_county",
                 "talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "professional", "bank", "bank_number", "bank_branch_name", "bank_account",
-                "study_abroad", "abroad_school", "abroad_major", "phone", "email"];
+                "study_abroad", "abroad_school", "abroad_major", "phone", "email", "annual_salary"];
             foreach ($all_valid_keys as $key) {
                 $data[$key] = trim($params[$key]);
                 if (strpos($key, "time") !== false && strtotime($params[$key]) === false) {
@@ -59,7 +59,7 @@ class Talent extends EnterpriseController {
             }
 
             $no_empty = ["talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "bank", "bank_number", "bank_branch_name",
-                "bank_account", "study_abroad", "phone", "email", "import_way", "fst_work_time", "cur_entry_time", "cur_entry_time", "position", "source"];
+                "bank_account", "study_abroad", "phone", "email", "import_way", "cur_entry_time", "cur_entry_time", "position", "source"];
 
             if ($data["study_abroad"] == 1) {
                 $no_empty[] = "abroad_school";

app/enterprise/view/base/first.html

@@ -261,13 +261,40 @@
                                                     </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}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            {/if}
                                             <tr>
 
                                             </tr>
 
                                         </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="填写工作简历">{$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" placeholder="填写教育背景">{$row.education}</textarea>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
                                 </div>
                             </form> 
                             <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">

app/enterprise/view/base/view.html

@@ -163,6 +163,20 @@
                                             </div>
                                         </div>
                                     </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>
+                                    </div>
                                 </div>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>

app/enterprise/view/talent/second.html

@@ -220,7 +220,34 @@
 
                                         </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}
+                                </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" 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>
@@ -272,6 +299,8 @@
                                             </div>
                                         </td>
                                     </tr>
+                                </table>
+                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">                                    
                                     <tr>
                                         <td>
                                             <div class="rowGroup">
@@ -284,16 +313,19 @@
                                         </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>
+                                                <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>
+                                                <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">
@@ -305,17 +337,6 @@
                                                 </select>
                                             </div>
                                         </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>首次来晋工作时间</label>
-                                                <input type="text" class="form-control date" id="fst_work_time" name="fst_work_time" value="{$row.fst_work_time}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 200%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                    <tr>
                                         <td>
                                             <div class="rowGroup">
                                                 <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
@@ -328,14 +349,22 @@
                                                 <input type="text" class="form-control" id="position" name="position" value="{$row.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 colspan="2">
+                                        <td>
                                             <div class="rowGroup">
-                                                <label class="control-label spacing td-label">专业技术职称</label>
+                                                <label class="control-label spacing"><span style="color: red">*</span>专业技术职称</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>
                                 <div class="row">
@@ -345,7 +374,7 @@
                                         </select>
                                     </div>
                                     <div class="rowGroup col-sm-3" {if condition="!$row['source_batch']"}style="display:none;"{/if}>
-                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
+                                        <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>
 

app/enterprise/view/talent/view.html

@@ -156,6 +156,12 @@
                                                         <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">
+                                                        <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;">
@@ -164,6 +170,20 @@
                                             </div>
                                         </div>
                                     </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>
+                                    </div>
                                 </div>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
@@ -175,10 +195,6 @@
                                                         <label class=" control-label spacing"><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 date" id="fst_work_time" value="{$row.fst_work_time}"/>
-                                                    </div>
                                                     <div class="rowGroup col-sm-3">
                                                         <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
                                                         <input type="text" class="form-control" id="phone" value="{$row.phone}" maxlength="11"/>
@@ -209,13 +225,13 @@
                                                     </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>
+                                                        <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>
+                                                        <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}
@@ -278,7 +294,7 @@
                                                     {/if}
                                                     {if condition="$row['source_batch']"}                                                
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
+                                                        <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}

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

@@ -30,7 +30,9 @@ var TalentInfoInfoDlg = step == 1 ? {
         province: {validators: {notEmpty: {message: '户籍省份不能为空'}}},
         city: {validators: {notEmpty: {message: '户籍市不能为空'}}},
         nation: {validators: {notEmpty: {message: '民族不能为空'}}},
-        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}}
+        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
+        experience: {validators: {notEmpty: {message: '工作简历不能为空'}}},
+        education: {validators: {notEmpty: {message: '教育背景不能为空'}}}
     }
 } : {
     talentInfoInfoData: {},
@@ -320,8 +322,8 @@ TalentInfoInfoDlg.changeStudyAbroad = function () {
     if (is_abroad == 1) {
         $("#abroad_school").parent().css("display", "block");
         $("#abroad_major").parent().css("display", "block");
-        $('#talentInfoForm').bootstrapValidator('addField', "abroad_school", {validators: {notEmpty: {message: '毕业院校不能为空（留学）'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "abroad_major", {validators: {notEmpty: {message: '专业不能为空（留学）'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "abroad_school", {validators: {notEmpty: {message: '留学毕业院校不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "abroad_major", {validators: {notEmpty: {message: '留学专业不能为空'}}});
     } else {
         $("#abroad_school").val("").parent().css("display", "none");
         $("#abroad_major").val("").parent().css("display", "none");
@@ -373,7 +375,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
     //$("#labor_contract_rangetime").val("").parent().css("display", "none");
     $(".talentType1-2").css("display", "none");
     $(".talentType3").css("display", "none");
-
+    var text = "";
     switch (talent_type) {
         case "1":
             TalentInfoInfoDlg.talentTypeOneTwo = true;
@@ -381,7 +383,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             $("#typeTips").html("含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。");
             //$("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料");
             $(".talentType1-2").css("display", "table-row");
-            $("#talentType_first").css('display',"none");
+            $("#talentType_first").css('display', "none");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
                     notEmpty: {message: '在我市缴交社会保险或个人所得税月份不能为空'}
@@ -392,6 +394,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
             }
+            text = $("#fst_work_time").prev("label").html().replace(/首次/, "近三年");
             break;
         case "2":
             TalentInfoInfoDlg.talentTypeOneTwo = true;
@@ -399,7 +402,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             $("#typeTips").html("含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
             //$("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料与来我市前工作情况证明，例如原工作单位出具的工作证明、离职证明或原创（领）办企业的营业执照复印件、经市场监管部门备案的公司章程复印件等证明材料");
             $(".talentType1-2").css("display", "table-row");
-            $("#talentType_first").css('display',"inline");
+            $("#talentType_first").css('display', "inline");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
                     notEmpty: {message: '在我市缴交社会保险或个人所得税月份不能为空'}
@@ -410,6 +413,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
             }
+            text = $("#fst_work_time").prev("label").html().replace(/近三年/, "首次");
             break;
         case "3":
             TalentInfoInfoDlg.talentTypeFlag = true;
@@ -417,19 +421,21 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             $("#typeTips").html("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。")
             //$("#desc_talent_type").html("请先提供意向合作协议（合同）或企业名称预先核准材料，落地我市后再补齐上述材料");
             $(".talentType3").css("display", "table-row");
-            $("#talentType_first").css('display',"none");
+            $("#talentType_first").css('display', "none");
             $('#talentInfoForm').bootstrapValidator('addField', "pre_import_type", {validators: {notEmpty: {message: '请选择预引进类型'}}});
             if (TalentInfoInfoDlg.talentTypeOneTwo) {
                 TalentInfoInfoDlg.talentTypeOneTwo = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "labor_contract_rangetime");
                 $('#talentInfoForm').bootstrapValidator('removeField', "tax_insurance_month");
             }
-
+            text = $("#fst_work_time").prev("label").html().replace(/近三年/, "首次");
             break;
         default:
             $("#tipsBlock").css('display', 'none');
+            text = $("#fst_work_time").prev("label").html().replace(/近三年/, "首次");
             break;
     }
+    $("#fst_work_time").prev("label").html(text);
     for (var i = 0; i < $("[data-rel=talent_type]").length; i++) {
         let option = $("[data-rel=talent_type]").eq(i);
         let options = option.data("option").toString().split(",");

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

@@ -30,7 +30,9 @@ var TalentInfoInfoDlg = step == 1 ? {
         province: {validators: {notEmpty: {message: '户籍省份不能为空'}}},
         city: {validators: {notEmpty: {message: '户籍市不能为空'}}},
         nation: {validators: {notEmpty: {message: '民族不能为空'}}},
-        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}}
+        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
+        experience: {validators: {notEmpty: {message: '工作简历不能为空'}}},
+        education: {validators: {notEmpty: {message: '教育背景不能为空'}}}
     }
 } : {
     talentInfoInfoData: {},
@@ -278,7 +280,7 @@ TalentInfoInfoDlg.initFileTable = function () {
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                if(rel == 'card_number' || rel == 'name' || rel == 'talent_type' || rel == 'talent_edu' || rel=='fst_work_time'){
+                if($("#" + rel).parents(".table").length > 0){
                     var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
                 }else{
                     var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
@@ -290,7 +292,6 @@ TalentInfoInfoDlg.initFileTable = function () {
                     //指定了选项
                     let selectVal = $("#" + rel).data("value").toString();
                     let options = data["rows"][k].option.split(",");
-                    console.log(selectVal,options)
                     if (options.indexOf(selectVal) == -1) {
                         data["rows"][k].hidden = true;
                     }
@@ -519,8 +520,8 @@ TalentInfoInfoDlg.changeStudyAbroad = function () {
     if (is_abroad == 1) {
         $("#abroad_school").parent().css("display", "block");
         $("#abroad_major").parent().css("display", "block");
-        $('#talentInfoForm').bootstrapValidator('addField', "abroad_school", {validators: {notEmpty: {message: '毕业院校不能为空（留学）'}}});
-        $('#talentInfoForm').bootstrapValidator('addField', "abroad_major", {validators: {notEmpty: {message: '专业不能为空（留学）'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "abroad_school", {validators: {notEmpty: {message: '留学毕业院校不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "abroad_major", {validators: {notEmpty: {message: '留学专业不能为空'}}});
     } else {
         $("#abroad_school").val("").parent().css("display", "none");
         $("#abroad_major").val("").parent().css("display", "none");

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

@@ -337,7 +337,7 @@ TalentInfo.creatFieldCheckModal = function () {
             '                                    <li style="width:10%"><input type="checkbox" value="source" onchange="TalentInfo.sourceCheckd(this)"><span>申报来源</span></li>\n' +
             '                                    <li style="width:20.5%"><input type="checkbox" value="ourCitySource"><span>公布入选来源</span></li>\n' +
             '                                    <li style="width:20.5%"><input type="checkbox" value="fromCity"><span>入选来源县市</span></li>\n' +
-            '                                    <li style="width:20.5%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>\n' +
             '                                    <li style="width:31%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>\n' +
             '                                    <li style="width:31%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>\n' +
             '                                    <li style="width:10%"><input type="checkbox" id="talentArrangeCheckBox" value="talentArrange" onchange="TalentInfo.fieldCheckd(this)"><span>人才层次</span></li>\n' +

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

@@ -56,7 +56,7 @@ TalentInfoInfoDlg.initFileTable = function () {
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                if(rel == 'card_number' || rel == 'name' || rel == 'talent_type' || rel == 'talent_edu' || rel=='fst_work_time'){
+                if($("#" + rel).parents(".table").length > 0){
                     var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
                 }else{
                     var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");

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

@@ -310,7 +310,7 @@ TalentInfo.creatFieldCheckModal = function () {
         '                                    <li style="width:10%"><input type="checkbox" value="source" onchange="TalentInfo.sourceCheckd(this)"><span>申报来源</span></li>\n' +
         '                                    <li style="width:20.5%"><input type="checkbox" value="ourCitySource"><span>公布入选来源</span></li>\n' +
         '                                    <li style="width:20.5%"><input type="checkbox" value="fromCity"><span>入选来源县市</span></li>\n' +
-        '                                    <li style="width:20.5%"><input type="checkbox" value="qzBatch"><span>入选名单批次</span></li>\n' +
+        '                                    <li style="width:20.5%"><input type="checkbox" value="qzBatch"><span>入选名单的文件号及批次</span></li>\n' +
         '                                    <li style="width:31%"><input type="checkbox" value="certificateStartTime"><span>泉州高层次人才证书发证日期</span></li>\n' +
         '                                    <li style="width:31%"><input type="checkbox" value="qzgccrcActiveTime"><span>泉州高层次人才证书的有效期</span></li>\n' +
         '                                    <li style="width:10%"><input type="checkbox" id="talentArrangeCheckBox" value="talentArrange" onchange="TalentInfo.fieldCheckd(this)"><span>人才层次</span></li>\n' +