Signed-off-by: sgq <sgq@sugangqiang>

app/AppService.php

@@ -1,5 +1,6 @@
 <?php
-declare (strict_types = 1);
+
+declare (strict_types=1);
 
 namespace app;
 
@@ -8,15 +9,15 @@ use think\Service;
 /**
  * 应用服务类
  */
-class AppService extends Service
-{
-    public function register()
-    {
+class AppService extends Service {
+
+    public function register() {
         // 服务注册
     }
 
-    public function boot()
-    {
+    public function boot() {
         // 服务启动
+        error_reporting(E_ALL ^ E_NOTICE);
     }
+
 }

app/admin/model/Enterprise.php

@@ -11,6 +11,6 @@ use think\Model;
  */
 class Enterprise extends Model {
 
-    protected $table = "un_enterprise";
+    protected $table = "new_enterprise";
 
 }

app/common/api/UploadApi.php

@@ -46,7 +46,7 @@ class UploadApi {
     public function uploadOne($file, $path = "uploadfiles") {
         try {
             validate(['image' => ["sileSize" => $this->fileSize, "fileExt" => $this->fileExt, "fileMime" => $this->fileMime]])
-                    ->check(["file" => $file]);
+                    ->check([$file]);
             $savename = \think\facade\Filesystem::disk("public")->putFile($path, $file);
             return $savename;
         } catch (\think\exception\ValidateException $e) {

app/common/controller/Api.php

@@ -0,0 +1,112 @@
+<?php
+
+namespace app\common\controller;
+
+use app\BaseController;
+use app\common\middleware\Auth;
+use think\facade\Db;
+use think\facade\Config;
+
+/**
+ * 需要权限的公共方法放这
+ * Description of Tool
+ *
+ * @author sgq
+ */
+class Api extends BaseController {
+
+    protected $middleware = [Auth::class];
+    protected $user;
+
+    public function __construct(\think\App $app) {
+        parent::__construct($app);
+        $this->user = session("user");
+    }
+
+    public function findCommonFileType() {
+        $param = $this->request->param();
+        $order = $param["order"];
+        $project = $param["project"];
+        $type = $param["type"];
+        $checkState = $param["checkState"];
+        if ($checkState == 0) {
+            $where[] = ["step", "=", 1];
+        }
+        $where[] = ["project", "=", $project];
+        $where[] = ["type", "=", $type];
+        return json(["rows" => Db::table("new_common_filetype")->where($where)->order("sn " . $order)->select()]);
+    }
+
+    public function listTalentFile() {
+        $param = $this->request->param();
+        $mainId = $param["mainId"];
+        $typeId = $param["fileTypeId"];
+        $where = [["mainId", "=", $mainId], ["typeId", "=", $typeId]];
+        $list = Db::table("new_talent_file")->where($where)->select()->toArray();
+        foreach ($list as $key => $item) {
+            $list[$key]["url"] = "/storage/" . $item["url"]; //获取系统配置无效，暂时这样
+        }
+        return json($list);
+    }
+
+    public function addTalentFile() {
+        $backName = $this->request->param("backName");
+        $fileId = $this->request->param("fileId");
+        $mainId = $this->request->param("mainId");
+        $fileTypeId = $this->request->param("fileTypeId");
+        $index = $this->request->param("index");
+        $type = $this->request->param("type");
+        $upload = new \app\common\api\UploadApi();
+        $file = $this->request->file("fileUrl");
+        $url = $upload->uploadOne($file, "talent_files");
+        if ($fileId) {
+            if (!$this->chkIsFileOwner($mainId, $type))
+                return json(["msg" => "删除失败"]);
+            $old = Db::table("new_talent_file")->findOrEmpty($fileId);
+            $old_filepath = "storage/" . $old["url"];
+            if (file_exists($old_filepath))
+                unlink($old_filepath);
+            $data["id"] = $fileId;
+        }
+        $data["mainId"] = $mainId;
+        $data["type"] = $type;
+        $data["typeId"] = $fileTypeId;
+        $data["orignName"] = $file->getOriginalName();
+        $data["url"] = $url;
+        $data["sn"] = $index;
+        $data["createTime"] = time();
+        Db::table("new_talent_file")->save($data);
+        $res = ["code" => 200, "msg" => "上传附件成功", "obj" => $index, "info" => $url];
+        echo sprintf("<script>parent.%s(%s);</script>", $backName, json_encode($res));
+    }
+
+    public function deleteFile() {
+        $param = $this->request->param();
+        $where = [["id", "=", $param["id"]]];
+        $file = Db::table("new_talent_file")->where($where)->findOrEmpty();
+        if ($this->chkIsFileOwner($file["mainId"], $file["type"])) {
+            $filepath = "storage/" . $file["url"];
+            if (file_exists($filepath)) {
+                unlink($filepath);
+            }
+            Db::table("new_talent_file")->delete($file["id"]);
+            return json(["code" => 200, "msg" => "删除成功"]);
+        }
+        return json(["msg" => "不能删除"]);
+    }
+
+    private function chkIsFileOwner($mainId, $type) {
+        switch ($type) {
+            case 1:
+                if ($this->user["usertype"] == 2) {
+                    $user_id = $this->user["uid"];
+                    $talent_info = Db::table("new_talent_info")->findOrEmpty($mainId);
+                    if ($user_id == $talent_info["enterprise_id"])
+                        return true;
+                }
+                break;
+        }
+        return false;
+    }
+
+}

app/enterprise/api/TalentApi.php

@@ -17,19 +17,22 @@ class TalentApi {
         $offset = trim($request->param("offset")) ?: 0;
         $limit = trim($request->param("limit")) ?: 10;
         $name = trim($request->param("name"));
-        $idCard = trim($request->param("idCard"));
+        $idCard = trim($request->param("card_number"));
         $sex = trim($request->param("sex"));
         $nation = trim($request->param("nation"));
         $nationality = trim($request->param("nationality"));
-        $talentType = trim($request->param("talentType"));
-        $talentArrange = trim($request->param("talentArrange"));
+        $talentArrange = trim($request->param("talent_arrange"));
         $checkState = trim($request->param("checkState"));
+
         $where = [];
+        if (session("user")["usertype"] == 2) {
+            $where[] = ["enterprise_id", "=", session("user")["uid"]];
+        }
         if ($name) {
             $where[] = ["name", "like", "%" . $name . "%"];
         }
         if ($idCard) {
-            $where[] = ["idCard", "like", "%" . $idCard . "%"];
+            $where[] = ["card_number", "like", "%" . $idCard . "%"];
         }
         if ($sex) {
             $where[] = ["sex", $sex];
@@ -40,11 +43,8 @@ class TalentApi {
         if ($nationality) {
             $where[] = ["nationality", $nationality];
         }
-        if ($talentType) {
-            $where[] = ["talentType", $talentType];
-        }
         if ($talentArrange) {
-            $where[] = ["name", $talentArrange];
+            $where[] = ["talent_arrange", $talentArrange];
         }
         if ($checkState) {
             switch ($checkState) {
@@ -70,13 +70,12 @@ class TalentApi {
         }
         $count = Talent::where($where)->count();
         $list = Talent::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
-        $talentTypeList = DictApi::selectByParentCode("un_jbt_talentType"); //人才标签
-        $talentArangeList = DictApi::selectByParentCode("un_talentLevel");//人才层次
+        $talentTypeList = DictApi::selectByParentCode("enterprise_tag"); //人才标签
+        $talentArangeList = DictApi::selectByParentCode("talent_arrange"); //人才层次
         //$talentTypeNameList = DictApi::selectByParentCode("un_talentLevel");//认定条件
         //DictApi::selectByParentCode($code);
         foreach ($list as $key => $item) {
-            $list[$key]["talentArrangeName"] = $talentArangeList[$item["talentArrange"]];
-            $list[$key]["talentTypeName"] = $talentTypeList[$item["talentType"]];
+            $list[$key]["talentArrangeName"] = isset($talentArangeList[$item["talent_arrange"]]) ? $talentArangeList[$item["talent_arrange"]] : "";
             $list[$key]["identifyConditionText"] = "";
         }
         return ["total" => $count, "rows" => $list];

app/enterprise/controller/Talent.php

@@ -4,6 +4,8 @@ namespace app\enterprise\controller;
 
 use app\enterprise\common\EnterpriseController;
 use app\enterprise\api\TalentApi;
+use app\enterprise\model\Talent as TalentModel;
+use think\facade\Db;
 
 /**
  * Description of Talent
@@ -22,15 +24,228 @@ class Talent extends EnterpriseController {
     }
 
     public function add() {
+        $request = $this->request;
+        $param = $request->param();
+        $id = isset($param["id"]) ? $param["id"] : 0;
+        if ($request->isPost()) {
+            if ($id) {
+                if (!$info = self::chkIsOwner($id, $this->user["uid"]))
+                    return json(["msg" => "没有对应的人才认定申报信息"]);
+                $data["id"] = $id;
+            }
+            $data["enterprise_id"] = $this->user["uid"];
+            $data["talent_type"] = $param["talent_type"];
+            $data["tax_insurance_month"] = $param["tax_insurance_month"];
+            $data["labor_contract_rangetime"] = $param["labor_contract_rangetime"];
+            $data["name"] = $param["name"];
+            $data["card_type"] = $param["card_type"];
+            $data["card_number"] = $param["card_number"];
+            $data["sex"] = $param["sex"];
+            $data["birthday"] = $param["birthday"];
+            $data["nationality"] = $param["nationality"];
+            $data["province"] = $param["province"];
+            $data["city"] = $param["city"];
+            $data["county"] = $param["county"];
+            $data["nation"] = $param["nation"];
+            $data["politics"] = $param["politics"];
+            $headimg = $request->file("photo");
+            $upload = new \app\common\api\UploadApi();
+            $headimgurl = $upload->uploadOne($headimg, "talent/photo");
+            $data["headimgurl"] = $headimgurl;
+            TalentModel::save($data);
+        }
+        $where = [];
+        $info = [];
         $enterprise_info = \app\admin\model\Enterprise::find($this->user["uid"]);
-        return view("", ["year" => date("Y"), "enterprise" => $enterprise_info]);
+        if (isset($param["id"])) {
+            $where[] = ["id", "=", $param["id"]];
+            $where[] = ["enterprise_id", "=", $this->user["uid"]];
+            $info = TalentModel::where($where)->findOrEmpty();
+        }
+        $checkState = 0;
+        $info["enterprise"] = $enterprise_info;
+        return view("first", ["year" => date("Y"), "checkState" => $checkState, "row" => $info]);
     }
 
-    public function addTalentFile() {
-        $file = $this->request->file("fileUrl");
-        $upload = new \app\common\api\UploadApi();
-        $res = $upload->uploadOne($file);
-        var_dump($res);exit();
+    public function edit() {
+        $param = $this->request->param();
+        if (!isset($param["id"]))
+            return json(["msg" => "错误的打开方式"]);
+        $info = Db::table("new_talent_info")->findOrEmpty($param["id"]);
+        if ($info["checkState"] == 0) {
+            return redirect("/enterprise/talent/add/id/" . $info["id"]);
+        }
+        $enterprise_info = \app\admin\model\Enterprise::find($info["enterprise_id"]);
+        $info["enterprise"] = $enterprise_info;
+        return view("", ["year" => date("Y"), "checkState" => $checkState, "enterprise" => $enterprise_info]);
+    }
+
+    public function submit() {
+        $id = $this->request->param("id");
+        if (!$info = self::chkIsOwner($id, $this->user["uid"]))
+            return json(["msg" => "没有对应的人才认定申报信息"]);
+        switch ($info["checkState"]) {
+            case 0:
+                $no_empty = ["talent_type", "name", "card_type", "card_number", "sex", "birthday", "nationality", "province", "city", "nation", "politics"];
+                $return = [];
+                foreach ($no_empty as $key) {
+                    if (!$info[$key]) {
+                        $return[] = sprintf("请填写“%s”", self::dict($key));
+                    }
+                }
+                if (in_array($info["talent_type"], [1, 2]) && !$info["tax_insurance_month"])
+                    $return[] = sprintf("请填写“%s”", self::dict("tax_insurance_month"));
+                if ($info["talent_type"] == 3 && !$info["labor_contract_rangetime"])
+                    $return[] = sprintf("请填写“%s”", self::dict("labor_contract_rangetime"));
+                if (count($return) > 0)
+                    return json(["msg" => implode("<br>", $return)]);
+                $where = [];
+                $where[] = ["step", "=", 1];
+                $where[] = ["project", "=", 1];
+                $where[] = ["type", "=", $this->user["type"]];
+                $where[] = ["must", "=", 1];
+                $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
+
+                $ft_ids = array_column($filetypes, "id");
+                $whr = [];
+                $whr[] = ["typeId", "in", $ft_ids];
+                $whr[] = ["mainId", "=", $info["id"]];
+                $upload_type_counts = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->count();
+                if ($upload_type_counts != $filetypes)
+                    return json(["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"]);
+                break;
+        }
+    }
+
+    static private function chkIsOwner($id, $uid) {
+        $where[] = ["id", "=", $id];
+        $where[] = ["enterprise_id", "=", $uid];
+        $info = TalentModel::where($where)->findOrEmpty()->toArray();
+        return $info;
+    }
+
+    static private function dict($key) {
+        $value = "";
+        switch ($key) {
+            case "talent_type":
+                $value = "人才类型";
+                break;
+            case "tax_insurance_month":
+                $value = "在我市缴交社会保险或个人所得税月份";
+                break;
+            case "labor_contract_rangetime":
+                $value = "劳动合同起止时间";
+                break;
+            case "name":
+                $value = "姓名";
+                break;
+            case "card_type":
+                $value = "证件类型";
+                break;
+            case "card_number":
+                $value = "证件号码";
+                break;
+            case "sex":
+                $value = "性别";
+                break;
+            case "birthday":
+                $value = "出生日期";
+                break;
+            case "nationality":
+                $value = "国籍/地区";
+                break;
+            case "province":
+                $value = "籍贯省";
+                break;
+            case "city":
+                $value = "籍贯市";
+                break;
+            case "county":
+                $value = "籍贯县";
+                break;
+            case "nation":
+                $value = "民族";
+                break;
+            case "politics":
+                $value = "政治面貌";
+                break;
+            case "talent_arrange":
+                $value = "";
+                break;
+            case "talent_condition":
+                $value = "";
+                break;
+            case "highest_degree":
+                $value = "";
+                break;
+            case "graduate_school":
+                $value = "";
+                break;
+            case "major":
+                $value = "";
+                break;
+            case "professional":
+                $value = "";
+                break;
+            case "bank":
+                $value = "";
+                break;
+            case "bank_number":
+                $value = "";
+                break;
+            case "bank_branch_name":
+                $value = "";
+                break;
+            case "bank_account":
+                $value = "";
+                break;
+            case "study_abroad":
+                $value = "";
+                break;
+            case "abroad_school":
+                $value = "";
+                break;
+            case "abroad_major":
+                $value = "";
+                break;
+            case "phone":
+                $value = "";
+                break;
+            case "email":
+                $value = "";
+                break;
+            case "apply_year":
+                $value = "";
+                break;
+            case "import_way":
+                $value = "";
+                break;
+            case "fst_work_time":
+                $value = "";
+                break;
+            case "cur_entry_time":
+                $value = "";
+                break;
+            case "position":
+                $value = "";
+                break;
+            case "source":
+                $value = "";
+                break;
+            case "fujian_highcert_pubtime":
+                $value = "";
+                break;
+            case "fujian_highcert_exptime":
+                $value = "";
+                break;
+            case "quanzhou_highcert_pubtime":
+                $value = "";
+                break;
+            case "quanzhou_highcert_exptime":
+                $value = "";
+                break;
+        }
+        return $value;
     }
 
 }

app/enterprise/model/Talent.php

@@ -11,6 +11,6 @@ use think\Model;
  */
 class Talent extends Model {
 
-    protected $table = "un_talent_info";
+    protected $table = "new_talent_info";
 
 }

app/enterprise/validate/TalentInfo.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\enterprise\validate;
+
+use think\Validate;
+
+/**
+ * Description of TalentInfo
+ * 先不用。分两步等下通不过
+ * @author sgq
+ */
+class TalentInfo extends Validate {
+
+    protected $rule = [
+        'name' => 'require',
+        'sex' => 'require|number|between:1,2',
+        'email' => 'email',
+    ];
+    protected $message = [
+        'name.require' => '名称必须',
+        'email' => '邮箱格式错误',
+    ];
+
+}

app/enterprise/view/talent/first.html

@@ -0,0 +1,213 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .panel-heading{
+        color:#333;
+        background-color:#f5f5f5;
+        border-color:#ddd
+    }
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    #talentInfoForm label {
+        font-size: xx-small;
+    }
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    .control-label{
+        color: #337ab7;
+    }
+    .rowGroup{
+        padding-bottom: 5px;
+    }
+    .imgs li{
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12" >
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <div class="panel-body" >
+                                <div class="panel panel-default">
+                                    <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="{$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="file" name="photo" id="photo" style="display: none">
+                                                <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="checkState" id="checkState" value="{$checkState}">
+                                                <input type="hidden" name="step" id="step" value="1">
+                                                <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="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()">
+                                                                <option value="">请选择</option>                                                               
+                                                            </select>
+                                                        </div>
+                                                        {if condition="in_array($row['talent_type'],[1,2])"}                                                        
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                            <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
+                                                        </div>
+                                                        {else/}
+                                                        <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="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
+                                                        </div>
+                                                        {/if}                                                        
+                                                        {if condition="$row['talent_type'] eq 3"}  
+                                                        <div class="rowGroup col-sm-3">
+                                                            <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> 
+                                                        {else/}
+                                                        <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 rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
+                                                        </div> 
+                                                        {/if}
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>单位标签</label>
+                                                            <select class="form-control" id="enterprise_tag"  value="{$row.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="enterprise_name"  name="enterprise_name" readonly="readonly" value="{$row.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="{$row.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="industry_field" value="{$row.enterprise.industryFieldNew}" name="industry_field" 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="name" name="name"  value='{$row.name}'/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
+                                                            <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>
+                                                                <option value="3">护照</option>
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
+                                                            <input class="form-control" id="card_number" name="card_number" value='{$row.card_number}'>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
+                                                            <select class="form-control" id="sex" name="sex" value='{$row.sex}'>
+                                                                <option value="">请选择</option>
+                                                                <option value="1">男</option>
+                                                                <option value="2">女</option>
+                                                            </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="birthday" name="birthday" value='{$row.birthday}'/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                            <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
+                                                            </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.afterSelectProvince()" id="province" name="province" value='{$row.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="city" name="city" value='{$row.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="county" name="county" value='{$row.county}'></select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
+                                                            <select class="form-control" id="nation" name="nation" value='{$row.nation}'>
+                                                            </select>
+                                                        </div>       
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                            <select class="form-control" id="politics" name="politics" value='{$row.politics}'>
+                                                            </select>
+                                                        </div>  
+                                                    </div>
+                                                    <div class="col-sm-1">
+                                                        <img id="photoImg" {if condition="file_exist('storage/talent/photo'.$row[headimgurl])"} src="/storage/talent/photo/{$row.headimgurl}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click()" style="height: 110px;width: 76px;padding-bottom: 5px;">
+                                                    </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>
+                                        </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">
+                                            <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="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                            <input type='hidden' id="fileId" name="fileId" >
+                                            <input type='file' id="upload_file" name="fileUrl" style='display: none'>
+                                            <input type='hidden' id="mainId" name="mainId" >
+                                            <input type='hidden' id="fileTypeId" name="fileTypeId" >
+                                            <input type='hidden' id="index" name="index" >
+                                            <input type="hidden" name="backName" value="TalentInfoInfoDlg.callBack">
+                                            <input type="type" name="type" value="1">
+                                        </form>
+                                    </div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                    <table id="logTable">
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo_info.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/gate/talentInfo/talentInfo_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/index.html

@@ -33,7 +33,7 @@
                                         <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">证件号码
                                         </button>
                                     </div>
-                                    <input type="text" class="form-control" id="idCard" placeholder="">
+                                    <input type="text" class="form-control" id="card_number" placeholder="">
                                 </div>
                             </div>
                             <div class="col-sm-3">
@@ -79,7 +79,7 @@
                                             人才标签
                                         </button>
                                     </div>
-                                    <select class="form-control" id="talentType">
+                                    <select class="form-control" id="enterprise_tag">
                                     </select>
                                 </div>
                             </div>
@@ -90,7 +90,7 @@
                                             人才层次
                                         </button>
                                     </div>
-                                    <select class="form-control" id="talentArrange">
+                                    <select class="form-control" id="talent_arrange">
                                     </select>
                                 </div>
                             </div>

app/enterprise/view/talent/add.html → app/enterprise/view/talent/second.html

@@ -55,7 +55,7 @@
                                                 <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="">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$checkState}">
                                                 <div class="row">
                                                     <div class="col-sm-11">
                                                         <div class="rowGroup col-sm-3">

default.env

@@ -0,0 +1 @@
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
DATABASE = jjrc
USERNAME = root
PASSWORD = 
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn

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

@@ -176,15 +176,15 @@ TalentInfo.openAddTalentInfo = function () {
  */
 TalentInfo.openTalentInfoDetail = function () {
     if (this.check()) {
-        var ajax = new $ax("/api/commonBatch/valiateIsEditOrSubmit", function (data) {
-            if (data.code == 200) {
+        //var ajax = new $ax("/api/commonBatch/valiateIsEditOrSubmit", function (data) {
+            //if (data.code == 200) {
                 var index = layer.open({
                     type: 2,
                     title: '人才认定申报详情',
                     area: ['800px', '420px'], //宽高
                     fix: false, //不固定
                     maxmin: true,
-                    content: '/api/talentInfo/talentInfo_update/' + TalentInfo.seItem.id + "/update",
+                    content: '/enterprise/talent/add/id/' + TalentInfo.seItem.id + "/update",
                     btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-check layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
                     btnAlign: 'c',
                     btn1: function (index, layero) {
@@ -204,15 +204,15 @@ TalentInfo.openTalentInfoDetail = function () {
                 });
                 layer.full(index);
                 TalentInfo.layerIndex = index;
-            } else {
-                Feng.info(data.msg);
-            }
-        }, function (data) {
-            Feng.error("校验失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("type", CONFIG.project_rcrd);
-        ajax.set("year", TalentInfo.seItem.year);
-        ajax.start();
+            //} else {
+             //   Feng.info(data.msg);
+           // }
+      //  }, function (data) {
+       //     Feng.error("校验失败!" + data.responseJSON.message + "!");
+       // });
+       // ajax.set("type", CONFIG.project_rcrd);
+       // ajax.set("year", TalentInfo.seItem.year);
+       // ajax.start();
     }
 };
 
@@ -309,9 +309,9 @@ $(function () {
     //批量加载字典表数据
     var arr = [
         {"name": "nation", "code": "nation"},
-        {"name": "talentArrange", "code": "talent_arrange"},
+        {"name": "talent_arrange", "code": "talent_arrange"},
         {"name": "nationality", "code": "nationality"},
-        {"name": "talentType", "code": "talent_type"}];
+        {"name": "enterprise_tag", "code": "enterprise_tag"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
 });
 

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

@@ -4,103 +4,6 @@
 var locked = false;
 var TalentInfoInfoDlg = {
     talentInfoInfoData: {},
-    validateFields: {
-        enterprise_id: {validators: {notEmpty: {message: '所属企业不能为空'}}},
-        talent_type: {validators: {notEmpty: {message: '人才类型不能为空'}}},
-        enterprise_tag: {validators: {notEmpty: {message: '单位标签不能为空'}}},
-        enterprise_name: {validators: {notEmpty: {message: '单位名称不能为空'}}},
-        address: {validators: {notEmpty: {message: '所属街道不能为空'}}},
-        industry_field: {validators: {notEmpty: {message: '产业领域不能为空'}}},
-        name: {validators: {notEmpty: {message: '姓名不能为空'}}},
-        card_type: {validators: {notEmpty: {message: '证件类型不能为空'}}},
-        card_number: {validators: {notEmpty: {message: '证件号码不能为空'}}},
-        sex: {validators: {notEmpty: {message: '性别不能为空'}}},
-        birthday: {validators: {notEmpty: {message: '出生日期不能为空'}}},
-        nationality: {validators: {notEmpty: {message: '国籍/地区不能为空'}}},
-        province: {validators: {notEmpty: {message: '户籍省份不能为空'}}},
-        city: {validators: {notEmpty: {message: '户籍市不能为空'}}},
-        nation: {validators: {notEmpty: {message: '民族不能为空'}}},
-        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
-        apply_year: {validators: {notEmpty: {message: '申报年度不能为空'}}},
-        fst_work_time: {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}},
-        import_way: {validators: {notEmpty: {message: '引进方式不能为空'}}},
-        cur_entry_time: {validators: {notEmpty: {message: '本单位入职时间不能为空'}}},
-        position: {validators: {notEmpty: {message: '本单位现任职务不能为空'}}},
-        source: {validators: {notEmpty: {message: '申报来源不能为空'}}},
-        talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
-        talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
-        highest_degree: {validators: {notEmpty: {message: '最高学历不能为空'}}},
-        graduate_school: {validators: {notEmpty: {message: '毕业院校不能为空'}}},
-        major: {validators: {notEmpty: {message: '专业不能为空'}}},
-        bank: {
-            validators: {
-                notEmpty: {
-                    message: '开户银行不能为空'
-                },
-                regexp: {
-                    regexp: /^[\u4e00-\u9fa5]*银行$/,
-                    message: "开户银行格式不正确"
-                }
-            }
-        },
-        bank_number: {
-            validators: {
-                notEmpty: {
-                    message: '银行行号不能为空'
-                },
-                regexp: {
-                    regexp: /^\d+$/,
-                    message: "银行行号格式不正确"
-                }
-            }
-        },
-        bank_branch_house: {
-            validators: {
-                notEmpty: {
-                    message: '开户银行网点不能为空'
-                },
-                regexp: {
-                    regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*省?[\u4e00-\u9fa5]+市[\u4e00-\u9fa5]*$/,
-                    message: "开户银行格式不正确"
-                }
-            }
-        },
-        bank_account: {
-            validators: {
-                notEmpty: {
-                    message: '银行账号不能为空'
-                },
-                regexp: {
-                    regexp: /^\d+$/,
-                    message: "银行账号格式不正确"
-                }
-            }
-        },
-        phone: {
-            validators: {
-                notEmpty: {
-                    message: '手机号码不能为空'
-                },
-                regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
-                    message: "手机号码格式不正确"
-                }
-            }
-        },
-        email: {
-
-            validators: {
-                notEmpty: {
-                    message: '电子邮箱不能为空'
-                },
-                emailAddress: {
-                    message: "电子邮箱格式不正确"
-                }
-            }
-        },
-        mainHonours: {validators: {notEmpty: {message: '主要业绩及取得的荣誉不能为空'}}},
-        educationAndResume: {validators: {notEmpty: {message: '教育背景及工作简历不能为空'}}},
-    }
 };
 
 /**
@@ -469,6 +372,7 @@ TalentInfoInfoDlg.initFileTable = function () {
     var queryData = {};
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
+    queryData['checkState'] = $("#checkState").val();
     $("#fileTable").bootstrapTable({
         url: "/common/api/findCommonFileType",
         method: 'POST',
@@ -566,7 +470,7 @@ TalentInfoInfoDlg.validId = function () {
 //选择附件并显示附件名
 TalentInfoInfoDlg.checkFile = function (content, state, fileTypeId, fileId) {
     //if (!TalentInfoInfoDlg.validateIsEdit())
-        //return;
+    //return;
     $("#upload_file ").unbind("change");
     $("#upload_file ").change(function () {
         TalentInfoInfoDlg.upload(fileTypeId, fileId);
@@ -577,12 +481,12 @@ TalentInfoInfoDlg.checkFile = function (content, state, fileTypeId, fileId) {
 //上传附件
 TalentInfoInfoDlg.upload = function (fileTypeId, fileId) {
     var id = $("#id").val();
-    /*if (id == null || id == '') {
+    if (id == null || id == '') {
         Feng.info("请先添加基本信息并保存后再试");
         return;
     }
-    if (!TalentInfoInfoDlg.validateIsEdit())
-        return;*/
+    /*if (!TalentInfoInfoDlg.validateIsEdit())
+     return;*/
     if (fileId != null && fileId != 'null') {
         $("#fileId").val(fileId)
     } else {
@@ -596,10 +500,10 @@ TalentInfoInfoDlg.upload = function (fileTypeId, fileId) {
 }
 //删除附件
 TalentInfoInfoDlg.deleteFile = function (id, state) {
-    if (!TalentInfoInfoDlg.validateIsEdit())
-        return;
+    //if (!TalentInfoInfoDlg.validateIsEdit())
+    //return;
     var operation = function () {
-        var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/deleteFile", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/common/api/deleteFile", function (data) {
             if (data.code = 200) {
                 Feng.success(data.msg);
                 $("#fileTable").bootstrapTable("refresh", {});
@@ -628,7 +532,7 @@ TalentInfoInfoDlg.submitToCheck = function () {
     if (!TalentInfoInfoDlg.validateIsEdit())
         return;
     var operation = function () {
-        var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/submitToCheck", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/submit", function (data) {
             if (data.code == 200) {
                 Feng.success(data.msg);
                 // $("#checkState").val(data.obj);
@@ -651,7 +555,7 @@ TalentInfoInfoDlg.submitToCheck = function () {
  */
 TalentInfoInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
-    if (checkState != 1 && checkState != 5 && checkState != 10) {
+    if (checkState != 0 && checkState != 5 && checkState != 10) {
         if (checkState == -1) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
@@ -710,7 +614,7 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
 TalentInfoInfoDlg.validUploadButton = function (type, row, fileTypeId, fileId) {
     var files = $("#files").val();
     var checkState = $("#checkState").val();
-    if (Feng.isEmptyStr(checkState) || checkState == 1 || (checkState == 10 && files.indexOf(fileTypeId) != -1)) {
+    if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 10 && files.indexOf(fileTypeId) != -1)) {
         if (type == 1) {          //上传
             return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this,'" + row.fState + "','" + fileTypeId + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-upload\"></i>上传" +
@@ -768,6 +672,108 @@ TalentInfoInfoDlg.setNoChangeField = function () {
 }
 
 $(function () {
+    var step = $("#step").val();
+    if (step == 1) {
+        $('#talentInfoForm').bootstrapValidator('addField', "source_county", {validators: {notEmpty: {message: '入选来源县市区不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_id", {validators: {notEmpty: {message: '所属企业不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "talent_type", {validators: {notEmpty: {message: '人才类型不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_tag", {validators: {notEmpty: {message: '单位标签不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "enterprise_name", {validators: {notEmpty: {message: '单位名称不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "address", {validators: {notEmpty: {message: '所属街道不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "industry_field", {validators: {notEmpty: {message: '产业领域不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "name", {validators: {notEmpty: {message: '姓名不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "card_type", {validators: {notEmpty: {message: '证件类型不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "card_number", {validators: {notEmpty: {message: '证件号码不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "sex", {validators: {notEmpty: {message: '性别不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "birthday", {validators: {notEmpty: {message: '出生日期不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "nationality", {validators: {notEmpty: {message: '国籍/地区不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "province", {validators: {notEmpty: {message: '户籍省份不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "city", {validators: {notEmpty: {message: '户籍市不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "nation", {validators: {notEmpty: {message: '民族不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "politics", {validators: {notEmpty: {message: '政治面貌不能为空'}}});
+    } else {
+        $('#talentInfoForm').bootstrapValidator('addField', "apply_year", {validators: {notEmpty: {message: '申报年度不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "fst_work_time", {validators: {notEmpty: {message: '首次来晋工作时间不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "import_way", {validators: {notEmpty: {message: '引进方式不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "cur_entry_time", {validators: {notEmpty: {message: '本单位入职时间不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "position", {validators: {notEmpty: {message: '本单位现任职务不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "source", {validators: {notEmpty: {message: '申报来源不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "talent_arrange", {validators: {notEmpty: {message: '人才层次不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "talent_condition", {validators: {notEmpty: {message: '认定条件不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "highest_degree", {validators: {notEmpty: {message: '最高学历不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "graduate_school", {validators: {notEmpty: {message: '毕业院校不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "major", {validators: {notEmpty: {message: '专业不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "bank", {
+            validators: {
+                notEmpty: {
+                    message: '开户银行不能为空'
+                },
+                regexp: {
+                    regexp: /^[\u4e00-\u9fa5]*银行$/,
+                    message: "开户银行格式不正确"
+                }
+            }
+        });
+        $('#talentInfoForm').bootstrapValidator('addField', "bank_number", {
+            validators: {
+                notEmpty: {
+                    message: '银行行号不能为空'
+                },
+                regexp: {
+                    regexp: /^\d+$/,
+                    message: "银行行号格式不正确"
+                }
+            }
+        });
+        $('#talentInfoForm').bootstrapValidator('addField', "bank_branch_house", {
+            validators: {
+                notEmpty: {
+                    message: '开户银行网点不能为空'
+                },
+                regexp: {
+                    regexp: /^[\u4e00-\u9fa5]*银行[\u4e00-\u9fa5]*省?[\u4e00-\u9fa5]+市[\u4e00-\u9fa5]*$/,
+                    message: "开户银行格式不正确"
+                }
+            }
+        });
+        $('#talentInfoForm').bootstrapValidator('addField', "bank_account", {
+            validators: {
+                notEmpty: {
+                    message: '银行账号不能为空'
+                },
+                regexp: {
+                    regexp: /^\d+$/,
+                    message: "银行账号格式不正确"
+                }
+            }
+        });
+        $('#talentInfoForm').bootstrapValidator('addField', "phone", {
+            validators: {
+                notEmpty: {
+                    message: '手机号码不能为空'
+                },
+                regexp: {
+                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    message: "手机号码格式不正确"
+                }
+            }
+        });
+        $('#talentInfoForm').bootstrapValidator('addField', "email", {
+
+            validators: {
+                notEmpty: {
+                    message: '电子邮箱不能为空'
+                },
+                emailAddress: {
+                    message: "电子邮箱格式不正确"
+                }
+            }
+        });
+        $('#talentInfoForm').bootstrapValidator('addField', "mainHonours", {validators: {notEmpty: {message: '主要业绩及取得的荣誉不能为空'}}});
+        $('#talentInfoForm').bootstrapValidator('addField', "educationAndResume", {validators: {notEmpty: {message: '教育背景及工作简历不能为空'}}});
+
+    }
+
     Feng.initValidatorTip("talentInfoForm", TalentInfoInfoDlg.validateFields);
     var hand = $("#hand").val();
     var id = $("#id").val();
@@ -815,18 +821,23 @@ $(function () {
         $("select").each(function () {
             $(this).val($(this).attr("value")).trigger("change");
         });
-        Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
+        //Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
     }
+    $("#talent_type").val($("#talent_type").attr("value"));
+    $("#card_type").val($("#card_type").attr("value"));
+    $("#sex").val($("#sex").attr("value"));
     $("#enterprise_tag").val($("#enterprise_tag").attr("value"));
     $("#address").val($("#address").attr("value"));
+    $("#nation").val($("#nation").attr("value"));
+    $("#nationality").val($("#nationality").attr("value"));
     $("#industry_field").val($("#industry_field").attr("value"));
     $("#province").val($("#province").attr("value"));
     TalentInfoInfoDlg.afterSelectProvince();
     $("#city").val($("#city").attr("value"));
     TalentInfoInfoDlg.afterSelectCity();
-    $("#countyCode").val($("#county").attr("value"));
-    $("#talent_arrange").val($("#talent_arrange").attr("value"));
+    $("#county").val($("#county").attr("value"));
     TalentInfoInfoDlg.getIdentifyCondition();
+    $("#politics").val($("#politics").attr("value"));
     $("#talent_arrange").val($("#talent_arrange").attr("value"));
     $("#talent_condition").val($("#talent_condition").attr("value"));
     TalentInfoInfoDlg.validId();