Merge branch 'master' of http://59.57.98.130:3000/jjhc/report

app/admin/controller/SysConfig.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\common\AdminController;
+use think\facade\Db;
+
+/**
+ * Description of SysConfig
+ *
+ * @author sgq
+ */
+class SysConfig extends AdminController {
+
+    private $valid_key = ["register"];
+
+    public function index() {
+        if ($this->request->isPost()) {
+            $params = $this->request->param();
+            $data = [];
+            foreach ($params as $key => $value) {
+                if (in_array($key, $this->valid_key)) {
+                    $_config = Db::table("sys_config")->where("key", $key)->find();
+                    if ($_config) {
+                        $data[] = ["id" => $_config["id"], "value" => json_encode($value), "updateTime" => date("Y-m-d H:i:s"), "updateUser" => session("user")["uid"]];
+                    } else {
+                        $data[] = ["key" => $key, "value" => json_encode($value), "createTime" => date("Y-m-d H:i:s"), "createUser" => session("user")["uid"]];
+                    }
+                }
+            }
+            $model = new \app\common\model\SysConfig();
+            $model->saveAll($data);
+            $res = ["code" => 200, "msg" => "保存成功"];
+            echo sprintf("<script>parent.SysConfig.callback(%s);</script>", json_encode($res));
+            exit;
+        }
+        $configs = \think\facade\Db::table("sys_config")->select();
+        $tmp = [];
+        foreach ($configs as $config) {
+            $tmp[$config["key"]] = json_decode($config["value"], true);
+        }unset($config);
+        return view("", ["config" => $tmp]);
+    }
+
+}

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/sys_config/index.html

@@ -0,0 +1,140 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .panel-heading{
+        color:#333;
+        background-color:#f5f5f5;
+        border-color:#ddd
+    }
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    .panel label {
+        font-size: xx-small;
+    }
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    .control-label{
+        color: #337ab7;
+    }
+    .rowGroup{
+        padding-bottom: 5px;
+    }
+    .imgs>li{
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 35px;
+        width:100%;
+        padding:5px 0;
+    }
+    .table .td-label{
+        display: block;
+        text-align: left;
+        border-bottom: 1px solid #ccc;
+        margin-bottom: 10px;
+    }
+    .imgs li>div{float:left;}
+    .info td{background:#f5f5f5 !important;}
+    .word-wrap{
+        width:100%;
+        white-space:nowrap;
+        word-wrap:break-word;
+        word-break:break-all;
+        text-overflow:ellipsis;
+        overflow:hidden;
+    }
+    .control-symbol{
+        display: inline-block;
+        position:absolute;
+        right:0;
+        top:50%;
+        font-style:normal;
+        margin-top: -16px;
+        height:32px;
+        width:32px;
+        line-height:32px;
+        text-align:center;
+        border-left:1px solid #ddd;
+    }
+    #annual_salary{padding-right:32px;}
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12" >
+                    <form id="configForm" action="/admin/sys_config" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                        <div class="tab-content">
+                            <div id="tab-1" class="tab-pane active">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">开放注册时间设置</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>晋江市现代产业体系人才-4341现代产业体系企业</label>
+                                                        <input type="text" class="form-control rangedate" id="register_jjrc_4341" name="register[jjrc_4341]" value="{$config.register.jjrc_4341}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>晋江市现代产业体系人才-非4341现代产业体系企业</label>
+                                                        <input type="text" class="form-control rangedate" id="register_jjrc_n4341" name="register[jjrc_no4341]" value="{$config.register.jjrc_no4341}"/>
+                                                    </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 rangedate" id="register_jcrc" name="register[jcrc]" value="{$config.register.jcrc}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民办非企业</label>
+                                                        <input type="text" class="form-control rangedate" id="register_mbfqy" name="register[mbfqy]" value="{$config.register.mbfqy}"/>
+                                                    </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 rangedate" id="register_sy_nomedia" name="register[sy_nomedia]" value="{$config.register.sy_nomedia}"/>
+                                                    </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 rangedate" id="register_sy_media" name="register[sy_media]" value="{$config.register.sy_media}"/>
+                                                    </div>
+                                                <td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-sm-12" style="text-align: center;margin-top: 10px;">
+                                        <button type="button" class="btn btn-sm btn-primary " onclick="SysConfig.save()" id="ensure">
+                                            <i class="fa fa-check"></i>&nbsp;保存
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/system/config/sys_config.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

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/common/controller/Auth.php

@@ -15,6 +15,63 @@ use app\common\api\UploadApi;
 
 class Auth extends BaseController {
 
+    private function checkRegisterTime($special, $type1, $type2 = null) {
+        $now = time();
+        $key = "";
+        $agency_label = "";
+        $registerCfg = \app\common\model\SysConfig::where("key", "register")->find();
+        if ($registerCfg) {
+            $registerCfg = json_decode($registerCfg["value"], true);
+            switch ($special) {
+                case 0://企业
+                    if ($type1 == 1) {
+                        //晋江人才
+                        if ($type2 == 1) {
+                            //4341
+                            $key = "jjrc_4341";
+                            $agency_label = "晋江市现代产业体系人才（4341现代产业体系）";
+                        } else {
+                            //非4341
+                            $key = "jjrc_no4341";
+                            $agency_label = "晋江市现代产业体系人才（非4341现代产业体系）";
+                        }
+                    } else if ($type1 == 2) {
+                        //电路人才
+                        $key = "jcrc";
+                        $agency_label = "集成电路优秀人才";
+                    }
+                    break;
+                case 1://事业
+                    if ($type1 == "institution_common") {
+                        $key = "sy_nomedia";
+                        $agency_label = "事业单位-非媒体单位";
+                    } else if ($type1 == "institution_media") {
+                        $key = "sy_media";
+                        $agency_label = "事业单位-媒体单位";
+                    }
+                    break;
+                case 3://民非
+                    if ($type1 == "minfei") {
+                        $key = "mbfqy";
+                        $agency_label = "民办非企业";
+                    }
+                    break;
+            }
+            if ($registerCfg[$key]) {
+                list($startdate, $enddate) = explode(" - ", $registerCfg[$key]);
+                $starttime = strtotime($startdate . "00:00:00");
+                $endtime = strtotime($enddate . "23:59:59");
+                if ($starttime && $endtime && ($now < $starttime || $now > $endtime)) {
+                    $response_object = new \StdClass();
+                    $response_object->code = 500;
+                    $response_object->msg = sprintf("您注册的类型【%s】不在可注册时间内(%s)", $agency_label, $registerCfg[$key]);
+                    return $response_object;
+                }
+            }
+        }
+        return true;
+    }
+
     public function register() {
         $msg = "";
         if ($this->request->isPost()) {
@@ -61,6 +118,9 @@ class Auth extends BaseController {
                         if ($data['type'] == 1) {
                             if ($data["agencyType"] == 1) {
                                 validate(Enterprise::class)->batch(true)->scene('add')->check($data);
+                                $registerTimeLimitReturnObj = $this->checkRegisterTime(0, $data['type'], $data["agencyType"]);
+                                if ($registerTimeLimitReturnObj !== true)
+                                    return \StrUtil::back($registerTimeLimitReturnObj, "Register.epCallBack");
                                 if (!array_key_exists('domainImg', $files) || $files['domainImg'] == '') {
                                     $response_object->code = 500;
                                     $response_object->msg = '行业领域佐证材料不能为空';
@@ -68,6 +128,9 @@ class Auth extends BaseController {
                                 }
                             } else {
                                 validate(Enterprise::class)->batch(true)->scene('add2')->check($data);
+                                $registerTimeLimitReturnObj = $this->checkRegisterTime(0, $data['type'], $data["agencyType"]);
+                                if ($registerTimeLimitReturnObj !== true)
+                                    return \StrUtil::back($registerTimeLimitReturnObj, "Register.epCallBack");
                             }
                             $checkTypes = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
                             if (in_array($data["enterpriseType"], $checkTypes) && (!array_key_exists('typeImg', $files) || $files['typeImg'] == '')) {
@@ -77,6 +140,9 @@ class Auth extends BaseController {
                             }
                         } else {
                             validate(Enterprise::class)->batch(true)->scene('jc_add')->check($data); //集成电路
+                            $registerTimeLimitReturnObj = $this->checkRegisterTime(0, $data['type']);
+                            if ($registerTimeLimitReturnObj !== true)
+                                return \StrUtil::back($registerTimeLimitReturnObj, "Register.epCallBack");
                         }
                         if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
                             $response_object->code = 500;
@@ -97,6 +163,9 @@ class Auth extends BaseController {
                         break;
                     case 'minfei':
                         $data['type'] = 1;
+                        $registerTimeLimitReturnObj = $this->checkRegisterTime(3, $data['organizationTag']);
+                        if ($registerTimeLimitReturnObj !== true)
+                            return \StrUtil::back($registerTimeLimitReturnObj, "Register.epCallBack");
                         if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
                             $response_object->code = 500;
                             $response_object->msg = '营业执照不能为空';
@@ -117,6 +186,9 @@ class Auth extends BaseController {
                     case 'shiye':
                         $data['type'] = 1;
                         validate(Enterprise::class)->batch(true)->scene('sy_add')->check($data); //事业单位
+                        $registerTimeLimitReturnObj = $this->checkRegisterTime(1, $data['institutionTag']);
+                        if ($registerTimeLimitReturnObj !== true)
+                            return \StrUtil::back($registerTimeLimitReturnObj, "Register.epCallBack");
                         if (!array_key_exists('imgurl', $files) || $files['imgurl'] == '') {
                             $response_object->code = 500;
                             $response_object->msg = '法人代表证或批文不能为空';

app/common/model/SysConfig.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+/**
+ * Description of SysConfig
+ *
+ * @author sgq
+ */
+class SysConfig extends Model {
+
+    protected $table = "sys_config";
+
+}

app/enterprise/controller/Api.php

@@ -391,11 +391,38 @@ class Api extends EnterpriseController {
                     $record->newBank = $data['bank'];
                     $record->newBankNetwork = $data['bankNetwork'];
                 } else {
-                    $fields = array_filter(explode(",", $record->modify_fields));
-                    for ($i = 0; $i < count($fields); $i++) {
-                        $key = lcfirst(substr($fields[$i], 3));
-                        $record[$fields[$i]] = $data[$key]; //仅可修改选择的字段
+                    /* 注释变更驳回如果恢复，这段要去掉 */
+                    $record->newAgencyType = $data['agencyType'];
+                    $record->newName = htmlspecialchars($data['name']);
+                    $record->newIdCard = htmlspecialchars($data['idCard']);
+                    if ($data["agencyType"] == 1) {
+                        $record->newIndustryFieldNew = $data['industryFieldNew'];
+                        $record->newIndustryFieldOld = $data['industryFieldOld'];
+                    } else {
+                        $record->newIndustryFieldNew = null;
+                        $record->newIndustryFieldOld = null;
                     }
+                    $record->newStreet = $data['street'];
+                    $record->newAddress = $data['address'];
+                    $record->newLegal = $data['legal'];
+                    $record->newEphone = $data['ephone'];
+                    $record->newAgentName = $data['agentName'];
+                    $record->newAgentEmail = $data['agentEmail'];
+                    $record->newAgentPhone = $data['agentPhone'];
+                    $record->newEnterpriseTag = $data['enterpriseTag'];
+                    $record->newOrganizationTag = $data['organizationTag'];
+                    $record->newInstitutionTag = $data['institutionTag'];
+                    $record->newEnterpriseType = $data['enterpriseType'];
+                    $record->newBankCard = $data['bankCard'];
+                    $record->newBank = $data['bank'];
+                    $record->newBankNetwork = $data['bankNetwork'];
+                    /* 注释变更驳回如果恢复，这段要去掉 */
+
+                    /* 注释变更驳回$fields = array_filter(explode(",", $record->modify_fields));
+                      for ($i = 0; $i < count($fields); $i++) {
+                      $key = lcfirst(substr($fields[$i], 3));
+                      $record[$fields[$i]] = $data[$key]; //仅可修改选择的字段
+                      } */
                 }
                 if (!$record["newImgurl"]) {
                     if (strtotime($record["createTime"]) < strtotime($this->compatible_time)) {
@@ -456,7 +483,8 @@ class Api extends EnterpriseController {
                 $files = $this->request->file();
                 if ($files) {
                     $uploadapi = new UploadApi();
-                    $modify_files = array_filter(explode(",", $record->modify_files));
+                    //注释变更驳回$modify_files = array_filter(explode(",", $record->modify_files));
+                    $modify_files = ["newImgurl", "newBankImg", "newDomainImg", "newTypeImg", "newBeian"];
                     if (strtotime($record->createTime) < strtotime($this->compatible_time)) {
                         //旧typeid需要转换成新的禁用文件格式
                         $oldtypes = ["1161965644164075522" => "newImgurl", "1518753449987148467" => "newImgurl", "1518328155588131269" => "newBankImg", "1518926324960220206" => "newBankImg",

app/enterprise/controller/Talent.php

@@ -59,7 +59,7 @@ class Talent extends EnterpriseController {
         $id = isset($param["id"]) ? $param["id"] : 0;
         $info = \app\common\api\VerifyApi::getTalentInfoById($id);
         if ($info["isImport"]) {
-            $tpl = "no_file_apply"; //晋江人才
+            //$tpl = "no_file_apply"; //晋江人才
         }
         $ep = EnterpriseApi::getOne($this->user["uid"]);
         if (!chkEnterpriseFull($ep))
@@ -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/api/to_update.html

@@ -180,12 +180,12 @@
                         {if condition="$ecr['type'] eq 1"}
                         <div class="row" id="typeGroup">
                             <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                <tr class="agencyType1" {if condition="$ecr['agencyType'] neq 1"}style="display:none;"{/if}>
+                                <tr class="agencyType1" {if condition="$ecr['newAgencyType'] neq 1"}style="display:none;"{/if}>
                                     <td colspan="3">
                                         <p style="color: #333;width:100%;white-space:normal;word-wrap:break-word;word-break:break-all;">备注：4341现代产业体系主要包括：“4”即鞋服、纺织、建材、食品4大传统优势产业，“3”即信息技术、智能装备、医疗健康3大新兴产业，“4”即商贸物流、文体旅游、研发创意、金融服务4大现代服务业，“1”即探索布局未来产业（数字经济等）</p>
                                     </td>
                                 </tr>
-                                <tr class='agencyType1' {if condition="$ecr['agencyType'] neq 1"}style="display:none;"{/if}>
+                                <tr class='agencyType1' {if condition="$ecr['newAgencyType'] neq 1"}style="display:none;"{/if}>
                                     <td>
                                         <div class="rowGroup">
                                             <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>

app/enterprise/view/talent/apply.html

@@ -72,16 +72,17 @@
                     <div class="tab-content">
                         <div id="tab-1" class="tab-pane active">
                             <form id="talentInfoForm" action="/enterprise/talent/apply" method="post" enctype="multipart/form-data" target="hiddenIframe">
-                                <input type="hidden" name="id" id="id" value="{$row.id}">
-                                <input type="hidden" name="year" id="year" value="{$year}">
-                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
-                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
-                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterprise.enterpriseTag}">
-                                <input type="file" name="photo" id="photo" style="display: none">
-                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
-                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
-                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
-                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
+                                <input type="hidden" name="id" id="id" value="{$row.id}"/>
+                                <input type="hidden" name="year" id="year" value="{$year}"/>
+                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}"/>
+                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}"/>
+                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterprise.enterpriseTag}"/>
+                                <input type="file" name="photo" id="photo" style="display: none"/>
+                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}"/>
+                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}"/>
+                                <input type="hidden" name="files" id="files" value="{$row.modify_files}"/>
+                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}"/>
+                                <input type="hidden" name="import" id="import" value="{$row.isImport}"/>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
@@ -105,9 +106,9 @@
                                                         请上传近期免冠半身彩照（两寸）
                                                     </p>
                                                     <img id="photoImg" {if condition="$row['headimgurl']"} src="{$row.headimgurl|getStoragePath}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click();" style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                         <hr />
-                                                    附件：
-                                                    <table class="fileTable"></table>
+                                                        <hr />
+                                                        附件：
+                                                        <table class="fileTable"></table>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -185,427 +186,477 @@
                                         </table>
                                     </div>
                                 </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
-                            <div class="panel-body">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.enterpristTagName}</div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.name}</div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.streetName}</div>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                <div class="form-control" style="border: none">{$row.enterprise.industryFieldNewName}</div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
-                                                <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()" data-value="{$row.talent_type}">
-                                                    <option value="">请选择</option>
-                                                    {volist name="row.talent_type_list" id="item"}
-                                                    <option value="{$item.code}">{$item.name}</option>
-                                                    {/volist}
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <label class=" control-label spacing td-label">人才类型说明</label>
-                                            <div class="word-wrap" id="typeTips">
-
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" colspan='2'>
-                                            <table class="fileTable">
-                                                <tr><td>载入附件</td></tr>
-                                            </table>
-                                        </td>
-                                    </tr>                                    
-                                    <tr class="talentType1-2" style="display: none">
-                                        <td >
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span><span id="talentType_first" style="display: none">首次</span>在我市缴交社会保险或个人所得税月份</label>
-                                                <input type="text" class="form-control rangemonth" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
-                                            </div>
-                                        </td>
-                                    </tr>                                    
-                                    <tr class="talentType1-2" style="display: none">
-                                        <td >
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
-                                                <input type="radio" name="salary_pay_way" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
-                                                <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq}/>本单位所属集团公司及权属公司
-                                            </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 rangemonth" id="labor_contract_rangetime" name="salary_pay_month" value="{$row.salary_pay_month}" />
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr class="talentType3" style="display: none">
-                                        <td >
-                                            <div class="rowGroup">
-                                                预引进类型
-                                            </div>
-                                        </td>
-                                        <td >
-                                            <div class="rowGroup">
-                                                <input type="radio" name="pre_import_type" value="1" {eq name="row.pre_import_type" value="1"}checked{/eq}/><span style="color: red">*</span>意向合同&nbsp;&nbsp;&nbsp;&nbsp;
-                                                <input type="radio" name="pre_import_type" value="2" {eq name="row.pre_import_type" value="2"}checked{/eq}/><span style="color: red">*</span>创业企业名称预核准
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
-                                    <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>
-                                                <input type="text" class="form-control date" id="fst_work_time" name="fst_work_time" value="{$row.fst_work_time}"/>
-                                            </div>
-                                        </td>
-                                        <td id="come_in_jin_str">
-                                            <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
-                                            <div class="word-wrap">
-                                                如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
-                                            </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 rows="5" class="form-control" id="experience" name="experience" style="border: none" placeholder="请严格按如下格式填写：
-2000.07-2005.03 xxxx有限公司 （私营企业） 总务科 后勤
-2005.03-2010.09 xx市xx单位 （事业单位） 非编 经办
-2010.09-2013.08 待业
-2013.08-至今 xx省xx单位 （参公事业单位） 在编 科员">{$row.experience}</textarea>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
-                                                <textarea rows="5" class="form-control" id="education" name="education" style="border: none" placeholder="请严格按如下格式填写：
-1993.09-1996.07 xx市xx中学 （高中） 学生
-1996.09-2000.07 xxxxx大学 （本科） xxxx专业 学生">{$row.education}</textarea>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
-                            <div class="panel-body">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>申报年度</label>
-                                                <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}" readonly disabled>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
-                                                <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
-                                                <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 300%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
-                                                <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
-                                                <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
-                                                <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;border:1px solid #ddd;border-left:none;border-right:none;" class="table table-bordered">                                    
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label">是否有留学经历</label>
-                                                <select class="form-control" id="study_abroad" name="study_abroad" onchange="TalentInfoInfoDlg.changeStudyAbroad()" autocomplete='off' value="{$row.study_abroad}">
-                                                    <option value="2">否</option>
-                                                    <option value="1">是</option>
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
-                                                <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
-                                                <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 300%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
-                                                <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式" value="{$row.import_way}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
-                                                <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 300%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing">职称技术资格</label>
-                                                <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 100%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing">专业技术职称</label>
-                                                <input type="text" class="form-control" id="professional" name="professional" value="{$row.professional}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="3" style="width: 100%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                </table>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
+                                    <div class="panel-body">
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.enterpristTagName}</div>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.name}</div>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.streetName}</div>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.industryFieldNewName}</div>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
+                                                        <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()" data-value="{$row.talent_type}">
+                                                            <option value="">请选择</option>
+                                                            {volist name="row.talent_type_list" id="item"}
+                                                            <option value="{$item.code}">{$item.name}</option>
+                                                            {/volist}
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label">人才类型说明</label>
+                                                    <div class="word-wrap" id="typeTips">
 
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup">
-                                                <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
-                                                <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="{$row.source}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td rowspan="7" style="width: 100%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup" {if condition="!$row['source_batch']"}style="display:none;"{/if}>
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>入选名单的文件号及批次</label>
-                                                <input type="text" class="form-control" id="source_batch" name="source_batch" value="{$row.source_batch}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6" {if condition="!$row['source_city']"}style="display:none;"{/if}>
-                                                <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
-                                                <select class="form-control" id="source_city" name="source_city" value="{$row['source_city']}">
-                                                    <option value="">{$row.sourceCityName}</option>
-                                                </select>
-                                             </div>
-                                            <div class="rowGroup col-sm-6" {if condition="!$row['source_county']"}style="display:none;"{/if}>
-                                                <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
-                                                <select class="form-control" id="source_county" name="source_county" value="{$row['source_county']}">
-                                                    <option value="">{$row.sourceCountyName}</option>
-                                                </select>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6 fujian_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
-                                                <input type="text" class="form-control date" id="fujian_highcert_pubtime" name="fujian_highcert_pubtime" value="{$row.fujian_highcert_pubtime}"/>
-                                            </div>
-                                            <div class="rowGroup col-sm-6 fujian_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
-                                                <input type="text" class="form-control date" id="fujian_highcert_exptime" name="fujian_highcert_exptime" value="{$row.fujian_highcert_exptime}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6 quanzhou_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
-                                                <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" name="quanzhou_highcert_pubtime" value="{$row.quanzhou_highcert_pubtime}"/>
-                                            </div>
-                                            <div class="rowGroup col-sm-6 quanzhou_highcert" style="display: none">
-                                                <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
-                                                <input type="text" class="form-control date" id="quanzhou_highcert_exptime" name="quanzhou_highcert_exptime" value="{$row.quanzhou_highcert_exptime}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="3">
-                                            <div class="rowGroup col-sm-6">
-                                                <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>
-                                            </div>
-                                            <div class="rowGroup col-sm-6">
-                                                <label class="control-label spacing"><span style="color: red">*</span>人才条款</label>
-                                                <select class="form-control" id="talent_arrange_category" name="talent_arrange_category" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange_category}"></select>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="2" style="overflow: inherit">
-                                            <div class="rowGroup col-sm-9">
-                                                <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                <select class="chosen" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.getIdentifyNeedsFileTypes()" value="{$row.talent_condition}" style="width: 80%"></select>
-                                            </div>
-                                        </td>
-                                        <td {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
-                                            <div class="rowGroup col-sm-12">
-                                                <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪（元）</label>
-                                                <div style="position:relative;">
-                                                    <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
-                                                    <i class="control-symbol">元</i>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                        <div class="panel panel-default">
-                            <div class="panel-heading" onclick="$(this).next().toggle()">个人开户银行信息</div>
-                            <div class="panel-body">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" placeholder="XX银行" value="{$row.bank}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                <input type="text" class="form-control" id="bank_number" name="bank_number" value="{$row.bank_number}"/>
-                                            </div>
-                                        </td>
-                                        <td rowspan="2" style="width: 200%">
-                                            <table class="fileTable"></table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" placeholder="XX银行XX省XX市XX支行/分行/分理处" value="{$row.bank_branch_name}"/>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing"><span style="color: red">*</span>个人银行账号</label>
-                                                <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" colspan='2'>
+                                                    <table class="fileTable">
+                                                        <tr><td>载入附件</td></tr>
+                                                    </table>
+                                                </td>
+                                            </tr>                                    
+                                            <tr class="talentType1-2" style="display: none">
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span><span id="talentType_first" style="display: none">首次</span>在我市缴交社会保险或个人所得税月份</label>
+                                                        <input type="text" class="form-control rangemonth" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                        <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
+                                                    </div>
+                                                </td>
+                                            </tr>                                    
+                                            <tr class="talentType1-2" style="display: none">
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
+                                                        <input type="radio" name="salary_pay_way" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
+                                                        <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq}/>本单位所属集团公司及权属公司
+                                                    </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 rangemonth" id="labor_contract_rangetime" name="salary_pay_month" value="{$row.salary_pay_month}" />
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr class="talentType3" style="display: none">
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        预引进类型
+                                                    </div>
+                                                </td>
+                                                <td >
+                                                    <div class="rowGroup">
+                                                        <input type="radio" name="pre_import_type" value="1" {eq name="row.pre_import_type" value="1"}checked{/eq}/><span style="color: red">*</span>意向合同&nbsp;&nbsp;&nbsp;&nbsp;
+                                                        <input type="radio" name="pre_import_type" value="2" {eq name="row.pre_import_type" value="2"}checked{/eq}/><span style="color: red">*</span>创业企业名称预核准
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
+                                            <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>
+                                                        <input type="text" class="form-control date" id="fst_work_time" name="fst_work_time" value="{$row.fst_work_time}"/>
+                                                    </div>
+                                                </td>
+                                                <td id="come_in_jin_str">
+                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
+                                                    <div class="word-wrap">
+                                                        如您为近三年来晋工作的人才，须填写近三年来晋日期，同时上传对应佐证材料，如果来晋时间已超过三年，则此项不必填写。
+                                                    </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 rows="5" class="form-control" id="experience" name="experience" style="border: none" placeholder="请严格按如下格式填写：
+                                                                  2000.07-2005.03 xxxx有限公司 （私营企业） 总务科 后勤
+                                                                  2005.03-2010.09 xx市xx单位 （事业单位） 非编 经办
+                                                                  2010.09-2013.08 待业
+                                                                  2013.08-至今 xx省xx单位 （参公事业单位） 在编 科员">{$row.experience}</textarea>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
+                                                        <textarea rows="5" class="form-control" id="education" name="education" style="border: none" placeholder="请严格按如下格式填写：
+                                                                  1993.09-1996.07 xx市xx中学 （高中） 学生
+                                                                  1996.09-2000.07 xxxxx大学 （本科） xxxx专业 学生">{$row.education}</textarea>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
+                                    <div class="panel-body">
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>申报年度</label>
+                                                        <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}" readonly disabled>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
+                                                        <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
+                                                        <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 300%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
+                                                        <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
+                                                        <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
+                                                        <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        <table style="width: 100%;border-collapse: collapse;border:1px solid #ddd;border-left:none;border-right:none;" class="table table-bordered">                                    
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label">是否有留学经历</label>
+                                                        <select class="form-control" id="study_abroad" name="study_abroad" onchange="TalentInfoInfoDlg.changeStudyAbroad()" autocomplete='off' value="{$row.study_abroad}">
+                                                            <option value="2">否</option>
+                                                            <option value="1">是</option>
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
+                                                        <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
+                                                        <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 300%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
+                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式" value="{$row.import_way}">
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
+                                                        <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
+                                                        <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 300%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing">职称技术资格</label>
+                                                        <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 100%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing">专业技术职称</label>
+                                                        <input type="text" class="form-control" id="professional" name="professional" value="{$row.professional}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 100%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        {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>
+                                                {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>
+                                                        <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="{$row.source}">
+                                                        </select>
+                                                    </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" name="source" onchange="TalentInfoInfoDlg.sourceChange()" value="{$row.source}">
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                {/if}
+                                                <td rowspan="4" style="width: 100%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td {if condition="!$row['source_batch']"}style="display:none;"{/if}>
+                                                    <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>
+                                                <td {if condition="!$row['source_city']"}style="display:none;"{/if}>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                        <select class="form-control" id="source_city" name="source_city" value="{$row['source_city']}">
+                                                            <option value="">{$row.sourceCityName}</option>
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td {if condition="!$row['source_county']"}style="display:none;"{/if}>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                        <select class="form-control" id="source_county" name="source_county" value="{$row['source_county']}">
+                                                            <option value="">{$row.sourceCountyName}</option>
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td style="display: none">
+                                                    <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>
+                                                </td>
+                                                <td style="display: none">
+                                                    <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>
+                                                <td style="display: none">
+                                                    <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>
+                                                </td>
+                                                <td style="display: none">
+                                                    <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>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="4">
+                                                    <div class="rowGroup col-sm-6">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
+                                                        <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-6">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>人才条款</label>
+                                                        <select class="form-control" id="talent_arrange_category" name="talent_arrange_category" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange_category}"></select>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="3" style="overflow: inherit">
+                                                    <div class="rowGroup col-sm-9">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
+                                                        <select class="chosen" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.getIdentifyNeedsFileTypes()" value="{$row.talent_condition}" style="width: 80%"></select>
+                                                    </div>
+                                                </td>
+                                                <td {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
+                                                    <div class="rowGroup col-sm-12">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪（元）</label>
+                                                        <div style="position:relative;">
+                                                            <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
+                                                            <i class="control-symbol">元</i>
+                                                        </div>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">个人开户银行信息</div>
+                                    <div class="panel-body">
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
+                                                        <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" placeholder="XX银行" value="{$row.bank}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
+                                                        <input type="text" class="form-control" id="bank_number" name="bank_number" value="{$row.bank_number}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="2" style="width: 200%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
+                                                        <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" placeholder="XX银行XX省XX市XX支行/分行/分理处" value="{$row.bank_branch_name}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>个人银行账号</label>
+                                                        <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                </div>
+                            </form>
+                            <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                <input type='hidden' id="fileId" name="fileId" />
+                                <input type='file' id="upload_file" name="fileUrl" style='display: none'/>
+                                <input type='hidden' id="mainId" name="mainId" />
+                                <input type='hidden' id="fileTypeId" name="fileTypeId" />
+                                <input type='hidden' id="index" name="index" />
+                                <input type='hidden' id="tableIndex" name="tableIndex" />
+                                <input type='hidden' id="trIndex" name="trIndex" />
+                                <input type="hidden" name="backName" value="TalentInfoInfoDlg.callBack"/>
+                                <input type="type" name="type" value="1"/>
+                            </form>
+                            <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                            <table id="logTable">
+                            </table>
                         </div>
-                        </form>
-                        <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
-                            <input type='hidden' id="fileId" name="fileId" >
-                            <input type='file' id="upload_file" name="fileUrl" style='display: none'>
-                            <input type='hidden' id="mainId" name="mainId" >
-                            <input type='hidden' id="fileTypeId" name="fileTypeId" >
-                            <input type='hidden' id="index" name="index" >
-                            <input type='hidden' id="tableIndex" name="tableIndex" >
-                            <input type='hidden' id="trIndex" name="trIndex" >
-                            <input type="hidden" name="backName" value="TalentInfoInfoDlg.callBack">
-                            <input type="type" name="type" value="1">
-                        </form>
-                        <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
-                        <table id="logTable">
-                        </table>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
-</div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo_info.js"></script>-->
 <script type="text/javascript">

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/enterprise/enterprise_change_edit.js

@@ -466,8 +466,8 @@ EpChangeEdit.submitToCheck = function () {
 EpChangeEdit.setFieldDisabled = function () {
     var checkState = $("#checkState").length > 0 ? $("#checkState").val() : 1;
     if (checkState != 1) {
-        $("#ecr_form :input").prop("disabled", true);
-        $("#ecr_form :button").css("display", "none");
+        //注释变更驳回$("#ecr_form :input").prop("disabled", true);
+        //注释变更驳回$("#ecr_form :button").css("display", "none");
         var fields = $("#fields").val().split(",");
         for (var i in fields) {
             $("#" + fields[i]).removeAttr("disabled");

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");
@@ -466,6 +471,14 @@ TalentInfoInfoDlg.getIdentifyNeedsFileTypes = function () {
     $("#annual_salary").parents("td").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "annual_salary");
 
+    var isMatchZhiren = $("input[name=isMatchZhiren]").length > 0 ? parseInt($("input[name=isMatchZhiren]:checked").val()) : false;
+    var isImport = parseInt($("#import").val());
+    if (isImport > 0 && isMatchZhiren === false) {
+        layer.alert("请先选择是否符合直认条件");
+        $("#talent_condition").val("");
+        $("#talent_condition").trigger('chosen:updated');
+        return;
+    }
     var source = $("#source").val();
     if (source == "" || typeof source == "undefined") {
         layer.alert("请先选择申报来源");
@@ -498,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");
@@ -688,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;
@@ -711,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;
@@ -757,11 +771,11 @@ TalentInfoInfoDlg.talentTypeChange = function () {
 
 TalentInfoInfoDlg.sourceChange = function () {
     var source = $("#source").val();
-    $("#source_batch").val("").parent().css("display", "none");
-    $(".fujian_highcert").css("display", "none");
-    $(".quanzhou_highcert").css("display", "none");
-    $("#source_city").val("").parent().css("display", "none");
-    $("#source_county").val("").parent().css("display", "none");
+    $("#source_batch").val("").parents("td").css("display", "none");
+    $(".fujian_highcert").parents("td").css("display", "none");
+    $(".quanzhou_highcert").parents("td").css("display", "none");
+    $("#source_city").val("").parents("td").css("display", "none");
+    $("#source_county").val("").parents("td").css("display", "none");
     $('#talentInfoForm').bootstrapValidator('removeField', "source_batch");
     $('#talentInfoForm').bootstrapValidator('removeField', "fujian_highcert_pubtime");
     $('#talentInfoForm').bootstrapValidator('removeField', "fujian_highcert_exptime");
@@ -769,19 +783,22 @@ TalentInfoInfoDlg.sourceChange = function () {
     $('#talentInfoForm').bootstrapValidator('removeField', "quanzhou_highcert_exptime");
     $('#talentInfoForm').bootstrapValidator('removeField', "source_city");
     $('#talentInfoForm').bootstrapValidator('removeField', "source_county");
+    var columns = 3;
     switch (source) {
         case "1":
         case "3":
-            $("#source_batch").parent().css("display", "block");
-            $(".fujian_highcert").css("display", "block");
+            columns = source == 1 ? 3 : 4;
+            $("#source_batch").parents("td").css("display", "table-cell");
+            $(".fujian_highcert").parents("td").css("display", "table-cell");
             $('#talentInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "fujian_highcert_pubtime", {validators: {notEmpty: {message: '福建省高层次人才证书发证日期不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "fujian_highcert_exptime", {validators: {notEmpty: {message: '福建省高层次人才证书有效期不能为空'}}});
             break;
         case "2":
         case "4":
-            $("#source_batch").parent().css("display", "block");
-            $(".quanzhou_highcert").css("display", "block");
+            columns = source == 2 ? 3 : 4;
+            $("#source_batch").parents("td").css("display", "table-cell");
+            $(".quanzhou_highcert").parents("td").css("display", "table-cell");
             $('#talentInfoForm').bootstrapValidator('addField', "source_batch", {validators: {notEmpty: {message: '申报来源批次不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "quanzhou_highcert_pubtime", {validators: {notEmpty: {message: '泉州高层次人才证书发证日期不能为空'}}});
             $('#talentInfoForm').bootstrapValidator('addField', "quanzhou_highcert_exptime", {validators: {notEmpty: {message: '泉州高层次人才证书有效期不能为空'}}});
@@ -789,7 +806,7 @@ TalentInfoInfoDlg.sourceChange = function () {
     }
     if (source == 3) {
         //显示入选来源地级市除泉
-        $("#source_city").parent().css("display", "block");
+        $("#source_city").parents("td").css("display", "table-cell");
         Feng.addAjaxSelect({
             "id": "source_city",
             "displayCode": "code",
@@ -801,7 +818,7 @@ TalentInfoInfoDlg.sourceChange = function () {
     }
     if (source == 4) {
         //显示入选来源县市区除晋
-        $("#source_county").parent().css("display", "block");
+        $("#source_county").parents("td").css("display", "table-cell");
         Feng.addAjaxSelect({
             "id": "source_county",
             "displayCode": "code",
@@ -816,6 +833,19 @@ TalentInfoInfoDlg.sourceChange = function () {
     } else {
         TalentInfoInfoDlg.ajaxGetConditionFile(source);
     }
+    $("#source").parents("td").attr("colspan", columns);
+    $("#talent_arrange").parents("td").attr("colspan", columns);
+    $("#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;
+    var isImport = parseInt($("#import").val());
+    if (isImport > 0 && isMatchZhiren == 1) {
+        $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
+    } else {
+        var source = $("#source").val();
+        TalentInfoInfoDlg.ajaxGetConditionFile(source);
+    }
 }
 
 //校验是否保存基础信息
@@ -1059,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/system/config/sys_config.js

@@ -0,0 +1,87 @@
+/**
+ * 系统设置
+ */
+var locked = false;
+var SysConfig = {
+    sysConfigInfoData: {},
+    validateFields: {
+    }
+    /*
+     'register[jjrc_4341]': {validators: {notEmpty: {message: '晋江市现代产业体系人才-4341现代产业体系企业开放注册时间不能为空'}}},
+     'register[jjrc_no4341]': {validators: {notEmpty: {message: '晋江市现代产业体系人才-非4341现代产业体系企业开放注册时间不能为空'}}},
+     'register[jcrc]': {validators: {notEmpty: {message: '集成电路优秀人才开放注册时间不能为空'}}},
+     'register[mbfqy]': {validators: {notEmpty: {message: '民办非企业开放注册时间不能为空'}}},
+     'register[sy_nomedia]': {validators: {notEmpty: {message: '事业单位-非媒体单位开放注册时间不能为空'}}},
+     'register[sy_media]': {validators: {notEmpty: {message: '事业单位-媒体单位开放注册时间不能为空'}}}
+     */
+};
+
+/**
+ * 验证数据
+ */
+SysConfig.validate = function () {
+    $('#configForm').data("bootstrapValidator").resetForm();
+    $('#configForm').bootstrapValidator('validate');
+    return $("#configForm").data('bootstrapValidator').isValid();
+}
+
+/**
+ * 保存
+ */
+SysConfig.save = function () {
+    if (!SysConfig.validate()) {
+        return;
+    }
+    if (locked) {
+        return;
+    }
+    locked = true;
+    $("#configForm")[0].submit();
+}
+
+//回调
+SysConfig.callback = function (data) {
+    locked = false;
+    if (data.code == 200) {
+        Feng.success(data.msg);
+    } else {
+        Feng.error(data.msg);
+    }
+}
+
+$(function () {
+    $('#configForm').bootstrapValidator({
+        feedbackIcons: {
+            valid: 'glyphicon glyphicon-ok',
+            invalid: 'glyphicon glyphicon-remove',
+            validating: 'glyphicon glyphicon-refresh'
+        },
+        container: 'tooltip',
+        group: '.rowGroup',
+        fields: SysConfig.validateFields,
+        live: 'enabled',
+        message: '该字段不能为空'
+    }).on('error.field.bv', function (e, data) {
+        // Get the tooltip
+        var $parent = data.element.parents('#configForm'),
+                $icon = $parent.find('.form-control-feedback[data-bv-icon-for="' + data.field + '"]'),
+                title = $icon.data('bs.tooltip').getTitle();
+        $icon.tooltip('show').tooltip({
+            html: true,
+            placement: 'right',
+            title: title,
+            container: 'body'
+        });
+    });
+    //批量加载时间控件
+    $(".rangedate").each(function () {
+        laydate.render({
+            elem: this,
+            type: "date",
+            range: true,
+            trigger: "click"
+        })
+    })
+});
+
+

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})
 });