直认附件版

app/admin/controller/Talent.php

@@ -36,7 +36,7 @@ class Talent extends AdminController {
         } else {
             switch ($info["enterpriseType"]) {
                 case 1:
-                    $tpl = $info["isImport"] ? "nofile_talentInfo_common_check" : "talentInfo_common_check";
+                    $tpl = "talentInfo_common_check"; //$info["isImport"] ? "nofile_talentInfo_common_check" : "talentInfo_common_check";
                     return view($tpl, ["info" => $info]);
                 case 2:
                     return view("talentInfo_common_checkIC", ["info" => $info]);
@@ -775,7 +775,7 @@ class Talent extends AdminController {
 //审核成功,并取消设置越过部门并审
             $log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
             $data["pass_dept_check"] = 0;
-            if ($talent_info["isImport"]) {
+            if ($talent_info["isImport"] && $talent_info["isMatchZhiren"]) {
                 $data["pass_dept_check"] = 1;
             }
         } else if ($params["checkState"] == 4) {
@@ -1282,7 +1282,7 @@ class Talent extends AdminController {
             if (in_array($checkState, [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS])) {
                 switch ($checkState) {
                     case TalentState::FST_SUBMIT:
-                        $fields = DictApi::getTalentFields(1);
+                        $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
                         $field_tmp = [];
                         foreach ($fields as $key => $field) {
                             $field_tmp[] = ["key" => $key, "value" => $field];
@@ -1323,7 +1323,7 @@ class Talent extends AdminController {
                         $process = 1;
                         break;
                     case TalentState::BASE_VERIFY_PASS:
-                        $fields = DictApi::getTalentFields(1);
+                        $fields = DictApi::getTalentFields(1, $talent_info["isImport"]);
                         $field_tmp = [];
                         foreach ($fields as $key => $field) {
                             $field_tmp[] = ["key" => $key, "value" => $field];
@@ -1337,29 +1337,29 @@ class Talent extends AdminController {
                         $process = 2;
                         break;
                     case TalentState::SCND_SUBMIT:
-                        $fields = DictApi::getTalentFields(2);
+                        $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
                         $process = 3;
                         break;
                     case TalentState::FST_VERIFY_PASS:
                         $tc = TalentConditionApi::getOne($talent_info["talent_condition"]);
                         if ($tc["companyIds"] && $talent_info["pass_dept_check"] != 1) {
                             $process = 4;
-                            $fields = DictApi::getTalentFields(3);
+                            $fields = DictApi::getTalentFields(3, $talent_info["isImport"]);
                         } else {
                             $process = 5;
-                            $fields = DictApi::getTalentFields(2);
+                            $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
                         }
                         break;
                     case TalentState::DEPT_VERIFY_PASS:
                         $process = 5;
-                        $fields = DictApi::getTalentFields(2);
+                        $fields = DictApi::getTalentFields(2, $talent_info["isImport"]);
                         break;
                 }
                 if ($isMix && $process != 4) {
                     if ($enterprise["type"] == 2) {
                         $fields = DictApi::getTalentFields_IC();
                     } else {
-                        $fields = DictApi::getTalentFields(4);
+                        $fields = DictApi::getTalentFields(4, $talent_info["isImport"]);
                     }
                 }
                 if ($checkState != TalentState::FST_SUBMIT) {

app/admin/view/talent/talentInfo_common_check.html

@@ -85,6 +85,7 @@
                                         <input type="hidden" name="type" id="type" value="1">
                                         <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
                                         <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$info.enterpriseTag}">
+                                        <input type="hidden" name="import" id="import" value="{$info.isImport}"/>
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
@@ -248,22 +249,20 @@
                                                 </div>
                                             </td>
                                         </tr>
-                                        {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
+                                        {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg']) and in_array($info['talent_type'],[1,2])"}
                                         <tr>
                                             <td>
                                                 <div class="rowGroup">
-                                                    <label class="control-label spacing td-label">{if condition="$info['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
+                                                    <label class="control-label spacing td-label">{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>
-                                            {if condition="$info['talent_type'] eq 1"}
                                             <td id="come_in_jin_str">
                                                 <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
                                                 <div class="word-wrap">
                                                     如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
                                                 </div>
                                             </td>
-                                            {/if}
                                         </tr>
                                         {/if}
                                         {/if}
@@ -429,10 +428,63 @@
                                             </td>
                                         </tr>
                                     </table>
-
+                                    {if condition="$info['fjImport'] == 1 or $info['qzImport'] == 1"}
+                                    <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;" class="table table-bordered">
+                                        {if condition="$info['fjImport'] == 1"}
+                                        <tr>
+                                            <td align="center" class="word-wrap">
+                                                导入来源标签：福建省高层次人才
+                                            </td>
+                                            <td align="center" class="word-wrap">
+                                                人才类型：{$info["fj_talent_level"]}
+                                            </td>
+                                            <td align="center" class="word-wrap">
+                                                入选条款： {$info["fj_talent_condition_text"]}
+                                            </td>
+                                            <td align="center" class="word-wrap" width="50%">
+                                                {$info["fj_talent_info"]}
+                                            </td>
+                                        </tr>
+                                        {/if}
+                                        {if condition="$info['qzImport'] == 1"}
+                                        <tr>
+                                            <td align="center" class="word-wrap">
+                                                导入来源标签：泉州市高层次人才
+                                            </td>
+                                            <td align="center" class="word-wrap">
+                                                人才层次：{$info["qz_talent_level"]}
+                                            </td>
+                                            <td align="center" class="word-wrap">
+                                                认定条件： {$info["qz_talent_condition_text"]}
+                                            </td>
+                                            <td align="center" class="word-wrap" width="50%">
+                                                {$info["qz_talent_info"]}
+                                            </td>
+                                        </tr>
+                                        {/if}
+                                    </table>
+                                    {/if}
                                     <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                         <tr>
-                                            <td colspan="3">
+                                            {if condition="$info['isImport']"}
+                                            <td colspan="4">
+                                                <div class="rowGroup col-sm-3">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>是否符合直认条件</label>                                                        
+                                                    <input type="radio" name="isMatchZhiren" value="1" {eq name="info.isMatchZhiren" value="1"}checked{/eq}/>是&nbsp;&nbsp;
+                                                           <input type="radio" name="isMatchZhiren" value="0" {if condition="!$info['isMatchZhiren']"}checked{/if}/>否
+                                                </div>
+                                                <div class="rowGroup col-sm-9">
+                                                    <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.source}">{$info.sourceName}</option>
+                                                        </select>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </td>
+                                            {else/}
+                                            <td colspan="4">
                                                 <div class="rowGroup">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
                                                     <select class="form-control" id="source">
@@ -441,62 +493,63 @@
                                                     </select>
                                                 </div>
                                             </td>
-                                            <td rowspan="7" style="width: 100%">
+                                            {/if}
+                                            <td rowspan="4" style="width: 100%">
                                                 <table class="fileTable"></table>
                                             </td>
                                         </tr>
-                                        {if condition="$info['source_batch']"}
                                         <tr>
-                                            <td colspan="3">
+                                            {if condition="$info['source_batch']"}
+                                            <td>
                                                 <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}>
+                                            {/if}
+                                            {if condition="$info['source_city'] || $info['source_county']"}
+                                            <td>
+                                                <div class="rowGroup" {if condition="!$info['source_city']"}style="display:none;"{/if}>
                                                      <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
                                                     <input type="text" class="form-control" id="source_city" name="source_city" value="{$info.sourceCityName}"/>
                                                 </div>
-                                                <div class="rowGroup col-sm-6" {if condition="!$info['source_county']"}style="display:none;"{/if}>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup" {if condition="!$info['source_county']"}style="display:none;"{/if}>
                                                      <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
                                                     <input type="text" class="form-control" id="source_county" name="source_county" value="{$info.sourceCountyName}"/>
                                                 </div>
                                             </td>
-                                        </tr>
-                                        {/if}
-                                        {if condition="in_array($info['source'],[1,3])"}
-                                        <tr>
-                                            <td colspan="3">
-                                                <div class="rowGroup col-sm-6 fujian_highcert">
+                                            {/if}
+                                            {if condition="in_array($info['source'],[1,3])"}
+                                            <td>
+                                                <div class="rowGroup 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">
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup 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($info['source'],[2,4])"}
-                                        <tr>
-                                            <td colspan="3">
-                                                <div class="rowGroup col-sm-6 quanzhou_highcert">
+                                            {/if}
+                                            {if condition="in_array($info['source'],[2,4])"}
+                                            <td>
+                                                <div class="rowGroup 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">
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup 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>
+                                            {/if}
                                         </tr>
-                                        {/if}
                                         <tr>
                                             <td colspan="3">
                                                 <div class="rowGroup col-sm-6">

app/common/api/DictApi.php

@@ -138,7 +138,7 @@ class DictApi {
         return $dict;
     }
 
-    public static function getTalentFields($step) {
+    public static function getTalentFields($step, $isImport = 0) {
         $dict1 = [
             "talent_type" => "人才类型",
             "tax_insurance_month" => "在我市缴交社会保险或个人所得税月份",
@@ -193,6 +193,9 @@ class DictApi {
             "quanzhou_highcert_exptime" => "泉州高层次人才证书有效期",
             "annual_salary" => "上一年度年薪（元）"
         ];
+        if ($isImport) {
+            $dict2 = array_merge(["isMatchZhiren" => "是否符合直认条件"], $dict2);
+        }
         if ($step == 1) {
             return $dict1;
         }

app/enterprise/controller/Talent.php

@@ -154,8 +154,9 @@ class Talent extends EnterpriseController {
         }
         $id = $request->param("id");
         $info = \app\common\api\VerifyApi::getTalentInfoById($id);
-        if ($info["isImport"])
-            $tpl = "no_file_view";
+        if ($info["isImport"]) {
+            //$tpl = "no_file_view";
+        }
         return view($tpl, ["row" => $info]);
     }
 
@@ -300,7 +301,7 @@ class Talent extends EnterpriseController {
         }
         $checkState = $info["checkState"];
         if ($checkState == TalentState::SCND_SAVE || !$id) {
-            $field_dict = \app\common\api\DictApi::getTalentFields(4);
+            $field_dict = \app\common\api\DictApi::getTalentFields(4, $info["isImport"]);
 
             $no_empty = ["name", "nation", "card_type", "card_number", "sex", "birthday", "politics", "nationality", "province", "city", "county", "talent_type", "experience", "education",
                 "talent_arrange", "talent_condition", "highest_degree", "graduate_school", "major", "bank", "bank_number", "bank_branch_name",
@@ -363,8 +364,8 @@ class Talent extends EnterpriseController {
                 echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
                 exit;
             }
-
-            if ($condition_info["bindFileTypes"] && $info["source"] == 5) {
+            $isMatchZhiren = $info["isImport"] && $params["isMatchZhiren"] == 1 ? true : false;
+            if ($condition_info["bindFileTypes"] && $info["source"] == 5 && !$isMatchZhiren) {
                 $whr[] = ["id", "in", $condition_info["bindFileTypes"]];
                 $whr[] = ["must", "=", 1];
             }
@@ -424,7 +425,7 @@ class Talent extends EnterpriseController {
             $whr[] = ["typeId", "in", $ft_ids];
             $distinct_filetypes = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->select();
             $upload_type_counts = count($distinct_filetypes);
-            if ($upload_type_counts != count($ft_ids) && !$info["isImport"]) {
+            if ($upload_type_counts != count($ft_ids)) {
                 $res = ["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"];
                 echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
                 exit;
@@ -682,7 +683,7 @@ class Talent extends EnterpriseController {
             }
 
             $data["apply_year"] = $batch["batch"];
-
+            $data["isMatchZhiren"] = $param["isMatchZhiren"] ?: 0;
             $all_valid_keys = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "county", "nation", "politics", "experience", "education",
                 "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",

app/enterprise/view/talent/apply.html

@@ -286,7 +286,7 @@
                                             <tr style="display:none" id="come_in_jin">
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label">{if condition="$row['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
+                                                        <label class="control-label spacing td-label">{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>
                                                 </td>

app/enterprise/view/talent/view.html

@@ -80,6 +80,7 @@
                                         <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}">
+                                        <input type="hidden" name="import" id="import" value="{$row.isImport}"/>
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
@@ -244,22 +245,20 @@
                                                     </div>
                                                 </td>
                                             </tr>
-                                            {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
+                                            {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg']) and 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"}近三年{else/}首次{/if}来晋工作时间</label>
+                                                        <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>
-                                                {if condition="$row['talent_type'] eq 1"}
                                                 <td id="come_in_jin_str">
                                                     <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
                                                     <div class="word-wrap">
                                                         如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
                                                     </div>
                                                 </td>
-                                                {/if}
                                             </tr>
                                             {/if}
                                             {/if}
@@ -429,76 +428,126 @@
                                                 </td>
                                             </tr>
                                         </table>
-
+                                        {if condition="$row['fjImport'] == 1 or $row['qzImport'] == 1"}
+                                        <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;" class="table table-bordered">
+                                            {if condition="$row['fjImport'] == 1"}
+                                            <tr>
+                                                <td align="center" class="word-wrap">
+                                                    导入来源标签：福建省高层次人才
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    人才类型：{$row["fj_talent_level"]}
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    入选条款： {$row["fj_talent_condition_text"]}
+                                                </td>
+                                                <td align="center" class="word-wrap" width="50%">
+                                                    {$row["fj_talent_info"]}
+                                                </td>
+                                            </tr>
+                                            {/if}
+                                            {if condition="$row['qzImport'] == 1"}
+                                            <tr>
+                                                <td align="center" class="word-wrap">
+                                                    导入来源标签：泉州市高层次人才
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    人才层次：{$row["qz_talent_level"]}
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    认定条件： {$row["qz_talent_condition_text"]}
+                                                </td>
+                                                <td align="center" class="word-wrap" width="50%">
+                                                    {$row["qz_talent_info"]}
+                                                </td>
+                                            </tr>
+                                            {/if}
+                                        </table>
+                                        {/if}
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
-                                                <td colspan="3">
+                                                {if condition="$row['isImport']"}
+                                                <td colspan="4">
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>是否符合直认条件</label>                                                        
+                                                        <input type="radio" name="isMatchZhiren" value="1" {eq name="row.isMatchZhiren" value="1"}checked{/eq} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>是&nbsp;&nbsp;
+                                                               <input type="radio" name="isMatchZhiren" value="0" {if condition="!$row['isMatchZhiren']"}checked{/if} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>否
+                                                    </div>
+                                                    <div class="rowGroup col-sm-9">
+                                                        <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>
+                                                {else/}
+                                                <td colspan="4">
                                                     <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%">
+                                                {/if}
+                                                <td rowspan="4" style="width: 100%">
                                                     <table class="fileTable"></table>
                                                 </td>
                                             </tr> 
-                                            {if condition="$row['source_batch']"}
                                             <tr>
-                                                <td colspan="3">
+                                                {if condition="$row['source_batch']"}
+                                                <td>
                                                     <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}>
+                                                {/if}
+                                                {if condition="$row['source_city'] || $row['source_county']"}
+                                                <td>
+                                                    <div class="rowGroup" {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>
-                                                    <div class="rowGroup col-sm-6" {if condition="!$row['source_county']"}style="display:none;"{/if}>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup" {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>
                                                 </td>
-                                            </tr>
-                                            {/if}
-                                            {if condition="in_array($row['source'],[1,3])"}
-                                            <tr>
-                                                <td colspan="3">
-                                                    <div class="rowGroup col-sm-6 fujian_highcert">
+                                                {/if}
+                                                {if condition="in_array($row['source'],[1,3])"}
+                                                <td>
+                                                    <div class="rowGroup 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="{$row.fujian_highcert_pubtime}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-6 fujian_highcert">
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup 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="{$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">
+                                                {/if}
+                                                {if condition="in_array($row['source'],[2,4])"}
+                                                <td>
+                                                    <div class="rowGroup 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="{$row.quanzhou_highcert_pubtime}"/>
                                                     </div>
-                                                    <div class="rowGroup col-sm-6 quanzhou_highcert">
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup 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="{$row.quanzhou_highcert_exptime}"/>
                                                     </div>
                                                 </td>
+                                                {/if}
                                             </tr>
-                                            {/if}
                                             <tr>
                                                 <td colspan="3">
                                                     <div class="rowGroup col-sm-6">

public/static/modular/gate/integral/integralInfo.js

@@ -554,14 +554,16 @@ IntegralInfoDlg.setNoChangeField = function () {
         if (fields != null && fields != '') {
             var arr = fields.split(",");
             for (var key in arr) {
-                var name = $("#" + arr[key]).prop("tagName");
-                if (name == 'select' || name == 'SELECT') {
-                    $("#" + arr[key]).removeAttr("disabled");
-                } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                    $("#" + arr[key]).removeAttr("readonly");
-                } else {
-                    if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                if (arr[key] != "") {
+                    var name = $("#" + arr[key]).prop("tagName");
+                    if (name == 'select' || name == 'SELECT') {
+                        $("#" + arr[key]).removeAttr("disabled");
+                    } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
+                        $("#" + arr[key]).removeAttr("readonly");
+                    } else {
+                        if (typeof name == "undefined") {
+                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                        }
                     }
                 }
             }

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

@@ -954,14 +954,16 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         if (fields != null && fields != '') {
             var arr = fields.split(",");
             for (var key in arr) {
-                var name = $("#" + arr[key]).prop("tagName");
-                if (name == 'select' || name == 'SELECT') {
-                    $("#" + arr[key]).removeAttr("disabled");
-                } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                    $("#" + arr[key]).removeAttr("readonly");
-                } else {
-                    if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                if (arr[key] != "") {
+                    var name = $("#" + arr[key]).prop("tagName");
+                    if (name == 'select' || name == 'SELECT') {
+                        $("#" + arr[key]).removeAttr("disabled");
+                    } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
+                        $("#" + arr[key]).removeAttr("readonly");
+                    } else {
+                        if (typeof name == "undefined") {
+                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                        }
                     }
                 }
             }

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

@@ -741,14 +741,16 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         if (fields != null && fields != '') {
             var arr = fields.split(",");
             for (var key in arr) {
-                var name = $("#" + arr[key]).prop("tagName");
-                if (name == 'select' || name == 'SELECT') {
-                    $("#" + arr[key]).removeAttr("disabled");
-                } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                    $("#" + arr[key]).removeAttr("readonly");
-                } else {
-                    if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                if (arr[key] != "") {
+                    var name = $("#" + arr[key]).prop("tagName");
+                    if (name == 'select' || name == 'SELECT') {
+                        $("#" + arr[key]).removeAttr("disabled");
+                    } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
+                        $("#" + arr[key]).removeAttr("readonly");
+                    } else {
+                        if (typeof name == "undefined") {
+                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                        }
                     }
                 }
             }

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

@@ -197,7 +197,8 @@ TalentInfoInfoDlg.collectData = function () {
             .set('fujian_highcert_pubtime')
             .set('fujian_highcert_exptime')
             .set('quanzhou_highcert_pubtime')
-            .set('quanzhou_highcert_exptime');
+            .set('quanzhou_highcert_exptime')
+            .set('isMatchZhiren');
     if ($("#province").val() != null && $("#province").val() != '') {
         this.talentInfoInfoData["province_name"] = $("#province").find("option:selected").text();
     }
@@ -303,6 +304,10 @@ TalentInfoInfoDlg.initFileTable = function () {
                 }
             } else {
                 if (data["rows"][k].isConditionFile) {
+                    var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
+                    var isImport = parseInt($("#import").val());
+                    if (isImport == 1 && isMatchZhiren)
+                        continue;
                     var tableIndex = 0;
                     if ($("#talent_condition").parents(".table").length > 0) {
                         tableIndex = $("#talent_condition").parents(".table").find("table.fileTable").index(".fileTable");
@@ -506,7 +511,8 @@ TalentInfoInfoDlg.ajaxGetConditionFile = function (source) {
                     }
                 });
             }
-            if (source != "5") {
+            var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
+            if (source != "5" || isMatchZhiren == 1) {
                 return;
             }
             var conditionFileTable = $("#talent_condition").parents(".table").find(".fileTable");
@@ -696,7 +702,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
             }
-            text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/首次/, "近三年") : "";
+            text = "近三年来晋工作时间";//$("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年（首次）/, "近三年") : "";
             $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
             $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'table-cell') : "";
             break;
@@ -719,9 +725,9 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
             }
-            text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
+            text = "近三年（首次）来晋工作时间";//$("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "近三年（首次）") : "";
             $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'table-row') : "";
-            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'none') : "";
+            $("#come_in_jin_str").length > 0 ? $("#come_in_jin_str").css('display', 'table-cell') : "";
             break;
         case "3":
             TalentInfoInfoDlg.talentTypeFlag = true;
@@ -825,15 +831,11 @@ TalentInfoInfoDlg.sourceChange = function () {
     if (source != 5) {
         $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     } else {
-        var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
-        var isImport = parseInt($("#import").val());
-        if ((isImport > 0 && !isMatchZhiren) || !isImport) {
-            TalentInfoInfoDlg.ajaxGetConditionFile(source);
-        }
+        TalentInfoInfoDlg.ajaxGetConditionFile(source);
     }
     $("#source").parents("td").attr("colspan", columns);
     $("#talent_arrange").parents("td").attr("colspan", columns);
-    $("#talent_condition_chosen").parents("td").attr("colspan", columns - 1);
+    $("#talent_condition").parents("td").attr("colspan", columns - 1);
 }
 TalentInfoInfoDlg.isMatchZhirenChange = function () {
     var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
@@ -1087,14 +1089,16 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         if (fields != null && fields != '') {
             var arr = fields.split(",");
             for (var key in arr) {
-                var name = $("#" + arr[key]).prop("tagName");
-                if (name == 'select' || name == 'SELECT') {
-                    $("#" + arr[key]).removeAttr("disabled");
-                } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                    $("#" + arr[key]).removeAttr("readonly");
-                } else {
-                    if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                if (arr[key] != "") {
+                    var name = $("#" + arr[key]).prop("tagName");
+                    if (name == 'select' || name == 'SELECT') {
+                        $("#" + arr[key]).removeAttr("disabled");
+                    } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
+                        $("#" + arr[key]).removeAttr("readonly");
+                    } else {
+                        if (typeof name == "undefined") {
+                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                        }
                     }
                 }
             }

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

@@ -342,7 +342,7 @@ TalentInfoInfoDlg.initFileTable = function () {
                 var checkState = $("#checkState").val();
                 var realState = $("#realState").val();
                 for (var key in data) {
-                    var btn = "";                    
+                    var btn = "";
                     if (Feng.isEmptyStr(checkState) || (checkState == 8 && realState == 8) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(row.id) != -1)) {
                         btn = "<button type=\'button\' onclick=\"TalentInfoInfoDlg.checkFile(this,'" + row.fState + "','" + row.id + "','" + data[key].id + "')\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
                                 "<i class=\"fa fa-paste\"></i>修改" +
@@ -575,14 +575,16 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         if (fields != null && fields != '') {
             var arr = fields.split(",");
             for (var key in arr) {
-                var name = $("#" + arr[key]).prop("tagName");
-                if (name == 'select' || name == 'SELECT') {
-                    $("#" + arr[key]).removeAttr("disabled");
-                } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                    $("#" + arr[key]).removeAttr("readonly");
-                } else {
-                    if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                if (arr[key] != "") {
+                    var name = $("#" + arr[key]).prop("tagName");
+                    if (name == 'select' || name == 'SELECT') {
+                        $("#" + arr[key]).removeAttr("disabled");
+                    } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
+                        $("#" + arr[key]).removeAttr("readonly");
+                    } else {
+                        if (typeof name == "undefined") {
+                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                        }
                     }
                 }
             }

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

@@ -895,14 +895,16 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         if (fields != null && fields != '') {
             var arr = fields.split(",");
             for (var key in arr) {
-                var name = $("#" + arr[key]).prop("tagName");
-                if (name == 'select' || name == 'SELECT') {
-                    $("#" + arr[key]).removeAttr("disabled");
-                } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
-                    $("#" + arr[key]).removeAttr("readonly");
-                } else {
-                    if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                if (arr[key] != "") {
+                    var name = $("#" + arr[key]).prop("tagName");
+                    if (name == 'select' || name == 'SELECT') {
+                        $("#" + arr[key]).removeAttr("disabled");
+                    } else if (name == "input" || name == 'textarea' || name == "INPUT" || name == 'TEXTAREA') {
+                        $("#" + arr[key]).removeAttr("readonly");
+                    } else {
+                        if (typeof name == "undefined") {
+                            $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
+                        }
                     }
                 }
             }

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

@@ -83,6 +83,10 @@ TalentInfoInfoDlg.initFileTable = function () {
                 }
             } else {
                 if (data["rows"][k].isConditionFile) {
+                    var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
+                    var isImport = parseInt($("#import").val());
+                    if (isImport == 1 && isMatchZhiren)
+                        continue;
                     var tableIndex = 0;
                     if ($("#talent_condition").parents(".table").length > 0) {
                         tableIndex = $("#talent_condition").parents(".table").find("table.fileTable").index(".fileTable");
@@ -180,6 +184,17 @@ $(function () {
         });
         Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
     }
+    var source = $("#source").val();
+    var columns = 3;
+    if (source == 1 || source == 2) {
+        columns = 3;
+    } else if (source == 3 || source == 4) {
+        columns = 4;
+    }
+
+    $("#source").parents("td").attr("colspan", columns);
+    $("#talent_arrange").parents("td").attr("colspan", columns);
+    $("#talent_condition").parents("td").attr("colspan", columns - 1);
 });
 
 

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

@@ -86,6 +86,10 @@ TalentInfoInfoDlg.initFileTable = function () {
                 }
             } else {
                 if (data["rows"][k].isConditionFile) {
+                    var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
+                    var isImport = parseInt($("#import").val());
+                    if (isImport == 1 && isMatchZhiren)
+                        continue;
                     var tableIndex = 0;
                     if ($("#talent_condition").parents(".table").length > 0) {
                         tableIndex = $("#talent_condition").parents(".table").find("table.fileTable").index(".fileTable");
@@ -823,6 +827,19 @@ $(function () {
     if (type == 1) {
         TalentInfoInfoDlg.initFileTable();
     }
+    
+    var source = $("#source").val();
+    var columns = 3;
+    if (source == 1 || source == 2) {
+        columns = 3;
+    } else if (source == 3 || source == 4) {
+        columns = 4;
+    }
+
+    $("#source").parents("td").attr("colspan", columns);
+    $("#talent_arrange").parents("td").attr("colspan", columns);
+    $("#talent_condition").parents("td").attr("colspan", columns - 1);
+    
     //$(".ibox-content").viewer({fullscreen: false});
     Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": $("#id").val(), "typeFileId": "", "active": 1})
 });