Browse Source

提交StrUtil

sandm 2 years ago
parent
commit
35118ef6ee

+ 5 - 0
app/common/api/DictApi.php

@@ -133,4 +133,9 @@ class DictApi {
         return $dictList;
     }
 
+    public static function findDictByCode($code) {
+        $dict = Dict::where("code", $code)->findOrEmpty();
+        return $dict;
+    }
+
 }

+ 12 - 12
app/common/api/UploadApi.php

@@ -10,13 +10,13 @@ namespace app\common\api;
 class UploadApi {
 
     protected $fileSize = 5 * 1024 * 1024;
-    protected $fileExt = "jpg,png,gif,pdf";
-    protected $fileMime = "image/jpg,image/png,image/gif,application/pdf";
+    protected $fileExt = "jpg,png,gif,pdf,xls,xlsx";
+    protected $fileMime = "image/jpg,image/png,image/gif,application/pdf,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
 
     public function __construct($config = []) {
-        $this->fileSize = $config["maxSize"] ?: $this->fileSize;
-        $this->fileExt = $config["fileExt"] ?: $this->fileExt;
-        $this->fileMime = $config["fileMime"] ?: $this->fileMime;
+        $this->fileSize = isset($config["maxSize"]) ? $config["maxSize"] : $this->fileSize;
+        $this->fileExt = isset($config["fileExt"]) ? $config["fileExt"] : $this->fileExt;
+        $this->fileMime = isset($config["fileMime"]) ? $config["fileMime"] : $this->fileMime;
     }
 
     /**
@@ -24,13 +24,13 @@ class UploadApi {
      * @param type $files
      * @return type
      */
-    public function uploadList($files) {
+    public function uploadList($files, $path = "uploadfiles") {
         try {
-            validate(['image' => 'fileSize:' . $this->maxSize . '|fileExt:' . $this->fileExt . '|fileMime:' . $this->fileMime])
+            validate(['image' => ["sileSize" => $this->fileSize, "fileExt" => $this->fileExt, "fileMime" => $this->fileMime]])
                     ->check($files);
             $savename = [];
             foreach ($files as $file) {
-                $savename[] = \think\facade\Filesystem::disk("public")->putFile('topic', $file);
+                $savename[] = \think\facade\Filesystem::disk("public")->putFile($path, $file);
             }
             return $savename;
         } catch (\think\exception\ValidateException $e) {
@@ -43,11 +43,11 @@ class UploadApi {
      * @param type $file
      * @return type
      */
-    public function uploadOne($file) {
+    public function uploadOne($file, $path = "uploadfiles") {
         try {
-            validate(['image' => 'fileSize:' . $this->maxSize . '|fileExt:' . $this->fileExt . '|fileMime:' . $this->fileMime])
-                    ->check($file);
-            $savename = \think\facade\Filesystem::disk("public")->putFile('topic', $file);
+            validate(['image' => ["sileSize" => $this->fileSize, "fileExt" => $this->fileExt, "fileMime" => $this->fileMime]])
+                    ->check(["file" => $file]);
+            $savename = \think\facade\Filesystem::disk("public")->putFile($path, $file);
             return $savename;
         } catch (\think\exception\ValidateException $e) {
             echo $e->getMessage();

+ 3 - 2
app/common/controller/Api.php → app/common/controller/Auth.php

@@ -1,11 +1,12 @@
 <?php
+
 namespace app\common\controller;
 
 use app\BaseController;
 use app\common\model\MessageRecord;
 use think\Facade\Cache;
 
-class Api extends BaseController
+class Auth extends BaseController
 {
 
     public function register(){
@@ -50,4 +51,4 @@ class Api extends BaseController
 
 
     }
-}
+}

+ 16 - 5
app/common/controller/Tool.php

@@ -21,7 +21,7 @@ class Tool extends BaseController {
         for ($i = 0; $i < count($this->request->param()); $i++) {
             if ($obj = $this->request->param($i)) {
                 $code = $obj["code"];
-                $dict = \app\common\model\Dict::where("code", $code)->findOrEmpty()->toArray();
+                $dict = \app\common\model\Dict::where("code", $code)->findOrEmpty();
                 $childs = \app\common\model\Dict::where("pid", $dict["id"])->order("num")->select();
                 $result[$obj["name"]] = $childs;
             }
@@ -29,10 +29,6 @@ class Tool extends BaseController {
         return json(["code" => "200", "msg" => "", "obj" => $result]);
     }
 
-    public function findCommonFileType() {
-        
-    }
-
     public function getProvinceSelect() {
         $where = [];
         $where[] = ["code", "like", "%0000"];
@@ -51,4 +47,19 @@ class Tool extends BaseController {
         return json(Db::table("un_common_location")->where("code", "like", $city_prefix . "%")->select()->toArray());
     }
 
+    /**
+     * 通过地区编码找下级地区,比如传入35就找35**00,传入3505就找3505**
+     * @return type
+     */
+    public function findChildAreaByCode() {
+        $param = $this->request->param();
+        $code = $param["code"];
+        $where[] = ["code", "like", str_pad($code . "%%", 6, 0)];
+        $where[] = ["code", "<>", str_pad($code . "00", 6, 0)];
+        if (isset($param["no"])) {
+            $where[] = ["code", "<>", $param["no"]];
+        }
+        return json(Db::table("un_common_location")->where($where)->select()->toArray());
+    }
+
 }

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

@@ -20,9 +20,17 @@ class Talent extends EnterpriseController {
         $res = TalentApi::getList($this->request);
         return json($res);
     }
-    
-    public function add(){
-        return view();
+
+    public function add() {
+        $enterprise_info = \app\admin\model\Enterprise::find($this->user["uid"]);
+        return view("", ["year" => date("Y"), "enterprise" => $enterprise_info]);
+    }
+
+    public function addTalentFile() {
+        $file = $this->request->file("fileUrl");
+        $upload = new \app\common\api\UploadApi();
+        $res = $upload->uploadOne($file);
+        var_dump($res);exit();
     }
 
 }

+ 75 - 104
app/enterprise/view/talent/add.html

@@ -1,6 +1,11 @@
 {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;
@@ -35,68 +40,54 @@
                         <div id="tab-1" class="tab-pane active">
                             <div class="panel-body" >
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
-                                    <div class="panel-body">
-                                        <form id="talentInfoForm" class="form-horizontal" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                    <form id="talentInfoForm" action="/enterprise/talent/add" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                        <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
+                                        <div class="panel-body">
                                             <div class="col-sm-12 form-group-sm">
                                                 <input type="hidden" name="id" id="id" value="">
-                                                <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="year" id="year" value="{$year}">
+                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$enterprise.id}">
+                                                <input type="hidden" name="enterprise_type" id="type" value="{$enterprise.type}">
                                                 <input type="hidden" name="checkState" id="checkState" value="">
                                                 <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="fromCityName" id="fromCityName" value="">
-                                                <input type="hidden" name="hand" id="hand" value="${hand}">
+                                                <input type="hidden" name="province_name" id="province_name" value="">
+                                                <input type="hidden" name="city_name" id="city_name" value="">
+                                                <input type="hidden" name="county_name" id="county_name" value="">
+                                                <input type="hidden" name="source_city_name" id="source_city_name" value="">
+                                                <input type="hidden" name="source_county_name" id="source_county_name" value="">
+                                                <input type="hidden" name="hand" id="hand" value="">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>人才类型</label>
-                                                            <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">现有人才。含经晋江市认定且还在晋江市就业创业的人才,或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。</option>
-                                                                <option value="2">新引进人才。含本办法出台后首次从晋江市以外引进认定的人才,或者流出晋江市满3年后又返回晋江市就业创业<不含企业集团内部人员调动>的人才。</option>
-                                                                <option value="3">预引进人才。含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议(合同)的人才,或拟来我市创业且提交企业名称预先核准的人才。</option>                                                                
+                                                            <select class="form-control" id="talent_type" name="talent_type" onchange="TalentInfoInfoDlg.talentTypeChange()">
+                                                                <option value="">请选择</option>                                                               
                                                             </select>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3">
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
                                                             <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="tax_insurance_month" name="tax_insurance_month" />
                                                         </div>
-                                                        <div class="rowGroup col-sm-3">
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
                                                             <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 rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" />
                                                         </div>                                                        
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>单位标签</label>
-                                                            <select class="form-control" id="talentType" name="talentType" onchange="TalentInfoInfoDlg.typeChange(this)" >
-                                                                <option value="">请选择</option>
-                                                                <option value="1">国字号平台</option>
-                                                                <option value="2">民营企业</option>
-                                                                <option value="3">媒体单位</option>
-                                                                <option value="4">民办非企业</option>
-                                                                <option value="5">国有企业(我市本级国有股比超过50%)</option>
-                                                                <option value="6">国有企业(我市本级国有股比未超过50%)</option>
-                                                                <option value="7">金融机构(银行保险)</option>
-                                                                <option value="8">金融机构(银行保险除外)</option>
-                                                                <option value="9">在站博士后”</option>
-                                                                <option value="10">事业单位(医疗教育除外)</option>
-                                                                <option value="11">其他</option>
+                                                            <select class="form-control" id="enterprise_tag"  value="{$enterprise.talentType}" disabled="disabled">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" id="companyName"  name="companyName" readonly="readonly" value="${enterprise.name}" />
+                                                            <input type="text" class="form-control" id="enterprise_name"  name="enterprise_name" readonly="readonly" value="{$enterprise.name}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <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>
+                                                            <select class="form-control" id="address" name="address" value="{$enterprise.street}" disabled="disabled"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>产业领域</label>
-                                                            <select type="text" class="form-control" id="industryField" value="${enterprise.industryField}" name="industryField" disabled="disabled">
+                                                            <select type="text" class="form-control" id="industry_field" value="{$enterprise.industry_field}" name="industry_field" disabled="disabled">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
@@ -105,7 +96,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType">
+                                                            <select class="form-control" id="card_type" name="card_type">
                                                                 <option value="">请选择</option>
                                                                 <option value="1">身份证</option>
                                                                 <option value="2">通行证</option>
@@ -114,7 +105,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <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">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
@@ -135,16 +126,16 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <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">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <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"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <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"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>民族</label>
@@ -162,89 +153,81 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                        </form>
-                                    </div>
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">个人信息填报及人才认定申请</div>
-                                    <div class="panel-body">
-                                        <form id="talentInfoForm" class="form-horizontal" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                        </div>
+                                        <div class="panel-heading" onclick="$(this).next().toggle()">个人信息填报及人才认定申请</div>
+                                        <div class="panel-body">
                                             <div class="col-sm-12 form-group-sm">
                                                 <div class="row">
                                                     <div class="col-sm-11">                          
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
-                                                            <input type="text" class="form-control" name="year" id="year" value="${year}">
+                                                            <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$year}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
-                                                            <input type="text" class="form-control date" id="firstInJJTime" name="firstInJJTime"/>
+                                                            <input type="text" class="form-control date" id="fst_work_time" name="fst_work_time"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
-                                                            <select class="form-control" id="introductionMode" name="introductionMode" data-placeholder="引进方式">
+                                                            <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
-                                                            <input type="text" class="form-control date" id="entryTime" name="entryTime"/>
+                                                            <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>本单位现任职务</label>
-                                                            <input type="text" class="form-control" id="post" name="post"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
-                                                            <input type="text" class="form-control" id="lastYearWages" name="lastYearWages"/>
+                                                            <input type="text" class="form-control" id="postion" name="postion"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
                                                             <select class="form-control" id="source" name="source" onchange="TalentInfoInfoDlg.sourceChange()">
-                                                                <option value="">请选择</option>
-                                                                <option value="1">经我市申报入选省级人才且符合我市产业人才认定标准。</option>
-                                                                <option value="2">经我市申报入选泉州市高层次人才且符合我市产业人才认定标准。</option>
-                                                                <option value="3">其他地级市入选省级人才申报认定。</option>
-                                                                <option value="4">其他县市区入选泉州市高层次人才申报认定。</option>
-                                                                <option value="5">依据晋江现代产业人才认定标准(晋江补充条款)申报认定。</option>
                                                             </select>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
-                                                            <label class=" control-label spacing" ><span style="color: red">*</span>申报来源批次</label>
-                                                            <input type="text" class="form-control date" id="certificateStartTime" name="source_batch"/>
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                            <select class="form-control" id="source_city" name="source_city"></select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                            <select class="form-control" id="source_county" name="source_county"></select>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
+                                                            <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
+                                                            <input type="text" class="form-control" id="source_batch" name="source_batch"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
                                                             <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
-                                                            <input type="text" class="form-control date" id="certificateStartTime" name="certificateStartTime"/>
+                                                            <input type="text" class="form-control date" id="fujian_highcert_pubtime" name="fujian_highcert_pubtime"/>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
                                                             <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
-                                                            <input type="text" class="form-control date" id="qzgccrcActiveTime" name="qzgccrcActiveTime"/>
+                                                            <input type="text" class="form-control date" id="fujian_highcert_exptime" name="fujian_highcert_exptime"/>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
                                                             <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
-                                                            <input type="text" class="form-control date" id="certificateStartTime" name="certificateStartTime"/>
+                                                            <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" name="quanzhou_highcert_pubtime"/>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3" style="display: none">
+                                                        <div class="rowGroup col-sm-3" style="display:none;">
                                                             <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
-                                                            <input type="text" class="form-control date" id="qzgccrcActiveTime" name="qzgccrcActiveTime"/>
+                                                            <input type="text" class="form-control date" id="quanzhou_highcert_exptime" name="quanzhou_highcert_exptime"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                            <select class="form-control" id="talentArrange" name="talentArrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()"></select>
+                                                            <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                            <select class="chosen" id="identifyCondition" name="identifyCondition"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>认定条件证书取得时间</label>
-                                                            <input type="text" class="form-control date" id="identifyGetTime" name="identifyGetTime"/>
+                                                            <select class="chosen" id="talent_condition" name="talent_condition"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <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"></select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
-                                                            <input type="text" class="form-control" id="graduateSchool" name="graduateSchool">
+                                                            <input type="text" class="form-control" id="graduate_school" name="graduate_school">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>专业</label>
@@ -252,7 +235,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing">专业技术职称</label>
-                                                            <input type="text" class="form-control" id="title" name="title"/>
+                                                            <input type="text" class="form-control" id="professional" name="professional"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
@@ -260,30 +243,30 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                            <input type="text" class="form-control" id="bankNumber" name="bankNumber"/>
+                                                            <input type="text" class="form-control" id="bank_number" name="bank_number"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" id="bankNetwork" name="bankNetwork" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                            <input type="text" class="form-control" id="bank_branch_house" name="bank_branch_house" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                            <input type="text" class="form-control" id="bankAccount" name="bankAccount" />
+                                                            <input type="text" class="form-control" id="bank_account" name="bank_account" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing">是否有留学经历</label>
-                                                            <select class="form-control" id="studyAbroad" name="study_broad">
+                                                            <select class="form-control" id="study_abroad" name="study_abroad" onchange="TalentInfoInfoDlg.changeStudyAbroad()">
                                                                 <option value="2">否</option>
                                                                 <option value="1">是</option>
                                                             </select>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3">
+                                                        <div class="rowGroup col-sm-3 abroad_need_this" style="display:none;">
                                                             <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
-                                                            <input type="text" class="form-control" id="phone" name="broad_" maxlength="11"/>
+                                                            <input type="text" class="form-control" id="abroad_school" name="abroad_school" maxlength="11"/>
                                                         </div>
-                                                        <div class="rowGroup col-sm-3">
+                                                        <div class="rowGroup col-sm-3 abroad_need_this" style="display:none;">
                                                             <label class="control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" id="phone" name="broad_profession" maxlength="11"/>
+                                                            <input type="text" class="form-control" id="abroad_profession" name="abroad_profession" maxlength="11"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
@@ -295,24 +278,12 @@
                                                         </div>
                                                     </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="2"></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="2"></textarea>
-                                                    </div>
-                                                </div>
                                                 <div class="row">
                                                     <label class="col-sm-12 control-label spacing" style="text-align: left"><span style="color: red">声明:本人对输入材料的真实性负全部责任</span></label>
                                                 </div>
                                             </div>
-                                        </form>
-                                    </div>                                    
+                                        </div>     
+                                    </form>                               
                                     <div class="panel-heading" onclick="$(this).next().toggle()">附件上传</div>
                                     <div class="panel-body">
                                         <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
@@ -323,7 +294,7 @@
                                             </thead>
                                         </table>
                                         <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
-                                        <form id="uploadForm" action="/api/talentInfo/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                        <form id="uploadForm" action="/enterprise/talent/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" >

+ 2 - 2
public/static/js/register.js

@@ -303,7 +303,7 @@ Register.getEnterpriseSms = function() {
 
     Register.enterpriseBtnCountDown();
 
-    var ajax = new $ax(Feng.ctxPath + "/common/api/verificationCode?phone="+agentPhone+"&type=1", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/common/auth/verificationCode?phone="+agentPhone+"&type=1", function(data){
         Feng.info(data.msg);
     },function(data){
         Feng.error("操作失败!" + data.responseJSON.message + "!");
@@ -339,7 +339,7 @@ Register.getPersionSms = function() {
         return;
     }
     Register.getPersionBtnCountDown();
-    var ajax = new $ax(Feng.ctxPath + "/common/api/verificationCode?phone="+phone+"&type=1", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/common/auth/verificationCode?phone="+phone+"&type=1", function(data){
         Feng.info(data.msg);
     },function(data){
         Feng.error("操作失败!" + data.responseJSON.message + "!");

File diff suppressed because it is too large
+ 380 - 343
public/static/modular/gate/talentInfo/talentInfo_info.js


Some files were not shown because too many files changed in this diff