卫健申报++

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/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/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,26 +206,33 @@ 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.getLayerCatdByLayer = function () {
+    $("#talent_condition").html("<option value=''>---请选择---</option>");
+
+    var level = $("#talent_arrange").val();
+    Feng.addAjaxSelect({
+        "id": "talent_arrange_category",
+        "displayCode": "code",
+        "displayName": "name",
+        "type": "GET",
+        "url": Feng.ctxPath + "/common/api/getLayerCatsByLayer/level/" + level
+    });
+    $("#talent_condition").trigger("chosen:updated");
+}
+
 TalentInfoInfoDlg.bankChange = function () {
     var bank = $("#bank").val();
     if ($.trim(bank) == '中国工商银行') {
@@ -268,6 +241,16 @@ TalentInfoInfoDlg.bankChange = function () {
         $("#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");
+    }
+}
 
 
 /**
@@ -661,14 +644,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({