卫健申报审核++

app/common/api/DictApi.php

@@ -265,6 +265,42 @@ class DictApi {
         return $dict;
     }
 
+    public static function getTalentFields_WJ() {
+        $dict = [
+            "name" => "姓名",
+            "sex" => "性别",
+            "nation" => "民族",
+            "politics" => "政治面貌",
+            "card_type" => "证件类型",
+            "card_number" => "证件号码",
+            "birthday" => "出生日期",
+            "talent_type" => "人才类型",
+            "highest_degree" => "最高学历",
+            "graduate_school" => "毕业院校",
+            "major" => "专业",
+            "study_abroad" => "是否有留学经历",
+            "abroad_school" => "留学毕业院校",
+            "abroad_major" => "留学专业",
+            "position" => "职务",
+            "cur_entry_time" => "入职时间",
+            "labor_contract_rangetime" => "工作合同起止时间",
+            "title" => "职称",
+            "talent_arrange" => "人才层次",
+            "talent_arrange_category" => "人才条款",
+            "talent_condition" => "认定条件",
+            "phone" => "手机号码",
+            "email" => "电子邮箱",
+            "bank" => "开户银行",
+            "bank_account" => "银行账号",
+            "bank_number" => "银行行号",
+            "bank_branch_name" => "开户银行网点",
+            "education" => "教育背景及工作简历",
+            "experience" => "主要业绩及取得的荣誉",
+            "headimgurl" => "头像"
+        ];
+        return $dict;
+    }
+
     // 1保存未提交 2已提交未审核 3已审核 4驳回 5保存补充材料未提交 6提交补充材料进入初审 7初审通过 8初审驳回 9部门审核通过 10部门审核驳回 11复核通过 12复核驳回 13复核失败
     public static function getCheckLogStepName($state, $step) {
         $stepName = "";

app/common/api/UserApi.php

@@ -198,7 +198,8 @@ class UserApi {
                     "avatar" => $user["headPortrait"],
                     "rolename" => "企业用户",
                     "usertype" => $this->usertype,
-                    "type" => $user["type"]
+                    "type" => $user["type"],
+                    "isGeneral" => $user["isGeneral"]
                 ]);
                 break;
             case 3:

app/common/controller/Api.php

@@ -330,7 +330,7 @@ class Api extends BaseController {
                 } else {
                     $where[] = ["isConditionFile", "<>", 1]; //排除人才条件上传文件
                 }
-                if ($talent_condition && in_array($source, [3, 4, 5])) {
+                if (($talent_condition && in_array($source, [3, 4, 5])) || $type == \app\common\state\CommonConst::ENTERPRISE_WJ) {
                     $condition_info = Db::table("new_talent_condition")->findOrEmpty($talent_condition);
                     if ($condition_info["bindFileTypes"]) {
                         $whr[] = ["id", "in", $condition_info["bindFileTypes"]];

app/enterprise/api/TalentApi.php

@@ -78,19 +78,19 @@ class TalentApi {
                     }
                     break;
                 case 2:
-                    $where[] = ["checkState", "not in", [TalentState::FST_SAVE, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL, TalentState::BASE_REJECT, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_FAIL]];
+                    $where[] = ["checkState", "not in", [TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL, TalentState::BASE_VERIFY_FAIL]];
                     switch ($checkState) {
                         case -1:
                             $where[] = ["checkState", "in", [TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL]];
                             break;
                         case 1:
-                            $where[] = ["checkState", "=", TalentState::SCND_SAVE];
+                            $where[] = ["checkState", "in", [TalentState::SCND_SAVE, TalentState::FST_SAVE]];
                             break;
                         case 2:
-                            $where[] = ["checkState", "in", [TalentState::FST_VERIFY_REJECT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
+                            $where[] = ["checkState", "in", [TalentState::BASE_REJECT, TalentState::FST_VERIFY_REJECT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
                             break;
                         case 3:
-                            $where[] = ["checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS, TalentState::REVERIFY_PASS, TalentState::ZX_PASS,
+                            $where[] = ["checkState", "in", [TalentState::FST_SUBMIT, TalentState::SCND_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS, TalentState::REVERIFY_PASS, TalentState::ZX_PASS,
                                     TalentState::ANNOUNCED_REVERIFY_PASS, TalentState::PUBLISH_PASS]];
                             break;
                         case 4:
@@ -179,9 +179,9 @@ class TalentApi {
         $list = TalentTypeChange::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
         $talentArangeList = DictApi::selectByParentCode("talent_arrange"); //人才层次
 
-        foreach ($list as $k => $v){
-            $list[$k]["oldTalentArrangeName"] = array_key_exists($v["oldTalentArrange"],$talentArangeList) ? $talentArangeList[$v["oldTalentArrange"]] : "";
-            $list[$k]["newTalentArrangeName"] = array_key_exists($v["newTalentArrange"],$talentArangeList) ? $talentArangeList[$v["newTalentArrange"]] : "";
+        foreach ($list as $k => $v) {
+            $list[$k]["oldTalentArrangeName"] = array_key_exists($v["oldTalentArrange"], $talentArangeList) ? $talentArangeList[$v["oldTalentArrange"]] : "";
+            $list[$k]["newTalentArrangeName"] = array_key_exists($v["newTalentArrange"], $talentArangeList) ? $talentArangeList[$v["newTalentArrange"]] : "";
         }
 
         return ["total" => $count, "rows" => $list];

app/enterprise/controller/Talent.php

@@ -90,16 +90,26 @@ class Talent extends EnterpriseController {
         }
         if ($request->isPost()) {
             $checkState = $info["checkState"] ?: 0;
-            if ($checkState == TalentState::SCND_SAVE || $checkState == 0) {
+            if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::FST_SAVE || $checkState == 0) {
                 switch ($type) {
-                    case 1:
+                    case CommonConst::ENTERPRISE_NORMAL:
                         $this->mixSave($info, $request, TalentState::SCND_SAVE);
                         exit();
                         break;
-                    case 2:
+                    case CommonConst::ENTERPRISE_JC:
                         $this->icSave($info, $request, TalentState::SCND_SAVE);
                         exit();
                         break;
+                    case CommonConst::ENTERPRISE_WJ:
+                        if ($ep->isGeneral == 1) {
+                            $this->wjSave($info, $request, TalentState::SCND_SAVE);
+                        } else {
+                            $this->wjSave($info, $request, TalentState::FST_SAVE);
+                        }
+                        break;
+                    case CommonConst::ENTERPRISE_GJ:
+                        $this->gjSave($info, $request, TalentState::SCND_SAVE);
+                        break;
                 }
             } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL])) {
                 $res = ["msg" => "审核不通过，不能再保存"];
@@ -303,10 +313,14 @@ class Talent extends EnterpriseController {
 
     public function submitToCheck() {
         switch ($this->user["type"]) {
-            case 1:
+            case CommonConst::ENTERPRISE_NORMAL:
                 return $this->submitToCheck_JJRC();
-            case 2:
+            case CommonConst::ENTERPRISE_JC:
                 return $this->submitToCheck_IC();
+            case CommonConst::ENTERPRISE_WJ:
+                return $this->submitToCheck_WJ();
+            case CommonConst::ENTERPRISE_GJ:
+                return $this->submitToCheck_GJ();
         }
     }
 
@@ -508,7 +522,7 @@ class Talent extends EnterpriseController {
             $whr = [];
             $whr[] = ["typeId", "in", $ft_ids];
             $whr[] = ["mainId", "=", $id];
-            $distinct_filetypes = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->select();
+            $distinct_filetypes = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->select()->toArray();
             $upload_type_counts = count($distinct_filetypes);
             if ($upload_type_counts != count($ft_ids)) {
                 return json(["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"]);
@@ -521,6 +535,75 @@ class Talent extends EnterpriseController {
         return json(["msg" => "已提交审核，请耐心等待", "code" => 500]);
     }
 
+    /**
+     * 提交表单：卫健
+     */
+    private function submitToCheck_WJ() {
+        $params = $this->request->param();
+        $id = $params["id"];
+        if (!$info = TalentApi::chkIsOwner($id, $this->user["uid"])) {
+            return json(["msg" => "没有对应的人才认定申报信息"]);
+        }
+        if ($info) {
+            $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
+        }
+        $checkState = $info["checkState"];
+        if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::FST_SAVE) {
+            $field_dict = \app\common\api\DictApi::getTalentFields_WJ();
+
+            $no_empty = ["name", "sex", "nation", "politics", "card_type", "card_number", "birthday", "talent_type",
+                "highest_degree", "graduate_school", "major", "position", "cur_entry_time", "labor_contract_rangetime",
+                "talent_arrange", "talent_condition",
+                "bank", "bank_account", "bank_number", "bank_branch_name"];
+
+            $no_empty = array_filter($no_empty);
+            $return = [];
+            foreach ($no_empty as $key) {
+                if (!$info[$key]) {
+                    $return[] = sprintf("请填写“%s”", $field_dict[$key]);
+                }
+            }
+            if (count($return) > 0) {
+                return json(["msg" => implode("<br>", $return)]);
+            }
+            $condition_info = Db::table("new_talent_condition")->findOrEmpty($params["talent_condition"]);
+            if ($condition_info["bindFileTypes"]) {
+                $whr[] = ["id", "in", $condition_info["bindFileTypes"]];
+                $whr[] = ["must", "=", 1];
+            }
+
+            $where = [];
+            $where[] = ["project", "=", ProjectState::TALENT];
+            $where[] = ["type", "=", $this->user["type"]];
+            $where[] = ["must", "=", 1];
+            $where[] = ["active", "=", 1];
+            $where[] = ["delete", "=", 0];
+            $where[] = ["isConditionFile", "<>", 1];
+            if ($whr) {
+                $filetypes = Db::table("new_common_filetype")->whereOr([$where, $whr])->select()->toArray();
+            } else {
+                $filetypes = Db::table("new_common_filetype")->where($where)->select()->toArray();
+            }
+            $ft_ids = array_column($filetypes, "id");
+            $whr = [];
+            $whr[] = ["typeId", "in", $ft_ids];
+            $whr[] = ["mainId", "=", $id];
+            $distinct_filetypes = Db::table("new_talent_file")->where($whr)->distinct(true)->field("typeId")->select()->toArray();
+            $upload_type_counts = count($distinct_filetypes);
+            if ($upload_type_counts != count($ft_ids)) {
+                return json(["msg" => "请留意附件上传栏中带*号的内容均为必传项，请上传完整再提交审核"]);
+            }
+            if ($checkState == TalentState::FST_SAVE) {
+                return $this->wjSave($info, $this->request, TalentState::FST_SUBMIT);
+            } else {
+                return $this->wjSave($info, $this->request, TalentState::SCND_SUBMIT);
+            }
+        } else if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, TalentState::BASE_REVERIFY_FAIL, TalentState::FST_VERIFY_FAIL, TalentState::REVERIFY_FAIL, TalentState::ZX_FAIL, TalentState::ANNOUNCED_REVERIFY_FAIL, TalentState::PUBLISH_FAIL])) {
+            return json(["msg" => "审核不通过，不能再提交审核", "code" => 500]);
+        }
+        return json(["msg" => "已提交审核，请耐心等待", "code" => 500]);
+    }
+
     /**
      * 保存表单(旧第二步)
      * @param type $info talent_info
@@ -796,6 +879,7 @@ class Talent extends EnterpriseController {
                 $success_msg = "保存成功";
                 if ($data["id"]) {
                     //编辑
+                    $data["updateTime"] = date("Y-m-d H:i:s");
                     TalentModel::update($data);
                     $last_log = TalentLogApi::getLastLog($data["id"], 1);
                     if ($last_log["new_state"] != TalentState::SCND_SAVE) {
@@ -808,6 +892,7 @@ class Talent extends EnterpriseController {
                 } else {
                     //新增
                     $data["enterprise_id"] = $this->user["uid"];
+                    $data["createTime"] = date("Y-m-d H:i:s");
                     $id = TalentModel::insertGetId($data);
                     TalentLogApi::write(1, $id, $checkState, "保存未提交", 1);
                     $whr = [];
@@ -822,10 +907,12 @@ class Talent extends EnterpriseController {
                     $data["new_submit_time"] = date("Y-m-d H:i:s");
                 }
                 if ($data["id"]) {
+                    $data["updateTime"] = date("Y-m-d H:i:s");
                     TalentModel::update($data);
                 } else {
                     //新增
                     $data["enterprise_id"] = $this->user["uid"];
+                    $data["createTime"] = date("Y-m-d H:i:s");
                     $id = TalentModel::insertGetId($data);
                     $whr = [];
                     $whr[] = ["fileId", "in", $files];
@@ -962,6 +1049,7 @@ class Talent extends EnterpriseController {
                 $success_msg = "保存成功";
                 if ($data["id"]) {
                     //编辑
+                    $data["updateTime"] = date("Y-m-d H:i:s");
                     TalentModel::update($data);
                     $last_log = TalentLogApi::getLastLog($data["id"], 1);
                     if ($last_log["new_state"] != TalentState::SCND_SAVE) {
@@ -974,6 +1062,7 @@ class Talent extends EnterpriseController {
                 } else {
                     //新增
                     $data["enterprise_id"] = $this->user["uid"];
+                    $data["createTime"] = date("Y-m-d H:i:s");
                     $id = TalentModel::insertGetId($data);
                     TalentLogApi::write(1, $id, $checkState, "保存未提交", 1);
                     $whr = [];
@@ -986,6 +1075,7 @@ class Talent extends EnterpriseController {
                 exit();
             } else if ($checkState == TalentState::SCND_SUBMIT) {
                 $data["new_submit_time"] = date("Y-m-d H:i:s");
+                $data["updateTime"] = date("Y-m-d H:i:s");
                 TalentModel::update($data);
                 TalentLogApi::write(1, $data["id"], $checkState, "确认提交审核", 1);
                 return json(["msg" => $success_msg, "code" => 200]);
@@ -1020,6 +1110,145 @@ class Talent extends EnterpriseController {
         }
     }
 
+    /**
+     * 卫健保存
+     * @param type $info
+     * @param \think\Request $request
+     * @param type $checkState
+     * @return type
+     * @throws ValidateException
+     */
+    private function wjSave($info, \think\Request $request, $checkState) {
+        try {
+            $batch = BatchApi::checkBatchValid(["type" => ProjectState::TALENT, "year" => $info["apply_year"], "first_submit_time" => $info["first_submit_time"]], $this->user["type"]);
+            if ($batch["code"] != 200) {
+                throw new ValidateException($batch["msg"]);
+            }
+            $param = $request->param();
+            validate(TalentInfo::class)->check($param);
+            $id = $param["id"];
+            if ($id) {
+                if (!$info || $info["id"] != $id || $info["enterprise_id"] != $this->user["uid"]) {
+                    throw new ValidateException("没有对应的人才认定申报信息");
+                }
+            }
+            $files = $param["uploadFiles"];
+            $data["headimgurl"] = $info["headimgurl"];
+            if ($request->file()) {
+                $headimg = $request->file("photo");
+                $upload = new \app\common\api\UploadApi();
+                $result = $upload->uploadOne($headimg, "image", "talent/photo");
+                $file = imagecreatefromstring(file_get_contents("storage/" . $result->filepath));
+                $width = imagesx($file);
+                $height = imagesy($file);
+                //免冠二寸照长宽413：579
+                if ($width * 579 != $height * 413) {
+                    @unlink("storage/" . $result->filepath); //像素不符合，删除上传文件                    
+                    throw new ValidateException("近期免冠半身彩照（二寸）不符合二寸像素标准。*<span style='color:#ff0000;'>二寸像素标准[413*579]</span>");
+                }
+                if ($info && $info["headimgurl"]) {
+                    //如果新照片符合像素要求，则删除旧照片
+                    $old_head_url = "storage/" . $info["headimgurl"];
+                    if (file_exists($old_head_url))
+                        @unlink($old_head_url);
+                }
+                $data["headimgurl"] = $result->filepath;
+            }
+            if (!$data["headimgurl"] && ($checkState == TalentState::SCND_SUBMIT || $checkState == TalentState::FST_SUBMIT))
+                throw new ValidateException("请上传头像。*<span style='color:#ff0000;'>二寸像素标准[413*579]</span>");
+
+            $data["apply_year"] = $batch["batch"];
+
+            $all_valid_keys = ["name", "sex", "nation", "politics", "card_type", "card_number", "birthday", "talent_type",
+                "highest_degree", "graduate_school", "major", "study_abroad", "abroad_school", "abroad_major",
+                "position", "cur_entry_time", "labor_contract_rangetime", "title",
+                "talent_arrange", "talent_condition",
+                "phone", "email", "bank", "bank_account", "bank_number", "bank_branch_name", "experience", "education"];
+            foreach ($all_valid_keys as $key) {
+                $value = trim($param[$key]);
+                if ($value) {
+                    $data[$key] = $value;
+                }
+            }
+
+            if ($info["real_state"] == TalentState::FST_VERIFY_REJECT || $info["real_state"] == TalentState::BASE_REJECT) {
+                //真实状态11是驳回，需要判断什么字段可以提交                
+                $modify_fields = array_filter(explode(",", $info["modify_fields"]));
+                $tmp_data = $data;
+                $data = [];
+                foreach ($modify_fields as $field) {
+                    $data[$field] = $tmp_data[$field];
+                }
+            }
+            $data["checkState"] = $checkState;
+            $data["id"] = $id;
+            $success_msg = "提交成功";
+            $error_msg = "提交失败";
+            if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::FST_SAVE) {
+                $success_msg = "保存成功";
+                if ($data["id"]) {
+                    //编辑
+                    $data["updateTime"] = date("Y-m-d H:i:s");
+                    TalentModel::update($data);
+                    $last_log = TalentLogApi::getLastLog($data["id"], 1);
+                    if ($last_log["new_state"] != TalentState::SCND_SAVE || $last_log["new_state"] != TalentState::FST_SAVE) {
+                        TalentLogApi::write(1, $data["id"], $checkState, "保存未提交", 1);
+                    } else {
+                        if (!$last_log["companyId"]) {
+                            TalentLogApi::setActive($last_log["id"], 1); //更新修改时间
+                        }
+                    }
+                } else {
+                    //新增
+                    $data["enterprise_id"] = $this->user["uid"];
+                    $data["createTime"] = date("Y-m-d H:i:s");
+                    $id = TalentModel::insertGetId($data);
+                    TalentLogApi::write(1, $id, $checkState, "保存未提交", 1);
+                    $whr = [];
+                    $whr[] = ["fileId", "in", $files];
+                    $upd_checklog["mainId"] = $id;
+                    Db::table("new_talent_checklog")->where($whr)->save($upd_checklog);
+                }
+                $res = ["code" => 200, "msg" => $success_msg, "obj" => ["id" => $id, "checkState" => $checkState]];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit();
+            } else if ($checkState == TalentState::SCND_SUBMIT || $checkState == TalentState::FST_SUBMIT) {
+                $data["new_submit_time"] = date("Y-m-d H:i:s");
+                $data["updateTime"] = date("Y-m-d H:i:s");
+                TalentModel::update($data);
+                TalentLogApi::write(1, $data["id"], $checkState, "确认提交审核", 1);
+                return json(["msg" => $success_msg, "code" => 200]);
+            } else {
+                throw new ValidateException($error_msg);
+            }
+        } catch (ValidateException $e) {
+            if ($checkState == TalentState::SCND_SAVE) {
+                $res = ["msg" => $e->getMessage()];
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit();
+            } else {
+                return json(["msg" => $e->getMessage()]);
+            }
+        } catch (\think\Exception $e) {
+            $res = ["msg" => "发生预料外错误，请联系管理员处理，错误代码：" . $e->getCode()];
+            $logInfo = [
+                "enterprise_id" => $this->user["uid"],
+                "data" => $data,
+                "controller" => $this->request->controller(),
+                "action" => $this->request->action(),
+                "errCode" => $e->getCode(),
+                "errMsg" => $e->getMessage()
+            ];
+            Log::write($logInfo, "error");
+            if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::FST_SAVE) {
+                echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
+                exit();
+            } else {
+                return json($res);
+            }
+        }
+    }
+
     public function delete() {
         $id = $this->request->param("talentInfoId");
         $info = Talent::chkIsOwner($id, $this->user["uid"]);
@@ -1035,12 +1264,13 @@ class Talent extends EnterpriseController {
             }
         }
         $data["id"] = $id;
+        $data["updateTime"] = date("Y-m-d H:i:s");
         $data["delete"] = 1;
         TalentModel::update($data);
         return json(["msg" => "删除成功"]);
     }
 
-    public function detail(){
+    public function detail() {
         $id = $this->request->param("id");
         $info = $this->getInfoById($id);
         return json($info);

app/enterprise/validate/TalentInfo.php

@@ -53,7 +53,7 @@ class TalentInfo extends Validate {
     protected $message = [
         //"name.regex" => "姓名允许中文、英文、或者空格，不能含有其它字符",
         "card_type.between" => "不存在的证件类型，请在列表中选择",
-        "card_number.checkUnique" => "身份证已经存在",
+        "card_number.checkUnique" => "证件号码已经存在",
         "sex.between" => "性别只能在预设列表中选择",
         "politics.between" => "政治面貌只能在预设列表中选择",
         "birthday.dateFormat" => "生日必需是有效日期格式[yyyy-MM-dd]",

app/enterprise/view/talent/hospital/apply.html

@@ -106,7 +106,7 @@
                                         </div>
                                         <div class="col">
                                             <label class="col-label"><span style="color: red">*</span>人才类型</label>
-                                            <select class="form-control w120" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()" data-value="{$row.talent_type}">
+                                            <select class="form-control w120" id="talent_type" name="talent_type" value="{$row.talent_type}" data-value="{$row.talent_type}">
                                                 <option value="">请选择</option>
                                                 {volist name="row.talent_type_list" id="item"}
                                                 <option value="{$item.code}">{$item.name}</option>
@@ -140,11 +140,11 @@
                                             </select>
                                         </div>
                                         <div class="col abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>      
-                                             <label class="col-label">留学毕业院校</label>                                               
+                                            <label class="col-label">留学毕业院校</label>                                               
                                             <input type="text" class="form-control w210" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
                                         </div>
                                         <div class="col abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>   
-                                             <label class="col-label">留学专业</label>                                                  
+                                            <label class="col-label">留学专业</label>                                                  
                                             <input type="text" class="form-control w210" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
                                         </div>
                                     </div>
@@ -183,7 +183,7 @@
                                         </div>
                                         <div class="col">
                                             <label class="col-label"><span style="color: red">*</span>认定条件</label>
-                                            <select class="form-control w175" id="talent_condition" name="talent_condition" value="{$row.talent_condition}"></select>
+                                            <select class="form-control w175" id="talent_condition" name="talent_condition" onchange="TalentInfoInfoDlg.changeIdentifyCondition()" value="{$row.talent_condition}"></select>
                                         </div>
                                     </div>
                                     <div class="row">
@@ -224,10 +224,10 @@
                                             <textarea style="overflow: auto;word-break: break-all;max-width:360px;" class="form-control w360" id="experience" name="experience" rows="5">{$row.experience}</textarea>
                                         </div>
                                     </div>
-                                    <div class="row">
-                                        <label class="col-sm-12col-label" style="text-align: left"><span style="color: red">声明：本人对输入材料的真实性负全部责任</span></label>
-                                    </div>
                                 </form>
+                                <div class="row">
+                                    <label class="col-sm-12" style="text-align: left;color: red;">声明：本人对输入材料的真实性负全部责任</label>
+                                </div>
                             </div>
                         </div>                             
                         <div class="container-fluid">
@@ -249,7 +249,7 @@
                                 <input type='hidden' id="fileTypeId" name="fileTypeId" >
                                 <input type='hidden' id="index" name="index" >
                                 <input type="hidden" name="backName" value="TalentInfoInfoDlg.callBack">
-                                <input type="hidden" name="type" value="5">
+                                <input type="hidden" name="type" value="1">
                             </form>
                         </div>  
                         {if condition="$row['id']"}

app/enterprise/view/talent/hospital/view.html

@@ -10,10 +10,11 @@
     .has-feedback .form-control {
         padding-right: 5px;
     }
-    .control-label{
+    .form-horizontal .has-feedback .form-control-feedback{top:0;right:0;}
+    .col-label{
         color: #337ab7;
     }
-    .rowGroup{
+    .col{
         padding-bottom: 5px;
     }
     .imgs li{
@@ -23,226 +24,216 @@
         text-align: center;
         height: 30px;
     }
+    .header{border-left:5px solid #518dff;letter-spacing:3px;text-indent:10px;margin:0 0 10px 0;}
+    .row{margin:0 0 10px 0;}
+    .col-label{float:left;margin:7px 10px;width:80px;text-align:right;}
+    .w80{width:80px;}
+    .w100{width:100px;}
+    .w120{width:120px;}
+    .w175{width:175px;}
+    .w210{width:210px;}
+    .w250{width:250px;}
+    .w300{width:300px;}
+    .w360{width:360px;}
+    .w490{width:490px;}
+    .w80,.w100.w120,.w175,.w210,.w250,.w300,.w360,.w490,.col,select.form-control{float:left;}
+    .container-fluid{margin:0 auto;width:1100px;background:#eef9ff;padding:20px;border:1px solid #c3d5ff;box-shadow:1px 1px 5px #c3d5ff;margin-bottom:20px;position:relative;}
+    .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
+        background-color:#e2ecf2;
+        opacity: 1;
+    }
+    .photo{position:absolute;width:200px;right:0px;top:60px;text-align:center;}
+    .ml5{margin-left:5px;}
 </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="tabs-container" >
-                        <ul class="nav nav-tabs">
-                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">基本信息</a></li>
-                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="TalentInfoInfoDlg.initFileTable()"  aria-expanded="false">申报附件</a></li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <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="/enterprise/talent/apply" method="post" enctype="multipart/form-data" target="hiddenIframe">
-                                            <div class="col-sm-12 form-group-sm">                                                
-                                                <input type="hidden" name="id" id="id" value="{$row.id}">
-                                                <input type="hidden" name="year" id="year" value="{$year}">
-                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterpriseId}">
-                                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterpriseType}">
-                                                <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterpriseTag}">
-                                                <input type="file" name="photo" id="photo" style="display: none">
-                                                <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
-                                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
-                                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
-                                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
-                                                <div class="row">
-                                                    <div class="col-sm-11">
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" value="{$row.name}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="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-4">
-                                                            <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-4">
-                                                            <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-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control" id="birthday" name="birthday" value="{$row.birthday}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
-                                                            <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="province" name="province" value="{$row.province}">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
-                                                            <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="city" name="city" value="{$row.city}"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
-                                                            <select class="form-control" id="county" name="county" value="{$row.county}"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <select class="form-control" id="nation" name="nation" value="{$row.nation}">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <select class="form-control" id="politics" name="politics" value="{$row.politics}">
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>是否曾被相关主管部门列为失信个人</label>
-                                                            <select class="form-control" id="break_faith" name="break_faith" value="{$row.break_faith}">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>手机号码</label>
-                                                            <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>电子邮箱</label>
-                                                            <input type="text" class="form-control" id="email" name="email" value="{$row.email}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>最高学历</label>
-                                                            <select class="form-control" id="highest_degree" name="highest_degree" value="{$row.highest_degree}"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>毕业学校</label>
-                                                            <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>专业</label>
-                                                            <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class="control-label spacing">是否有留学经历</label>
-                                                            <select class="form-control" id="study_abroad" name="study_abroad" value="{$row.study_abroad}">
-                                                                <option value="2">否</option>
-                                                                <option value="1">是</option>
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.enterpriseName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
-                                                            <input type="text" class="form-control" readonly="readonly" value="{$row.streetName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>职务</label>
-                                                            <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>入职时间</label>
-                                                            <input type="text" class="form-control" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>工作合同起止时间</label>
-                                                            <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                            <select class="form-control" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange}"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                            <select class="form-control" id="talent_condition" name="talent_condition" value="{$row.talent_condition}"></select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件名称</label>
-                                                            <input type="text" class="form-control" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
-                                                            <input type="text" class="form-control" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing">职称</label>
-                                                            <input type="text" class="form-control" id="title" name="title" value="{$row.title}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing">国家职业资格</label>
-                                                            <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                            <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" value="{$row.bank}" placeholder="XX银行"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                            <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" value="{$row.bank_branch_name}" PLACEHOLDER="XX银行XX省XX市XX支行/分行/分理处"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-4">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>银行账号</label>
-                                                            <input type="text" class="form-control" id="bank_account" name="bank_account" value="{$row.bank_account}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-12">
-                                                            <label class=" control-label spacing">备注</label>
-                                                            <input type="text" class="form-control" id="description" name="description" value="{$row.description}"/>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-sm-1">
-                                                        <img id="photoImg" {if condition="$row['headimgurl']"} src="{$row.headimgurl|getStoragePath}" {else/} src="/static/img/photo.png" {/if} style="height:147px;width:105px;">                                                        
-                                                    </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="education" name="education" rows="4">{$row.education}</textarea>
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>主要业绩及取得的荣誉</label>
-                                                        <textarea style="overflow: auto;word-break: break-all; " class="form-control" id="experience" name="experience" rows="4">{$row.experience}</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 class="panel-body" style="background:#dbedfd;">                                      
+                        <div class="container-fluid">
+                            <div class="form-group-sm">
+                                <form id="talentInfoForm" class="form-horizontal" action="/enterprise/talent/apply" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                    <input type="hidden" name="id" id="id" value="{$row.id}">
+                                    <input type="hidden" name="year" id="year" value="{$year}">
+                                    <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
+                                    <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
+                                    <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterprise.enterpriseTag}">
+                                    <input type="file" name="photo" id="photo" style="display: none">
+                                    <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
+                                    <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
+                                    <input type="hidden" name="files" id="files" value="{$row.modify_files}">
+                                    <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">       
+                                    <div class="header">
+                                        基本信息
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>姓名</label>
+                                            <input type="text" class="form-control w120" id="name" name="name" value="{$row.name}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>性别</label>
+                                            <select class="form-control w80" id="sex" name="sex" value="{$row.sex}">
+                                                <option value="">请选择</option>
+                                                <option value="1">男</option>
+                                                <option value="2">女</option>
+                                            </select>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>民族</label>
+                                            <input type="text" class="form-control w120" id="nation" name="nation" value="{$row.nationName}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>政治面貌</label>
+                                            <input type="text" class="form-control w120" id="politics" name="politics" value="{$row.politicsName}"/>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>证件类型 / 证件号码</label>
+                                            <select class="form-control w120" id="card_type" name="card_type">
+                                                <option value="">请选择</option>
+                                                <option value="1" {eq name="row.card_type" value="1"} selected="" {/eq}>身份证</option>
+                                                <option value="2" {eq name="row.card_type" value="2"} selected="" {/eq}>通行证</option>
+                                                <option value="3" {eq name="row.card_type" value="3"} selected="" {/eq}>护照</option>
+                                            </select>
+                                            <input class="form-control w175 ml5" id="card_number" name="card_number" value="{$row.card_number}">
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>出生日期</label>
+                                            <input type="text" class="form-control w120 date" id="birthday" name="birthday" value="{$row.birthday}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>人才类型</label>
+                                            <input type="text" class="form-control w120 date" id="talent_type" name="talent_type" value="{$row.talentTypeName}"/>
+                                        </div>
+                                    </div>
+                                    <div class="photo">
+                                        <img id="photoImg" onclick="Feng.showImg(this)" {if condition="$row['headimgurl']"} src="{$row.headimgurl|getStoragePath}" {else/} src="/static/img/avatar.png" {/if}  style="height:159px;width:105px;margin:0 auto;display:block;">
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>最高学历</label>
+                                            <input type="text" class="form-control w120" id="highest_degree" name="highest_degree" value="{$row.highestDegreeName}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>毕业学校</label>
+                                            <input type="text" class="form-control w210" id="graduate_school" name="graduate_school" value="{$row.graduate_school}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>专业</label>
+                                            <input type="text" class="form-control w210" id="major" name="major" value="{$row.major}"/>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100">是否有留学经历</label>
+                                            <select class="form-control w120" id="study_abroad" name="study_abroad">
+                                                {eq name="row.study_abroad" value="2"}<option value="2">否</option>{/eq}
+                                                {eq name="row.study_abroad" value="1"}<option value="1">是</option>{/eq}
+                                            </select>
+                                        </div>
+                                        <div class="col abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>      
+                                            <label class="col-label">留学毕业院校</label>                                               
+                                            <input type="text" class="form-control w210" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
+                                        </div>
+                                        <div class="col abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>   
+                                            <label class="col-label">留学专业</label>                                                  
+                                            <input type="text" class="form-control w210" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>工作医院名称</label>
+                                            <input type="text" class="form-control w360" readonly="readonly" value="{$row.enterpriseName}"/>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>职务</label>
+                                            <input type="text" class="form-control w175" id="position" name="position" value="{$row.position}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>入职时间</label>
+                                            <input type="text" class="form-control w120 date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label w120"><span style="color: red">*</span>工作合同起止时间</label>
+                                            <input type="text" class="form-control w175 rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label">职称</label>
+                                            <input type="text" class="form-control w120" id="title" name="title" value="{$row.title}"/>
+                                        </div>
                                     </div>
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
-                                    <table id="logTable">
-                                    </table>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>人才层次</label>
+                                            <input type="text" class="form-control w120" id="talent_arrange" name="talent_arrange" value="{$row.talentArrangeName}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>人才条款</label>
+                                            <input type="text" class="form-control w120" id="talent_arrange_category" name="talent_arrange_category" value="{$row.talentArrangeCatName}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>认定条件</label>
+                                            <input type="text" class="form-control w490" id="talent_condition" name="talent_condition" value="{$row.talentConditionName}"/>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100">手机号码</label>
+                                            <input type="text" class="form-control w175" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label">电子邮箱</label>
+                                            <input type="text" class="form-control w175" id="email" name="email" value="{$row.email}"/>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>开户银行</label>
+                                            <input type="text" class="form-control w120" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" value="{$row.bank}" placeholder="XX银行"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>银行账号</label>
+                                            <input type="text" class="form-control w120" id="bank_account" name="bank_account" value="{$row.bank_account}" onkeyup="value = value.replace(/\s+/g, '')"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label"><span style="color: red">*</span>银行行号</label>
+                                            <input type="text" class="form-control w120" id="bank_number" name="bank_number" value="{$row.bank_number}"/>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label w100"><span style="color: red">*</span>开户银行网点</label>
+                                            <input type="text" class="form-control w250" id="bank_branch_name" name="bank_branch_name" value="{$row.bank_branch_name}" PLACEHOLDER="XX银行XX省XX市XX支行/分行/分理处"/>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <label class="col-label w100">教育背景及工作简历</label>
+                                            <textarea style="overflow: auto;word-break: break-all;max-width:360px; " class="form-control w360" id="education" name="education" rows="5">{$row.education}</textarea>
+                                        </div>
+                                        <div class="col">
+                                            <label class="col-label w175">主要业绩及取得的荣誉</label>
+                                            <textarea style="overflow: auto;word-break: break-all;max-width:360px;" class="form-control w360" id="experience" name="experience" rows="5">{$row.experience}</textarea>
+                                        </div>
+                                    </div>
+                                </form>
+                                <div class="row">
+                                    <label class="col-sm-12" style="text-align: left;color: red;">声明：本人对输入材料的真实性负全部责任</label>
                                 </div>
                             </div>
-                        </div>
-                        <div id="tab-2" class="tab-pane ">
-                            <table id="fileTable" class="table-condensed"
-                                   style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true"
-                                   data-click-to-select="true">
+                        </div>                             
+                        <div class="container-fluid">
+                            <div class="header">
+                                上传附件
+                            </div>
+                            <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>
+                                    <tr>
+                                        <th data-field="selectItem" data-checkbox="true"></th>
+                                    </tr>
                                 </thead>
                             </table>
                             <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
@@ -253,9 +244,18 @@
                                 <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">
+                                <input type="hidden" name="type" value="5">
                             </form>
+                        </div>  
+                        {if condition="$row['id']"}
+                        <div class="container-fluid">  
+                            <div class="header">
+                                日志
+                            </div>
+                            <table id="logTable">
+                            </table>
                         </div>
+                        {/if}
                     </div>
                 </div>
             </div>
@@ -263,9 +263,8 @@
     </div>
 </div>
 <iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
-<!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo_ic_info.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="/static/modular/gate/talentInfo/talentInfo_ic_select.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/gate/talentInfo/talentInfo_wj_select.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
 {/block}

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

@@ -428,7 +428,7 @@ TalentInfoInfoDlg.addSubmit = function () {
     var name = $("#name").val().trim();
     var cardNumber = $("#card_number").val().trim();
     if (name == "" || cardNumber == "") {
-        layer.alert("姓名和身份证不能为空");
+        layer.alert("姓名和证件号码不能为空");
         return;
     }
     if (id != null && id != '') {

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

@@ -555,7 +555,7 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                             "<i class=\"fa fa-upload\"></i>上传" +
                             "</button>";
                 } else {
-                    return "审核通过，无法添加";
+                    return "";
                 }
 
             }

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

@@ -202,10 +202,15 @@ TalentInfoInfoDlg.addSubmit = function () {
     this.clearData();
     this.collectData();
     if (!TalentInfoInfoDlg.validate()) {
-        console.log(123)
         return;
     }
     var id = $('#id').val();
+    var name = $("#name").val().trim();
+    var cardNumber = $("#card_number").val().trim();
+    if (name == "" || cardNumber == "") {
+        layer.alert("姓名和证件号码不能为空");
+        return;
+    }
     if (id != null && id != '') {
         if (!TalentInfoInfoDlg.validateIsEdit())
             return;
@@ -270,6 +275,15 @@ TalentInfoInfoDlg.getLayerCatdByLayer = function () {
     $("#talent_condition").trigger("chosen:updated");
 }
 
+TalentInfoInfoDlg.changeIdentifyCondition = function () {
+    if (TalentInfoInfoDlg.initTalentCondtion != $("#talent_condition").val() && $("#talent_condition").val() != "") {
+        $("#fileTable").bootstrapTable("destroy", {});
+        TalentInfoInfoDlg.initFileTable();
+        //$("#fileTable").bootstrapTable("refresh", {});
+        TalentInfoInfoDlg.initTalentCondtion = $("#talent_condition").val();
+    }
+}
+
 TalentInfoInfoDlg.bankChange = function () {
     var bank = $("#bank").val();
     if ($.trim(bank) == '中国工商银行') {
@@ -294,6 +308,7 @@ TalentInfoInfoDlg.initFileTable = function () {
     var queryData = {};
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
+    queryData["talent_condition"] = $("#talent_condition").val();
     queryData['checkState'] = $("#checkState").val();
     queryData['isMix'] = 1;
     $("#fileTable").bootstrapTable({
@@ -481,7 +496,7 @@ TalentInfoInfoDlg.submitToCheck = function () {
  */
 TalentInfoInfoDlg.validateIsEdit = function () {
     var checkState = $("#checkState").val();
-    if (checkState != 0 && checkState != 8) {
+    if (checkState != 0 && checkState != 8 && checkState != 1) {
         if (checkState == 16 || checkState == -1 || checkState == -2 || checkState == 7) {
             Feng.error("您的申报审核不通过，无法再修改");
             return false;
@@ -535,12 +550,12 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                 var checkState = $("#checkState").val();
                 var realState = $("#realState").val();
                 //if (checkState == 8 || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(value) != -1)) {
-                if (Feng.isEmptyStr(checkState) || (checkState == 8 && (realState == 8 || Feng.isEmptyStr(realState))) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(value) != -1)) {
+                if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 1 && realState == "") || (checkState == 1 && realState == 1) || (checkState == 8 && (realState == 8 || Feng.isEmptyStr(realState))) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(value) != -1)) {
                     return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this,'" + row.fState + "','" + value + "','" + null + "')\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                             "<i class=\"fa fa-upload\"></i>上传" +
                             "</button>";
                 } else {
-                    return "审核通过，无法添加";
+                    return "";
                 }
 
             }
@@ -620,8 +635,9 @@ function async_padding(card_number, card_type) {
         }
     }
 }
-
+TalentInfoInfoDlg.initTalentCondtion = "";
 $(function () {
+    TalentInfoInfoDlg.initTalentCondtion = $("#talent_condition").attr("value");
     $('#talentInfoForm').bootstrapValidator({
         feedbackIcons: {
             valid: 'glyphicon glyphicon-ok',

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

@@ -0,0 +1,131 @@
+/**
+ * 初始化人才认定申报详情对话框
+ */
+var locked = false;
+var TalentInfoInfoDlg = {
+    talentInfoInfoData : {},
+};
+
+//初始化附件类别表单
+TalentInfoInfoDlg.initFileTable = function (){
+    var queryData = {};
+    queryData['project'] = CONFIG.project_rcrd;
+    queryData['type'] = $("#type").val();
+    queryData['checkState'] = $("#checkState").val();
+    queryData['isMix'] = 1;
+    $("#fileTable").bootstrapTable({
+        url: Feng.ctxPath + "/common/api/findCommonFileType",
+        method: 'POST',
+        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+        search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+        showRefresh: false,				// 是否显示刷新按钮
+        clickToSelect: true,			// 是否启用点击选中行
+        singleSelect: true,				// 设置True 将禁止多选
+        striped: true,  				// 是否显示行间隔色
+        escape: true,
+        pagination: false,   			// 设置为 true 会在表格底部显示分页条
+        paginationHAlign: "left",
+        paginationDetailHAlign: "right",
+        sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+        showColumns: false,
+        detailView: true,               //是否显示父子表
+        pageList: [10, 30, 50],
+        queryParams: function (params) {
+            return $.extend(queryData,params)
+        },
+        rowStyle: function (row, index) {
+            return {classes:"info"};
+        },
+        columns: TalentInfoInfoDlg.initFileTypeColumn(),
+        onPostBody: function () {
+            $("td.uitd_showTip").bind("mouseover", function () {
+                var htm = $(this).html();
+                $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+            });
+        },
+        onLoadSuccess: function (data) {
+            $("#fileTable").bootstrapTable('expandAllRows');
+        },
+        onExpandRow: function (index, row, $detail) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
+                if(data==null||data.length==0){
+                    return;
+                }
+                var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li>';
+                var files = $("#files").val();
+                var checkState = $("#checkState").val();
+                for(var key in data){
+                    var sn = data[key].url.lastIndexOf(".");
+                    var suffix = data[key].url.substring(sn+1,data[key].url.length);
+                    var imgStr = "";
+                    if(suffix=="pdf"||suffix=="PDF"){
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    }else if(suffix == "xlsx" || suffix=="XLSX" || suffix == 'xls' || suffix == 'XLS'){
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('"+data[key].url+"','"+data[key].id+"','"+data[key].orignName+"')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    }else{
+                        imgStr = '<img class=\"imgUrl\"  src=\"'+data[key].url+'\" style=\"width:25px;height:25px;\">';
+                    }
+                    html = html + '<li style="display: none">'+data[key].id+'</li>\n'+
+                        '<li style="width: 80%;padding-top: 5px;">'+data[key].orignName+'</li>\n'+
+                        '<li style="width: 10%;">'+imgStr+'</li>\n';
+                }
+                html = html + '</ul>';
+                $detail.html(html);
+                $(".imgs").viewer({ fullscreen:false});
+            }, function (data) {
+                Feng.error("查询失败!" + data.responseJSON.message + "!");
+            });
+            var queryData = {};
+            queryData["mainId"] = $("#id").val();
+            queryData["fileTypeId"] = row.id;
+            ajax.set(queryData);
+            ajax.start();
+        }
+    });
+
+}
+
+
+/**
+ * 初始化表格的列
+ */
+TalentInfoInfoDlg.initFileTypeColumn = function () {
+    return [
+        {field: 'selectItem', checkbox:false,visible:false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle',width:"30%",'class': 'uitd_showTip',
+            formatter : function(value,row,index){
+                if(row.must==1){
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> '+ value;
+                }if(row.must==2){
+                    return '<i class="fa fa-paste"></i>'+value;
+                }
+            }
+        },
+        {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle',width:"8%",
+            formatter : function(value,row,index){
+                if(value==null||value==''||value=='null'){
+                    return '无';
+                }
+                return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('"+row.id+"',5)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                    "<i class=\"fa fa-download\"></i>下载" +
+                    "</button>";
+            }
+        },
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle',width:"52%",'class': 'uitd_showTip'},
+    ]
+};
+
+TalentInfoInfoDlg.downloadFile = function (id,type){
+    window.location.href = Feng.ctxPath + "/common/api/downloadFile?id=" + id + "&type="+type;
+}
+
+$(function() {
+    var id = $("#id").val();
+    if(id!=null && id!=''){
+        Feng.getCheckLog("logTable",{"type":CONFIG.project_rcrd,"mainId":id,"typeFileId":"","active":1})
+    }
+    
+    $("input,select,textarea").not("input[type='hidden']").not("input[type='file']").attr("style","pointer-events: none;background-color: #eee;");
+});
+
+