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

app/admin/controller/TalentCondition.php

@@ -71,7 +71,7 @@ class TalentCondition extends AdminController {
             return json(["msg" => "请选择人才类别"]);
         if (!$params["talentLevel"] || !in_array($params["talentLevel"], [1, 2, 3, 4, 5, 6, 7]))
             return json(["msg" => "请选择人才层次"]);
-        if (!$params["talentLevelCat"])
+        if (!$params["talentLevelCat"] && in_array($params["type"], [1, 6]))
             return json(["msg" => "请选择人才条款"]);
         if (!$params["name"])
             return json(["msg" => "请填写名称"]);

app/admin/view/talent/hospital/talentInfo_common_check.html

@@ -37,6 +37,7 @@
     .w300{width:300px;}
     .w360{width:360px;}
     .w490{width:490px;}
+    .w710{width:710px;}
     .w60,.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 {
@@ -57,6 +58,7 @@
         .w300{width:300px;}
         .w360{width:325px;}
         .w490{width:405px;}
+        .w710{width:615px;}
         .w80,.w100.w120,.w175,.w210,.w250,.w300,.w360,.w490,.col,select.form-control{float:left;}
         .photo{width:140px;}
         #position{width:120px;}
@@ -147,11 +149,11 @@
                                 </select>
                             </div>
                             <div class="col abroad_need_this" {if condition='!$info["study_abroad"] or $info["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="{$info.abroad_school}"/>
                             </div>
                             <div class="col abroad_need_this" {if condition='!$info["study_abroad"] or $info["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="{$info.abroad_major}"/>
                             </div>
                         </div>
@@ -195,13 +197,9 @@
                                 <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="{$info.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="{$info.talentArrangeCatName}"/>
-                            </div>
                             <div class="col">
                                 <label class="col-label"><span style="color: red">*</span>认定条件</label>
-                                <input type="text" class="form-control w490" value="{$info.talentConditionName}"/>
+                                <input type="text" class="form-control w710" value="{$info.talentConditionName}"/>
                             </div>
                         </div>
                         <div class="row">

app/common/api/DictApi.php

@@ -286,7 +286,6 @@ class DictApi {
             "labor_contract_rangetime" => "工作合同起止时间",
             "title" => "职称",
             "talent_arrange" => "人才层次",
-            "talent_arrange_category" => "人才条款",
             "talent_condition" => "认定条件",
             "phone" => "手机号码",
             "email" => "电子邮箱",

app/common/api/TalentConditionApi.php

@@ -20,7 +20,7 @@ class TalentConditionApi {
         $where[] = ["type", "=", $type];
         $where[] = ["delete", "=", 0];
         $where[] = ["active", "=", 1];
-        if ($type == 1 && $cat) {
+        if ($cat) {
             $where[] = ["talentLevelCat", "=", $cat];
         }
         return TalentCondition::where($where)->select()->toArray();

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

@@ -191,11 +191,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.getLayerCatdByLayer()" value="{$row.talent_arrange}"></select>
-                            </div>
-                            <div class="col">
-                                <label class="col-label"><span style="color: red">*</span>人才条款</label>
-                                <select class="form-control w120" id="talent_arrange_category" name="talent_arrange_category" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange_category}"></select>
+                                <select class="form-control w120" id="talent_arrange" name="talent_arrange" onchange="TalentInfoInfoDlg.getIdentifyCondition()" value="{$row.talent_arrange}"></select>
                             </div>
                             <div class="col">
                                 <label class="col-label"><span style="color: red">*</span>认定条件</label>

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

@@ -186,10 +186,6 @@
                                 <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" value="{$row.talentConditionName}"/>

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

@@ -257,20 +257,27 @@ TalentInfoInfoDlg.submitCallback = function (data) {
  * 获取人才认定
  */
 TalentInfoInfoDlg.getIdentifyCondition = function () {
-    $("#talent_condition").html("<option value=''>---请选择---</option>");
     var level = $("#talent_arrange").val();
-    var cat = $("#talent_arrange_category").val();
-    var id = $('#id').val();
-    if (cat) {
-        Feng.addAjaxSelect({
-            "id": "talent_condition",
-            "displayCode": "id",
-            "displayName": "name",
-            "type": "GET",
-            "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level + "/cat/" + cat + "/id/" + id
-        });
+    var type = $("#type").val();
+    if (level == null || level == '') {
+        $("#talent_condition").empty();
+        $("#talent_condition").trigger('chosen:updated');
+        TalentInfoInfoDlg.changeIdentifyCondition();
+        return;
+    }
+    if (type == null || type == '') {
+        Feng.info("请先选择人才类别");
+        return;
     }
+    Feng.addAjaxSelect({
+        "id": "talent_condition",
+        "displayCode": "id",
+        "displayName": "name",
+        "type": "GET",
+        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel?level=" + level + "&type=" + type
+    });
     $("#talent_condition").trigger('chosen:updated');
+    TalentInfoInfoDlg.changeIdentifyCondition();
 }
 
 
@@ -289,7 +296,7 @@ TalentInfoInfoDlg.getLayerCatdByLayer = function () {
 }
 
 TalentInfoInfoDlg.changeIdentifyCondition = function () {
-    if (TalentInfoInfoDlg.initTalentCondtion != $("#talent_condition").val() && $("#talent_condition").val() != "") {
+    if ((TalentInfoInfoDlg.initTalentCondtion != $("#talent_condition").val() && $("#talent_condition").val() != "") || (TalentInfoInfoDlg.initTalentCondtion != "" && $("#talent_condition").val() == "")) {
         $("#fileTable").bootstrapTable("destroy", {});
         TalentInfoInfoDlg.initFileTable();
         //$("#fileTable").bootstrapTable("refresh", {});
@@ -732,10 +739,6 @@ $(function () {
         });
         Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
     }
-    $("#talent_arrange").val($("#talent_arrange").attr("value"));
-    TalentInfoInfoDlg.getIdentifyCondition();
-    $("#talent_arrange").val($("#talent_arrange").attr("value"));
-    $("#talent_condition").val($("#talent_condition").attr("value"));
     TalentInfoInfoDlg.validId();
     $("#photo").change(function (e) {
         var tag = e.target;