1

app/admin/view/batch/add.html

@@ -66,7 +66,7 @@
                             <label class="col-sm-3 control-label">
                                 人才类型</label>
                             <div class="col-sm-9">
-                                <select class="form-control" selectval="1" disabled="disabled" id="source" name="source" data-bv-field="source">
+                                <select class="form-control" selectval="1" id="source" name="source" data-bv-field="source" onchange="">
                                     <option value="">请选择</option>
                                     <option value="1">晋江市现代产业体系人才</option>
                                     <option value="2">晋江市集成电路优秀人才</option>

app/admin/view/batch/edit.html

@@ -59,10 +59,9 @@
                     </div>
                     <div class="col-sm-6">
                         <div class="form-group has-feedback">
-                            <label class="col-sm-3 control-label">
-                                人才类型</label>
+                            <label class="col-sm-3 control-label">人才类型</label>
                             <div class="col-sm-9">
-                                <select class="form-control" selectval="1" disabled="disabled" selectVal="{$batch.source}" id="source" name="source" data-bv-field="source">
+                                <select class="form-control" selectVal="{$batch.source}" id="source" name="source" data-bv-field="source">
                                     <option value="">请选择</option>
                                     <option value="1">晋江市现代产业体系人才</option>
                                     <option value="2">晋江市集成电路优秀人才</option>

app/admin/view/talent/talentInfo_base_check.html

@@ -216,7 +216,22 @@
                                                         <span style="color: red">劳动合同签订工作地点必须在晋江</span>
                                                     </div>
                                                 </td>
-                                            </tr>                         
+                                            </tr>
+                                            <tr>
+                                                <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="info.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
+                                                        <input type="radio" name="salary_pay_way" value="2" {eq name="info.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" id="salary_pay_month" value="{$info.salary_pay_month}"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
                                             {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
                                             <tr>
                                                 <td>

app/admin/view/talent/talentInfo_common_check.html

@@ -236,6 +236,21 @@
                                                 </div>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <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="info.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
+                                                    <input type="radio" name="salary_pay_way" value="2" {eq name="info.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" id="salary_pay_month" value="{$info.salary_pay_month}"/>
+                                                </div>
+                                            </td>
+                                        </tr>
                                         {if condition="in_array($info['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
                                         <tr>
                                             <td>

app/common/api/BatchApi.php

@@ -44,6 +44,7 @@ class BatchApi {
             return ["msg" => "批次不能为空"];
         $where[] = ["type", "=", $params["type"]];
         $where[] = ["batch", "=", $params["batch"]];
+        $where[] = ["source", "=", $params["source"]];
         $count = Batch::where($where)->count();
         if ($count > 0) {
             return ["msg" => "该申报类别的批次重复"];
@@ -91,6 +92,7 @@ class BatchApi {
             return ["msg" => "批次不能为空"];
         $where[] = ["type", "=", $params["type"]];
         $where[] = ["batch", "=", $params["batch"]];
+        $where[] = ["source", "=", $params["source"]];
         $where[] = ["id", "<>", $params["id"]];
         $count = Batch::where($where)->count();
         if ($count > 0) {
@@ -149,8 +151,8 @@ class BatchApi {
     public static function setOtherNoActive($except_id) {
         $open = self::getOne($except_id);
         if ($open) {
-            $type = $open["type"];
-            $where[] = ["type", "=", $type];
+            $where[] = ["type", "=", $open["type"]];
+            $where[] = ["source", "=", $open["source"]];
             $where[] = ["id", "<>", $except_id];
             $data["active"] = 2;
             Batch::where($where)->update($data);

app/common/api/DictApi.php

@@ -143,6 +143,8 @@ class DictApi {
             "talent_type" => "人才类型",
             "tax_insurance_month" => "在我市缴交社会保险或个人所得税月份",
             "labor_contract_rangetime" => "劳动合同起止时间",
+            "salary_pay_way" => "工资发放渠道",
+            "salary_pay_month" => "工资发放月份",
             "pre_import_type" => "预引进类型",
             "name" => "姓名",
             "card_type" => "证件类型",

app/common/controller/Api.php

@@ -216,7 +216,7 @@ class Api extends BaseController {
         $checkState = $param["checkState"];
         $isMix = $param["isMix"] ?: 0;
         $talent_condition = $param["talent_condition"];
-        if (in_array($checkState, [-1, 0, 1, 2]) && $isMix != 1) {
+        if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, 0, TalentState::FST_SAVE, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS]) && $isMix != 1) {
             $where[] = ["step", "=", 1]; //只查找人才第一步所需文件
         } else {
             $where[] = ["isConditionFile", "<>", 1]; //排除人才条件上传文件

app/enterprise/controller/Base.php

@@ -95,6 +95,8 @@ class Base extends EnterpriseController {
             if (in_array($param["talent_type"], [1, 2])) {
                 $no_empty[] = "tax_insurance_month";
                 $no_empty[] = "labor_contract_rangetime";
+                $no_empty[] = "salary_pay_way";
+                $no_empty[] = "salary_pay_month";
             }
             if ($param["talent_type"] == 3) {
                 $no_empty[] = "pre_import_type";
@@ -264,11 +266,15 @@ class Base extends EnterpriseController {
             if (in_array($data["talent_type"], [1, 2])) {
                 $data["tax_insurance_month"] = $param["tax_insurance_month"];
                 $data["labor_contract_rangetime"] = $param["labor_contract_rangetime"];
+                $data["salary_pay_way"] = $param["salary_pay_way"];
+                $data["salary_pay_month"] = $param["salary_pay_month"];
                 $data["fst_work_time"] = $param["fst_work_time"];
                 $data['pre_import_type'] = null;
             } else {
                 $data["tax_insurance_month"] = null;
                 $data["labor_contract_rangetime"] = null;
+                $data["salary_pay_way"] = null;
+                $data["salary_pay_month"] = null;
                 $data["fst_work_time"] = null;
                 $data['pre_import_type'] = $param["pre_import_type"];
             }

app/enterprise/controller/Talent.php

@@ -586,11 +586,15 @@ class Talent extends EnterpriseController {
             if (in_array($data["talent_type"], [1, 2])) {
                 $data["tax_insurance_month"] = $param["tax_insurance_month"];
                 $data["labor_contract_rangetime"] = $param["labor_contract_rangetime"];
+                $data["salary_pay_way"] = $param["salary_pay_way"];
+                $data["salary_pay_month"] = $param["salary_pay_month"];
                 $data["fst_work_time"] = $param["fst_work_time"];
                 $data['pre_import_type'] = null;
             } else {
                 $data["tax_insurance_month"] = null;
                 $data["labor_contract_rangetime"] = null;
+                $data["salary_pay_way"] = null;
+                $data["salary_pay_month"] = null;
                 $data["fst_work_time"] = null;
                 $data['pre_import_type'] = $param["pre_import_type"];
             }

app/enterprise/validate/TalentInfo.php

@@ -26,6 +26,8 @@ class TalentInfo extends Validate {
         "labor_contract_rangetime" => "checkRangeDate:labor_contract_rangetime",
         "fst_work_time" => "dateFormat:Y-m-d",
         "pre_import_type" => "between:1,2",
+        "salary_pay_way" => "between:1,2",
+        "salary_pay_month" => "checkRangeDate:salary_pay_month",
         "experience" => "max:200",
         "education" => "max:200",
         "phone" => "mobile",
@@ -55,6 +57,7 @@ class TalentInfo extends Validate {
         "talent_type.between" => "不存在的人才类型，请在列表中选择",
         "fst_work_time.dateFormat" => "来晋工作时间必需是有效的日期格式[yyyy-MM-dd]",
         "pre_import_type.between" => "预引进类型只能在预设列表中选择",
+        "salary_pay_way.between" => "工资发放渠道只能在预设列表中选择",
         "experience.max" => "工作经历不能超过200个字符，请简明扼要的描述您的工作经历",
         "education.max" => "教育背景不能超过200个字符，请简明扼要的描述您的教育背景",
         "phone.mobile" => "请填写正确的手机号",
@@ -148,6 +151,11 @@ class TalentInfo extends Validate {
             case "labor_contract_rangetime":
                 $title = "劳动合同起止时间";
                 break;
+            case "salary_pay_month":
+                $format = "[yyyy-MM - yyyy-MM]";
+                $str = "月份";
+                $title = "工资发放月份";
+                break;
         }
         $arr = explode(" - ", $value);
         $chk1 = strtotime($arr[0]);

app/enterprise/view/base/first.html

@@ -248,6 +248,21 @@
                                                         <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="pre_import_type" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
+                                                        <input type="radio" name="pre_import_type" 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 >

app/enterprise/view/talent/apply.html

@@ -71,7 +71,7 @@
                 <div class="col-sm-12" >
                     <div class="tab-content">
                         <div id="tab-1" class="tab-pane active">
-                            <form id="talentInfoForm" action="/enterprise/talent/second" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                            <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}">
@@ -253,6 +253,21 @@
                                                 <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="pre_import_type" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq}/>本单位&nbsp;&nbsp;
+                                                <input type="radio" name="pre_import_type" 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 >

app/enterprise/view/talent/ic_apply.html

@@ -41,27 +41,27 @@
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
-                                        <form id="talentInfoForm" class="form-horizontal" action="${ctxPath}/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
-                                            <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="">
-                                                <input type="hidden" name="source" id="source" value="1">
-                                                <input type="hidden" name="year" id="year" value="${year}">
-                                                <input type="hidden" name="enterpriseId" id="enterpriseId" value="${enterprise.id}">
-                                                <input type="hidden" name="type" id="type" value="${enterprise.type}">
-                                                <input type="hidden" name="checkState" id="checkState" value="">
+                                        <form id="talentInfoForm" class="form-horizontal" action="/enterprise/talent/apply" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                            <div class="col-sm-12 form-group-sm">                                                
+                                                <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="provinceName" id="provinceName" value="">
-                                                <input type="hidden" name="cityName" id="cityName" value="">
-                                                <input type="hidden" name="countyName" id="countyName" value="">
+                                                <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}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" />
+                                                            <input type="text" class="form-control" id="name" name="name" value="{$row.name}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
-                                                            <select class="form-control" id="sex" name="sex">
+                                                            <select class="form-control" id="sex" name="sex" value="{$row.sex}">
                                                                 <option value="">请选择</option>
                                                                 <option value="1">男</option>
                                                                 <option value="2">女</option>
@@ -69,39 +69,39 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <select class="form-control" id="nationality" name="nationality">
+                                                            <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
-                                                            <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="provinceCode" name="provinceCode">
+                                                            <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="province" name="province" value="{$row.province}">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
-                                                            <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="cityCode" name="cityCode"></select>
+                                                            <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="city" name="city" value="{$row.city}"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
-                                                            <select class="form-control" id="countyCode" name="countyCode"></select>
+                                                            <select class="form-control" id="county" name="county" value="{$row.county}"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <select class="form-control" id="nation" name="nation">
+                                                            <select class="form-control" id="nation" name="nation" value="{$row.nation}">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <select class="form-control" id="politics" name="politics">
+                                                            <select class="form-control" id="politics" name="politics" value="{$row.politics}">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control date" id="birthday" name="birthday"/>
+                                                            <input type="text" class="form-control date" id="birthday" name="birthday" value="{$row.birthday}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType">
+                                                            <select class="form-control" id="card_type" name="card_type" value="{$row.card_type}">
                                                                 <option value="">请选择</option>
                                                                 <option value="1">身份证</option>
                                                                 <option value="2">通行证</option>
@@ -110,65 +110,65 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
-                                                            <input class="form-control" id="idCard" name="idCard">
+                                                            <input class="form-control" id="card_number" name="card_number" value="{$row.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>是否曾被相关主管部门列为失信个人</label>
-                                                            <select class="form-control" id="breakFaith" name="breakFaith">
+                                                            <select class="form-control" id="break_faith" name="break_faith" value="{$row.break_faith}">
                                                                 <option value="2">否</option>
                                                                 <option value="1">是</option>
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>手机号码</label>
-                                                            <input type="text" class="form-control" id="phone" name="phone" maxlength="11"/>
+                                                            <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>电子邮箱</label>
-                                                            <input type="text" class="form-control" id="email" name="email"/>
+                                                            <input type="text" class="form-control" id="email" name="email" value="{$row.email}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                            <select class="form-control" id="highEducation" name="highEducation"></select>
+                                                            <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>毕业学校</label>
-                                                            <input type="text" class="form-control" id="graduateSchool" name="graduateSchool"/>
+                                                            <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" id="major" name="major"/>
+                                                            <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class="control-label spacing">是否有留学经历</label>
-                                                            <select class="form-control" id="studyAbroad" name="studyAbroad">
+                                                            <select class="form-control" id="studyAbroad" name="study_abroad" value="{$row.study_abroad}">
                                                                 <option value="2">否</option>
                                                                 <option value="1">是</option>
                                                             </select>
                                                         </div>
+                                                        <div class="rowGroup col-sm-4">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>单位标签</label>
+                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.enterprise.enterpristTagName}"/>
+                                                        </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" id="companyName"  name="companyName" readonly="readonly" value="${enterprise.name}" />
+                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.enterprise.name}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
-                                                            <select class="form-control" id="address" name="address" value="${enterprise.street}" disabled="disabled"></select>
+                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.enterprise.streetName}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>职务</label>
-                                                            <input type="text" class="form-control" id="post" name="post"/>
+                                                            <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>入职时间</label>
-                                                            <input type="text" class="form-control date" id="entryTime" name="entryTime"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>工作合同开始时间</label>
-                                                            <input type="text" class="form-control date" id="startTime" name="startTime"/>
+                                                            <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>工作合同结束时间</label>
-                                                            <input type="text" class="form-control date" id="endTime" name="endTime"/>
+                                                            <label class=" control-label spacing"><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>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
@@ -196,35 +196,38 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <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银行"/>
+                                                            <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" value="{$row.bank}" placeholder="XX银行"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" id="bankNetwork" name="bankNetwork" PLACEHOLDER="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                            <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" value="{$row.bank_branch_name}" PLACEHOLDER="XX银行XX省XX市XX支行/分行/分理处"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-4">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                            <input type="text" class="form-control" id="bankAccount" name="bankAccount" />
+                                                            <input type="text" class="form-control" id="bank_account" name="bank_account" value="{$row.bank_account}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-12">
                                                             <label class=" control-label spacing">备注</label>
-                                                            <input type="text" class="form-control" id="description" name="description"/>
+                                                            <input type="text" class="form-control" id="description" name="description" value="{$row.description}"/>
                                                         </div>
                                                     </div>
                                                     <div class="col-sm-1">
-                                                        <img id="photoImg" src="${ctxPath}/static/img/photo.png" onclick="$('#photo').click()" style="height: 110px;width: 76px;">
+                                                        <p style="text-align: center;color: red">
+                                                            近期免冠半身彩照（两寸）
+                                                        </p>
+                                                        <img id="photoImg" {if condition="$row['headimgurl']"} src="{$row.headimgurl|getStoragePath}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click();" style="height:110px;width:76px;">                                                        
                                                     </div>
                                                 </div>
                                                 <div class="row">
                                                     <div class="rowGroup col-sm-12">
                                                         <label class=" control-label spacing"><span style="color: red">*</span>教育背景及工作简历</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="educationAndResume" name="educationAndResume" rows="4"></textarea>
+                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="education" name="education" rows="4">{$row.education}</textarea>
                                                     </div>
                                                 </div>
                                                 <div class="row">
                                                     <div class="rowGroup col-sm-12">
                                                         <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="mainHonours" name="mainHonours" rows="4"></textarea>
+                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="experience" name="experience" rows="4">{$row.experience}</textarea>
                                                     </div>
                                                 </div>
                                                 <div class="row">
@@ -240,9 +243,17 @@
                             </div>
                         </div>
                         <div id="tab-2" class="tab-pane ">
-                            <#table id="fileTable"/>
+                            <table id="fileTable" class="table-condensed"
+                                   style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true"
+                                   data-click-to-select="true">
+                                <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                                </thead>
+                            </table>
                             <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
-                            <form id="uploadForm" action="${ctxPath}/api/talentInfo/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                            <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" >
@@ -261,7 +272,7 @@
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
 <!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo_ic_info.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="/static/modular/gate/talentInfo/talentInfo_ic_info.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="/static/modular/common/config.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/gate/talentInfo/talentInfo_ic_info.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

app/enterprise/view/talent/second.html

@@ -235,6 +235,21 @@
                                                 </div>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <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} readonly disabled/>本单位&nbsp;&nbsp;
+                                                           <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq} 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" value="{$row.salary_pay_month}"  readonly disabled id="salary_pay_month"/>
+                                                </div>
+                                            </td>
+                                        </tr>
                                         {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
                                         <tr>
                                             <td>

app/enterprise/view/talent/view.html

@@ -231,6 +231,21 @@
                                                     </div>
                                                 </td>
                                             </tr>
+                                            <tr>
+                                                <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} readonly disabled/>本单位&nbsp;&nbsp;
+                                                               <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq} 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" value="{$row.salary_pay_month}"  readonly disabled id="salary_pay_month"/>
+                                                    </div>
+                                                </td>
+                                            </tr>
                                             {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
                                             <tr>
                                                 <td>
@@ -348,13 +363,13 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
+                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
                                                         <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
+                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
                                                         <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
                                                     </div>
                                                 </td>
@@ -444,13 +459,13 @@
                                             <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>
+                                                         <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}>
-                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                         <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>

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

@@ -163,6 +163,8 @@ TalentInfoInfoDlg.collectData = function () {
             .set('tax_insurance_month')
             .set('labor_contract_rangetime')
             .set('pre_import_type')
+            .set('salary_pay_way')
+            .set('salary_pay_month')
             .set('enterprise_id')
             .set('name')
             .set('photo')
@@ -421,6 +423,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 }
             });
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_way", {validators: {notEmpty: {message: '请选择工资发放渠道'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_month", {validators: {notEmpty: {message: '请选择工资发放月份'}}});
             if (TalentInfoInfoDlg.talentTypeFlag) {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
@@ -442,6 +446,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 }
             });
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_way", {validators: {notEmpty: {message: '请选择工资发放渠道'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_month", {validators: {notEmpty: {message: '请选择工资发放月份'}}});
             if (TalentInfoInfoDlg.talentTypeFlag) {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
@@ -462,6 +468,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 TalentInfoInfoDlg.talentTypeOneTwo = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "labor_contract_rangetime");
                 $('#talentInfoForm').bootstrapValidator('removeField', "tax_insurance_month");
+                $('#talentInfoForm').bootstrapValidator('removeField', "salary_pay_way");
+                $('#talentInfoForm').bootstrapValidator('removeField', "salary_pay_month");
             }
             text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
             $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'none') : "";

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

@@ -158,6 +158,8 @@ TalentInfoInfoDlg.collectData = function () {
             .set('tax_insurance_month')
             .set('labor_contract_rangetime')
             .set('pre_import_type')
+            .set('salary_pay_way')
+            .set('salary_pay_month')
             .set('enterprise_id')
             .set('name')
             .set('photo')
@@ -682,6 +684,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 }
             });
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_way", {validators: {notEmpty: {message: '请选择工资发放渠道'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_month", {validators: {notEmpty: {message: '请选择工资发放月份'}}});
             if (TalentInfoInfoDlg.talentTypeFlag) {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
@@ -703,6 +707,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 }
             });
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_way", {validators: {notEmpty: {message: '请选择工资发放渠道'}}});
+            $('#talentInfoForm').bootstrapValidator('addField', "salary_pay_month", {validators: {notEmpty: {message: '请选择工资发放月份'}}});
             if (TalentInfoInfoDlg.talentTypeFlag) {
                 TalentInfoInfoDlg.talentTypeFlag = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "pre_import_type");
@@ -723,6 +729,8 @@ TalentInfoInfoDlg.talentTypeChange = function () {
                 TalentInfoInfoDlg.talentTypeOneTwo = false;
                 $('#talentInfoForm').bootstrapValidator('removeField', "labor_contract_rangetime");
                 $('#talentInfoForm').bootstrapValidator('removeField', "tax_insurance_month");
+                $('#talentInfoForm').bootstrapValidator('removeField', "salary_pay_way");
+                $('#talentInfoForm').bootstrapValidator('removeField', "salary_pay_month");
             }
             text = $("#fst_work_time").length > 0 ? $("#fst_work_time").prev("label").html().replace(/近三年/, "首次") : "";
             $("#come_in_jin").length > 0 ? $("#come_in_jin").css('display', 'none') : "";

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

@@ -130,17 +130,17 @@ TalentInfoInfoDlg.close = function() {
 TalentInfoInfoDlg.collectData = function() {
     this
         .set('id')
-        .set('enterpriseId')
+        .set('enterprise_id')
         .set('type')
-        .set('idCard')
-        .set('cardType')
+        .set('card_number')
+        .set('card_type')
         .set('name')
         .set('sex')
         .set('nation')
         .set('nationality')
-        .set('provinceCode')
-        .set('cityCode')
-        .set('countyCode')
+        .set('province')
+        .set('city')
+        .set('county')
         .set('birthday')
         .set('address')
         .set('politics')