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

app/admin/controller/FileType.php

@@ -42,7 +42,7 @@ class FileType extends AdminController {
             exit();
         }
         $declare_types = \app\common\api\DictApi::findChildDictByCode("declare_type");
-        return view("", ["declare_types" => $declare_types]);
+        return view("", ["type" => $this->user["type"], "declare_types" => $declare_types]);
     }
 
     /**

app/admin/controller/LivingAllowance.php

@@ -1291,6 +1291,63 @@ class LivingAllowance extends AdminController {
         }
     }
 
+    public function findFieldsAndFiles() {
+        $id = $this->request["id"];
+        $info = \app\common\api\LivingAllowanceApi::getInfoById($id);
+        $responseObj = new \stdClass();
+        if ($info["checkState"] == LaState::LA_FIRST_REJECT) {
+            $where = [];
+            $where[] = ["project", "=", ProjectState::LIVINGALLOWANCE];
+            $where[] = ["active", "=", 1];
+            $where[] = ["type", "=", $info["type"]];
+            $files = \app\common\model\FileType::where($where)->order("sn")->select()->toArray();
+            $responseObj->code = 200;
+            $responseObj->id = $id;
+            $responseObj->fileList = $files;
+            $responseObj->select = [
+                "files" => array_filter(explode(",", $info["files"])),
+                "fields" => array_filter(explode(",", $info["fields"]))
+            ];
+        } else {
+            $responseObj->msg = "不是初审驳回状态不可以编辑驳回内容";
+        }
+        return json($responseObj);
+    }
+
+    /**
+     * 初审-修改驳回字段
+     */
+    public function updateFieldsAndFiles() {
+        $id = $this->request["id"];
+        $fields = array_filter(explode(",", $this->request["fields"]));
+        $files = array_filter(explode(",", $this->request["files"]));
+
+        $info = \app\common\api\LivingAllowanceApi::getInfoById($id);
+        $responseObj = new \stdClass();
+        if ($info["checkState"] == LaState::LA_FIRST_REJECT) {
+            if (!$fields && !$files) {
+                $responseObj->msg = "请选择可修改的字段或附件！";
+                return json($responseObj);
+            }
+            try {
+                //保存驳回字段
+                $updData["id"] = $id;
+                $updData["fields"] = $fields ? implode(",", $fields) : null;
+                $updData["files"] = $files ? implode(",", $files) : null;
+                Db::table("md_living_allowance_info")->save($updData);
+                $responseObj->code = 200;
+                $responseObj->msg = "驳回字段修改成功";
+                return json($responseObj);
+            } catch (\think\db\exception\DbException $e) {
+                $responseObj->msg = $e->getMessage();
+                return json($responseObj);
+            }
+        } else {
+            $responseObj->msg = "不是初审驳回状态不可以编辑驳回内容";
+            return json($responseObj);
+        }
+    }
+
     /**
      * 计算兑现额度
      * @param type $oldInfo

app/admin/controller/Talent.php

@@ -953,9 +953,26 @@ class Talent extends AdminController {
                 return json(["msg" => "只有曾经达到过部门并审，初审时才可以选择再次审核的部门"]);
             if (!$params["companys"])
                 return json(["msg" => "请选择需要再次审核的部门"]);
+
+            //以下注释12部分为重审部门的限制，未通过并未选择的部门需要选择才能保存审核，注释备用
+            //1$pass_companyIds = TalentLogApi::getPassDepts($talent_info["id"]); //已经通过的单位
+
             $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
             $companyIds = array_filter(explode(",", $condition["companyIds"])); //该条件下需要审核的所有单位
-            $re_check_companys = array_filter(explode(",", $talent_info["re_check_companys"]));
+            $re_check_companys = array_filter(explode(",", $params["companys"]));
+            /* 2$unpass_companyIds = array_diff($companyIds, $pass_companyIds);
+              $unselect_companyIds = [];
+              foreach ($unpass_companyIds as $unpass_companyId) {
+              if (!in_array($unpass_companyId, $re_check_companys))
+              $unselect_companyIds[] = $unpass_companyId;
+              }
+              if ($unselect_companyIds) {
+              $unselect_companyName = [];
+              foreach ($unselect_companyIds as $unselect_companyId) {
+              $unselect_companyName[] = getCacheById("Company", $unselect_companyId)["name"];
+              }
+              return json(["msg" => "以下部门未通过，需要勾选重新审核：<br>" . implode("<br>", $unselect_companyName)]);
+              } */
             foreach ($re_check_companys as $reCompanyId) {
                 if (!in_array($reCompanyId, $companyIds)) {
                     return json(["msg" => "错误的部门"]);
@@ -1512,17 +1529,17 @@ class Talent extends AdminController {
             $returnObj->msg = "请选择需要撤销的对象";
             return json($returnObj);
         }
-        if ($old["checkState"] != TalentState::REVERIFY_PASS) {
-            $returnObj->msg = "当前对象不是复核通过状态，无法撤销";
+        if ($old["checkState"] != TalentState::REVERIFY_PASS && $old["checkState"] != TalentState::REVERIFY_FAIL) {
+            $returnObj->msg = "当前对象不是\"复核通过\"或者\"复核不通过\"状态，无法撤销";
             return json($returnObj);
         }
         $where = [];
         $where[] = ["last_state", "in", [TalentState::FST_VERIFY_PASS, TalentState::DEPT_VERIFY_PASS]];
-        $where[] = ["state", "=", TalentState::REVERIFY_PASS];
+        $where[] = ["state", "in", [TalentState::REVERIFY_PASS, TalentState::REVERIFY_FAIL]];
         $where[] = ["active", "=", 1];
         $lastLog = TalentLogApi::getLastLogEx($id, ProjectState::TALENT, 0, $where);
-        if ($lastLog["state"] != TalentState::REVERIFY_PASS && $lastLog["active"] != 1) {
-            $returnObj->msg = "当前对象不是复核通过状态，无法撤销";
+        if (($lastLog["state"] != TalentState::REVERIFY_PASS && $lastLog["state"] != TalentState::REVERIFY_FAIL) || $lastLog["active"] != 1) {
+            $returnObj->msg = "当前对象不是\"复核通过\"或者\"复核不通过\"状态，无法撤销";
             return json($returnObj);
         }
         if ($old["isPublic"] != 1) {
@@ -1630,9 +1647,14 @@ class Talent extends AdminController {
                 }
                 $condition = TalentConditionApi::getOne($talent_info["talent_condition"]);
                 $companys = array_filter(explode(",", $condition["companyIds"]));
+                $pass_companyIds = TalentLogApi::getPassDepts($talent_info["id"]); //已经通过的单位
+                $unpass_companyIds = array_diff($companys, $pass_companyIds);
                 $_companys = [];
                 foreach ($companys as $companyId) {
                     $company = CompanyApi::getOne($companyId);
+                    if (in_array($companyId, $unpass_companyIds)) {
+                        $company["uncheck"] = true;
+                    }
                     $_companys[] = $company;
                 }
                 if ($process == 4 && $enterprise["type"] == 1) {

app/admin/controller/TalentCondition.php

@@ -44,7 +44,7 @@ class TalentCondition extends AdminController {
                 return json(["code" => 200, "msg" => "添加认定条件成功"]);
             return json(["msg" => "添加认定条件失败"]);
         }
-        return view();
+        return view("", ["type" => $this->user["type"]]);
     }
 
     /**
@@ -67,7 +67,7 @@ class TalentCondition extends AdminController {
     }
 
     private function myValid($params) {
-        if (!$params["type"] || !in_array($params["type"], [1, 2]))
+        if (!$params["type"] || !in_array($params["type"], [1, 2, 5, 6]))
             return json(["msg" => "请选择人才类别"]);
         if (!$params["talentLevel"] || !in_array($params["talentLevel"], [1, 2, 3, 4, 5, 6, 7]))
             return json(["msg" => "请选择人才层次"]);
@@ -168,13 +168,13 @@ class TalentCondition extends AdminController {
         echo sprintf('<script>parent.IdentifyCondition.callBack(%s);</script>', json_encode($data));
     }
 
-    public function import1(){
+    public function import1() {
         $datas = getExcelDatas("test.xls");
         $datas = array_slice($datas, 1); //去标题
-        foreach ($datas as $k => $v){
+        foreach ($datas as $k => $v) {
             $item = [];
-            if($v[4] != null){
-                switch ($v[1]){
+            if ($v[4] != null) {
+                switch ($v[1]) {
                     case '第一层次':
                         $item['talentLevel'] = 1;
                         break;
@@ -202,15 +202,15 @@ class TalentCondition extends AdminController {
                 $item['name'] = $v[3];
                 $item['active'] = 1;
                 $item['companyIds'] = $v[4];
-                if($v['5'] == null){
+                if ($v['5'] == null) {
                     $item['bindFileTypes'] = 104;
-                }else{
+                } else {
                     $item['bindFileTypes'] = $v[5];
                 }
                 $item['companyWithFileType'] = $item['companyIds'] . ':' . $item['bindFileTypes'];
-                if(strpos($item['name'],"年薪")){
+                if (strpos($item['name'], "年薪")) {
                     $item['isSalary'] = 1;
-                }else{
+                } else {
                     $item['isSalary'] = 0;
                 }
                 Db::table("new_talent_condition")->insert($item);

app/admin/view/file_type/add.html

@@ -15,8 +15,10 @@
                             </div>
                             <select class="form-control" id="type" name="type" selectVal="{$info.type}" onchange="UnCommonFiletypeInfoDlg.typeChange();">
                                 <option value="">---请选择---</option>
-                                <option value="1">晋江市现代产业体系人才</option>
-                                <option value="2">集成电路优秀人才</option>
+                                {eq name="type" value="1"}<option value="1">晋江市现代产业体系人才</option>{/eq}
+                                {eq name="type" value="2"}<option value="2">集成电路优秀人才</option>{/eq}
+                                {eq name="type" value="5"}<option value="5">卫健医院人才</option>{/eq}
+                                {eq name="type" value="6"}<option value="6">高教学校人才</option>{/eq}
                             </select>
                         </div>
                         <div class="input-group input-group-sm" style="display:none;">

app/admin/view/file_type/edit.html

@@ -15,8 +15,10 @@
                             </div>
                             <select class="form-control" id="type" name="type" selectVal="{$info.type}" onchange="UnCommonFiletypeInfoDlg.typeChange();">
                                 <option value="">---请选择---</option>
-                                <option value="1">晋江市现代产业体系人才</option>
-                                <option value="2">集成电路优秀人才</option>
+                                {eq name="info.type" value="1"}<option value="1">晋江市现代产业体系人才</option>{/eq}
+                                {eq name="info.type" value="2"}<option value="2">集成电路优秀人才</option>{/eq}
+                                {eq name="info.type" value="5"}<option value="5">卫健医院人才</option>{/eq}
+                                {eq name="info.type" value="6"}<option value="6">高教学校人才</option>{/eq}
                             </select>
                         </div>
                         <div class="input-group input-group-sm" style="display:none;">

app/admin/view/living_allowance/detail.html

@@ -541,6 +541,7 @@
                         <li style="width:20.5%"><input type="checkbox" value="firstSocialSecurityTime"><span>首次社保缴纳时间</span></li>
                         <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>
                         <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>
+                        <li style="width:20.5%"><input type="checkbox" value="studyAbroadTime"><span>学位证书取得时间</span></li>
                         <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>
                         <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>
                         <li style="width:20.5%"><input type="checkbox"
@@ -554,7 +555,7 @@
                         <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>
                         <!--                        <li style="width:31%"><input type="checkbox" value="breakFaith"><span>曾被相关主管部门列为失信个人</span></li>-->
                         <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>
-                        <li style="width:20.5%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>
+                        <li style="width:22%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>
 
                         <li style="width:20.5%"><input type="checkbox" value="socialSecurity"><span>社保缴纳情况</span></li>
                         <li style="width:20.5%"><input type="checkbox" value="personalTax"><span>个税缴纳情况</span></li>

app/admin/view/living_allowance/index.html

@@ -15,6 +15,8 @@
         vertical-align:middle;
         margin-top:1px;
     }
+    #field_info ul li{
+        display:inline-block;}
 </style>
 <div class="row">
     <div class="col-sm-12">
@@ -333,6 +335,11 @@
                                 <i class="fa fa-check"></i>&nbsp;审核
                             </button>
                             {/if}
+                            {if condition="chkCommission('/admin/living_allowance/updateFieldsAndFiles','/livingAllowanceInfo/updateFieldsAndFiles')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="LivingAllowanceInfo.updateFieldsAndFiles()">
+                                <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                            </button>
+                            {/if}
                             <button type="button" class="btn btn-sm btn-primary" onclick="LivingAllowanceInfo.setNotPass()">
                                 <i class="fa fa-exclamation-triangle"></i>&nbsp;审核不通过
                             </button>

app/admin/view/talent_condition/add.html

@@ -27,8 +27,10 @@
                             <div class="col-sm-4 spacing">
                                 <select class="form-control" id="type" name="type" onchange="IdentifyConditionInfoDlg.onTypeChange();">
                                     <option value="">请选择</option>
-                                    <option value="1">晋江市现代产业体系人才</option>
-                                    <option value="2">集成电路优秀人才</option>
+                                    {eq name="type" value="1"}<option value="1">晋江市现代产业体系人才</option>{/eq}
+                                    {eq name="type" value="2"}<option value="2">集成电路优秀人才</option>{/eq}
+                                    {eq name="type" value="5"}<option value="5">卫健医院人才</option>{/eq}
+                                    {eq name="type" value="6"}<option value="6">高教学校人才</option>{/eq}
                                 </select>
                             </div>
                             <label class="col-sm-2 control-label spacing">人才层次</label>
@@ -82,7 +84,7 @@
                             <div class="col-sm-10 spacing">
                                 <table id="relationTable" class="table">
                                     <tbody>
-                                        
+
                                     </tbody>
                                 </table>
                                 <span style='color:#ff0000'>*审核单位可关联复数附件，但是附件只能关联一个审核单位。</span>

app/admin/view/talent_condition/edit.html

@@ -26,8 +26,10 @@
                             <div class="col-sm-4 spacing">
                                 <select class="form-control" id="type" name="type" selectVal="{$info.type}" onchange="IdentifyConditionInfoDlg.onTypeChange();">
                                     <option value="">请选择</option>
-                                    <option value="1">晋江市现代产业体系人才</option>
-                                    <option value="2">集成电路优秀人才</option>
+                                    {eq name="info.type" value="1"}<option value="1">晋江市现代产业体系人才</option>{/eq}
+                                    {eq name="info.type" value="2"}<option value="2">集成电路优秀人才</option>{/eq}
+                                    {eq name="info.type" value="5"}<option value="5">卫健医院人才</option>{/eq}
+                                    {eq name="info.type" value="6"}<option value="6">高教学校人才</option>{/eq}
                                 </select>
                             </div>
                             <label class="col-sm-2 control-label spacing">人才层次</label>

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

@@ -24,7 +24,6 @@
         height: 30px;
     }
     .row{margin:0 0 10px 0;}
-    .col{overflow:hidden;}
     .col-label{float:left;margin:7px 10px;width:80px;text-align:right;}
     .w80{width:80px;}
     .w100{width:100px;}
@@ -130,18 +129,16 @@
                                             <div class="row">
                                                 <div class="col">
                                                     <label class="col-label w100">是否有留学经历</label>
-                                                    <select class="form-control w120" id="study_abroad" name="study_abroad" value="{$row.study_abroad}">
+                                                    <select class="form-control w120" id="study_abroad" name="study_abroad" value="{$row.study_abroad}" onchange="TalentInfoInfoDlg.changeStudyAbroad()">
                                                         <option value="2">否</option>
                                                         <option value="1">是</option>
                                                     </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"><span style="color: red">*</span>留学毕业院校</label>
-                                                    <input type="text" class="form-control w210" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
+                                                <div class="col abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>                                                     
+                                                     <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"><span style="color: red">*</span>留学专业</label>
-                                                    <input type="text" class="form-control w210" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
+                                                <div class="col abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>                                                     
+                                                     <input type="text" class="form-control w210" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
                                                 </div>
                                             </div>
                                             <div class="row">
@@ -171,7 +168,7 @@
                                             <div class="row">
                                                 <div class="col">
                                                     <label class="col-label w100"><span style="color: red">*</span>人才层次</label>
-                                                    <select class="form-control w120" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange}"></select>
+                                                    <select class="form-control w120" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>
                                                 </div>
                                                 <div class="col">
                                                     <label class="col-label"><span style="color: red">*</span>人才条款</label>
@@ -220,6 +217,25 @@
                                                     <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>                             
+                                        <div class="container-fluid">
+                                            <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="hidden" name="type" value="5">
+                                            </form>
                                         </div>
                                         <div class="row">
                                             <label class="col-sm-12col-label" style="text-align: left"><span style="color: red">声明：本人对输入材料的真实性负全部责任</span></label>
@@ -232,25 +248,6 @@
                             <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
                             <table id="logTable">
                             </table>
-                            <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>
                 </div>

public/static/modular/filetype/unCommonFiletype/unCommonFiletype_info.js

@@ -157,10 +157,14 @@ UnCommonFiletypeInfoDlg.projectChange = function () {
     var project = $("#project").val();
     $(".project1").css("display", "none");
     $(".project20").css("display", "none");
+    $(".project1").find("select[name=isConditionFile]").prop("disabled", true);
+    $(".project20").find("select[name=isConditionFile]").prop("disabled", true);
     if (project == "1") {
         $(".project1").css("display", "");
+        $(".project1").find("select[name=isConditionFile]").removeAttr("disabled");
     } else if (project == "20") {
         $(".project20").css("display", "");
+        $(".project20").find("select[name=isConditionFile]").removeAttr("disabled");
     } else {
 
     }

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

@@ -5,40 +5,40 @@ var locked = false;
 var TalentInfoInfoDlg = {
     talentInfoInfoData: {},
     validateFields: {
-        enterpriseId: {validators: {notEmpty: {message: '所属企业不能为空'}}},
+        enterpriseId: {validators: {notEmpty: {message: '所属医院不能为空'}}},
         type: {validators: {notEmpty: {message: '人才类别不能为空'}}},
         name: {validators: {notEmpty: {message: '姓名不能为空'}}},
+        sex: {validators: {notEmpty: {message: '性别不能为空'}}},
         nation: {validators: {notEmpty: {message: '民族不能为空'}}},
-        province: {validators: {notEmpty: {message: '户籍省份不能为空'}}},
-        city: {validators: {notEmpty: {message: '户籍市不能为空'}}},
-        county: {validators: {
-                //notEmpty: {message: '户籍县不能为空'},
-                callback: {
-                    message: "户籍县不能为空",
-                    callback: function (value, validator) {
-                        if ($("#province").val() > 0 && $("#city").val() > 0 && $("#county option").length > 1 && $("#county option:selected").length == 0) {
-                            //当省市都有值时，如果县有列表，必选
-                            return false;
-                        }
-                        return true;
-                    }
-                }
-            }
-        },
-        address: {validators: {notEmpty: {message: '现居地址不能为空'}}},
+        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
+        card_type: {validators: {notEmpty: {message: '证件类型不能为空'}}},
+        card_number: {validators: {notEmpty: {message: '证件号码不能为空'}}},
+        birthday: {validators: {notEmpty: {message: '出生日期不能为空'}}},
+        talent_type: {validators: {notEmpty: {message: '人才类型不能为空'}}},
         highest_degree: {validators: {notEmpty: {message: '最高学历不能为空'}}},
+        graduate_school: {validators: {notEmpty: {message: '毕业学校不能为空'}}},
         major: {validators: {notEmpty: {message: '专业不能为空'}}},
+        position: {validators: {notEmpty: {message: '职务不能为空'}}},
+        cur_entry_time: {validators: {notEmpty: {message: '入职时间不能为空'}}},
+        labor_contract_rangetime: {validators: {notEmpty: {message: '工作合同时间不能为空'}}},
+        talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
+        talent_arrange_category: {validators: {notEmpty: {message: '人才条款不能为空'}}},
+        talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
         phone: {
             validators: {
-                notEmpty: {
-                    message: '手机号码不能为空'
-                },
                 regexp: {
                     regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }
         },
+        email: {
+            validators: {
+                emailAddress: {
+                    message: "电子邮箱格式不正确"
+                }
+            }
+        },
         bank: {
             validators: {
                 notEmpty: {
@@ -51,29 +51,7 @@ var TalentInfoInfoDlg = {
             }
         },
         bank_account: {validators: {notEmpty: {message: '银行账号不能为空'}}},
-        cur_entry_time: {validators: {notEmpty: {message: '入职时间不能为空'}}},
-        labor_contract_rangetime: {validators: {notEmpty: {message: '工作合同时间不能为空'}}},
-        talent_condition: {validators: {notEmpty: {message: '认定条件不能为空'}}},
-        identifyConditionName: {validators: {notEmpty: {message: '认定条件名称不能为空'}}},
-        card_type: {validators: {notEmpty: {message: '证件类型不能为空'}}},
-        card_number: {validators: {notEmpty: {message: '证件号码不能为空'}}},
-        sex: {validators: {notEmpty: {message: '性别不能为空'}}},
-        nationality: {validators: {notEmpty: {message: '国籍/地区不能为空'}}},
-        birthday: {validators: {notEmpty: {message: '出生日期不能为空'}}},
-        politics: {validators: {notEmpty: {message: '政治面貌不能为空'}}},
-        graduate_school: {validators: {notEmpty: {message: '毕业学校不能为空'}}},
-        position: {validators: {notEmpty: {message: '职务不能为空'}}},
-        email: {
-
-            validators: {
-                notEmpty: {
-                    message: '电子邮箱不能为空'
-                },
-                emailAddress: {
-                    message: "电子邮箱格式不正确"
-                }
-            }
-        },
+        bank_number: {validators: {notEmpty: {message: '银行行号不能为空'}}},
         bank_branch_name: {
             validators: {
                 notEmpty: {
@@ -85,18 +63,6 @@ var TalentInfoInfoDlg = {
                 }
             }
         },
-        introductionMode: {
-            validators: {
-                notEmpty: {
-                    message: '引进方式不能为空'
-                }
-            }
-        },
-        talent_arrange: {validators: {notEmpty: {message: '人才层次不能为空'}}},
-        identifyGetTime: {validators: {notEmpty: {message: '认定条件证书取得时间不能为空'}}},
-        breakFaith: {validators: {notEmpty: {message: '是否曾被相关主管部门列为失信个人不能为空'}}},
-        experience: {validators: {notEmpty: {message: '主要业绩及取得的荣誉不能为空'}}},
-        education: {validators: {notEmpty: {message: '教育背景及工作简历不能为空'}}}
     }
 };
 
@@ -240,71 +206,52 @@ TalentInfoInfoDlg.infoCallback = function (data) {
  */
 TalentInfoInfoDlg.getIdentifyCondition = function () {
     var level = $("#talent_arrange").val();
-    var type = $("#type").val();
-    if (level == null || level == '') {
-        $("#talent_condition").empty();
-        $("#talent_condition").trigger('chosen:updated');
-        return;
-    }
-    if (type == null || type == '') {
-        Feng.info("请先选择人才类别");
-        return;
-    }
+    var cat = $("#talent_arrange_category").val();
+    var id = $('#id').val();
     Feng.addAjaxSelect({
         "id": "talent_condition",
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel?level=" + level + "&type=" + type
+        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat + "/id/" + id
     });
     $("#talent_condition").trigger('chosen:updated');
 }
 
-TalentInfoInfoDlg.bankChange = function () {
-    var bank = $("#bank").val();
-    if ($.trim(bank) == '中国工商银行') {
-        $("#bank_number").val('102391050013');
-    } else {
-        $("#bank_number").val('');
-    }
-}
 
+TalentInfoInfoDlg.getLayerCatdByLayer = function () {
+    $("#talent_condition").html("<option value=''>---请选择---</option>");
 
-/**
- * 加载市
- */
-TalentInfoInfoDlg.afterSelectProvince = function () {
-    var province = $("#province").val();
-    $("#city").empty();
-    $("#county").empty();
-    if (province == null || province == '') {
-        return;
-    }
+    var level = $("#talent_arrange").val();
     Feng.addAjaxSelect({
-        "id": "city",
+        "id": "talent_arrange_category",
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/common/tool/findCityByProvinceSelect/code/" + province
+        "url": Feng.ctxPath + "/common/api/getLayerCatsByLayer/level/" + level
     });
+    $("#talent_condition").trigger("chosen:updated");
 }
-/**
- * 加载县
- */
-TalentInfoInfoDlg.afterSelectCity = function () {
-    var city = $("#city").val();
-    $("#county").empty();
-    if (city == null || city == '') {
-        return;
+
+TalentInfoInfoDlg.bankChange = function () {
+    var bank = $("#bank").val();
+    if ($.trim(bank) == '中国工商银行') {
+        $("#bank_number").val('102391050013');
+    } else {
+        $("#bank_number").val('');
+    }
+}
+TalentInfoInfoDlg.changeStudyAbroad = function () {
+    var is_abroad = $("#study_abroad").val();
+    if (is_abroad == 1) {
+        $("#abroad_school").parent().css("display", "block");
+        $("#abroad_major").parent().css("display", "block");
+    } else {
+        $("#abroad_school").val("").parent().css("display", "none");
+        $("#abroad_major").val("").parent().css("display", "none");
     }
-    Feng.addAjaxSelect({
-        "id": "county",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": Feng.ctxPath + "/common/tool/findCountyByCitySelect/code/" + city
-    });
 }
+
 //初始化附件类别表单
 TalentInfoInfoDlg.initFileTable = function () {
     var queryData = {};
@@ -661,14 +608,6 @@ $(function () {
         {"name": "politics", "code": "politics"},
         {"name": "highest_degree", "code": "highest_degree"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
-    //加载省份
-    Feng.addAjaxSelect({
-        "id": "province",
-        "displayCode": "code",
-        "displayName": "name",
-        "type": "GET",
-        "url": "/common/tool/getProvinceSelect"
-    });
     //批量加载时间控件
     $(".date").each(function () {
         laydate.render({

public/static/modular/master/livingAllowanceInfo/livingAllowanceInfo.js

@@ -419,6 +419,156 @@ LivingAllowanceInfo.openLivingAllowanceInfoDetail = function () {
     }
 };
 
+/**
+ * 修改驳回的字段及附件
+ */
+LivingAllowanceInfo.updateFieldsAndFiles = function () {
+    if (this.check()) {
+        var ajax = new $ax("/admin/living_allowance/findFieldsAndFiles?id=" + LivingAllowanceInfo.seItem.id, function (data) {
+            if (data.code == 200) {
+                layer.open({
+                    type: 1,
+                    id: "neewFieldFormModel",
+                    title: '修改',
+                    area: ['800px', '450px'], //宽高
+                    fix: false, //不固定
+                    shade: 0,
+                    maxmin: true,
+                    content: LivingAllowanceInfo.creatFieldCheckModal(),
+                    btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                    btnAlign: 'c',
+                    zIndex: layer.zIndex,
+                    success: function (layero, index) {
+                        var html2 = '';
+                        for (var key in data.fileList) {
+                            html2 = html2 + '<ul><li style="width: 100%"><input type="checkbox" value="' + data.fileList[key].id + '"><span>' + data.fileList[key].name + '</span></li></ul>';
+                        }
+                        $("#firstCheckForm #field_info ul").css("overflow", "hidden");
+                        $("#field_file").css("overflow", "hidden").empty().append(html2);
+                        //$("#field_file").empty().append(html);
+                        if (data.select.fields != null && data.select.fields != '') {
+                            $("#firstCheckForm #field_info li input").each(function () {
+                                if (data.select.fields.indexOf($(this).val()) != -1) {
+                                    this.checked = true;
+                                }
+                            });
+                        }
+                        if (data.select.files != null && data.select.files != '') {
+                            $("#field_file input").each(function () {
+                                if (data.select.files.indexOf($(this).val()) != -1) {
+                                    this.checked = true;
+                                }
+                            });
+                        }
+                    },
+                    yes: function (index, layero) {
+                        LivingAllowanceInfo.submitFieldsAndFiles(index, data.id);
+                    }
+                });
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        ajax.start();
+    }
+}
+
+/**
+ * 修改提交
+ * @param index
+ * @param id
+ */
+LivingAllowanceInfo.submitFieldsAndFiles = function (index, id) {
+    var fields = '';
+    var files = '';
+    $("#firstCheckForm #field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            fields = fields + $(this).val() + ",";
+        }
+    });
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            files = files + $(this).val() + ",";
+        }
+    });
+    if (fields == '' && files == '') {
+        Feng.info("请选择可修改的字段或附件！");
+        return;
+    }
+    var ajax = new $ax("/admin/living_allowance/updateFieldsAndFiles", function (data) {
+        if (data.code == 200) {
+            layer.close(index);
+            Feng.success(data.msg);
+        } else {
+            Feng.error(data.msg);
+        }
+    }, function (data) {
+        Feng.error("修改失败!" + data.responseJSON.message + "!");
+    });
+    ajax.setData({"id": id, "fields": fields, "files": files})
+    ajax.start();
+}
+
+LivingAllowanceInfo.creatFieldCheckModal = function () {
+    return '<form id="firstCheckForm">\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <div >\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                                <ul>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="declareType"><span>申报对象类型</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="introductionMethod"><span>引进方式</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="name"><span>姓名</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="sex"><span>性别</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="birthday"><span>出生日期</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="nationality"><span>国籍/地区</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="provinceCode"onchange="LivingAllowanceInfoInfoDlg.fieldCheckd(this)"><span>籍贯省</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="cityCode" onchange="LivingAllowanceInfoInfoDlg.fieldCheckd(this)"><span>籍贯市</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="countyCode"><span>籍贯县</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="nation"><span>民族</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="politics"><span>政治面貌</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="cardType"><span>证件类型</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="idCard"><span>证件号码</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="firstInJJTime"><span>首次来晋工作时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="backJJBusinessTime"><span>返晋创业时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="entryTime"><span>本单位入职时间</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="post"><span>职务</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="startTime"><span>工作合同开始时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="endTime"><span>工作合同结束时间</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="firstSocialSecurityTime"><span>首次社保缴纳时间</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="highEducation"><span>最高学历</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="graduateSchool"><span>毕业院校</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="studyAbroadTime"><span>学位证书取得时间</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="major"><span>专业</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="title"><span>职称</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="professionalQualifications"><span>国家职业资格</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="studyAbroad"><span>是否有留学经历</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="phone"><span>手机号码</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="email"><span>电子邮箱</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="bank"><span>开户银行</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="bankNetwork"><span>开户银行网点</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="bankNumber"><span>银行行号</span></li>\n' +
+            '                                    <li style="width:10%"><input type="checkbox" value="bankAccount"><span>银行账号</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="educationAndResume"><span>教育背景及工作简历</span></li>\n' +
+            '                                    <li style="width:22%"><input type="checkbox" value="mainHonours"><span>主要业绩及取得的荣誉</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="socialSecurity"><span>社保缴纳情况</span></li>\n' +
+            '                                    <li style="width:20.5%"><input type="checkbox" value="personalTax"><span>个税缴纳情况</span></li>\n' +
+            '                                </ul>\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+            '                            <div id="field_file">\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group" style="text-align: center">\n' +
+            '                                <button type="button" class="btn btn-primary" onclick="LivingAllowanceInfo.checkAll()">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="LivingAllowanceInfo.unCheckAll()">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
+}
+
 /**
  * 显示核查征信驳回模态框
  */

public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -403,7 +403,7 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     }
                     var html3 = '';
                     for (var key in companyList) {
-                        html3 += '<li style="width: 100%"><input type="checkbox" value="' + companyList[key].id + '"><span>' + companyList[key].name + '</span></li>';
+                        html3 += '<li style="width: 100%"><input type="checkbox" value="' + companyList[key].id + '"><span>' + companyList[key].name + (companyList[key].uncheck == true ? "<span style='color:#ff0000;'>(上次驳回)</span>" : "") + '</span></li>';
                     }
                     $("#field_info ul").css("overflow", "hidden").empty().append(html1);
                     $("#field_file").css("overflow", "hidden").empty().append(html2);