修改部分提出的问题

app/admin/view/talent/fst_verify.html

@@ -109,8 +109,11 @@
                                     </div>
                                     <select class="form-control" id="checkState">
                                         <option value="">---请选择---</option>
+                                        <option value="-1">保存未提交</option>
                                         <option value="1">待审核</option>
                                         <option value="2">审核驳回</option>
+                                        <option value="3">审核通过</option>
+                                        <option value="4">审核失败</option>
                                     </select>
                                 </div>                            
                             </div>
@@ -229,6 +232,19 @@
                                     </select>
                                 </div>                            
                             </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">是否直认
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="isMatchZhiren">
+                                        <option value="">---请选择---</option>
+                                        <option value="1">是</option>
+                                        <option value="2">否</option>
+                                    </select>
+                                </div>                            
+                            </div>
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
@@ -247,7 +263,18 @@
                                             人才层次
                                         </button>
                                     </div>
-                                    <select class="form-control" id="talent_arrange">
+                                    <select class="form-control" id="talent_arrange" onchange="TalentInfo.getIdentifyCondition();">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            人才条款
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="talent_condition">
                                     </select>
                                 </div>
                             </div>

app/admin/view/talent/talentInfo_common_check.html

@@ -307,6 +307,32 @@
                                         </tr>
                                         {/if}
                                     </table>
+                                    <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                        <tr>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
+                                                    <input type="text" class="form-control date" id="import_way" name="import_way" value="{$info.importWayName}"/>
+                                                    </select>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
+                                                    <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$info.cur_entry_time}"/>
+                                                </div>
+                                            </td>
+                                            <td>
+                                                <div class="rowGroup">
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
+                                                    <div class="form-control" style="border: none;background:#eee;" id="position">{$info.position}</div>
+                                                </div>
+                                            </td>
+                                            <td rowspan="3" style="width: 300%">
+                                                <table class="fileTable"></table>
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </div>
                                 <div class="panel-body">
                                     <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
@@ -402,32 +428,6 @@
                                             </td>
                                         </tr>
                                     </table>
-                                    <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                        <tr>
-                                            <td>
-                                                <div class="rowGroup">
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
-                                                    <input type="text" class="form-control date" id="import_way" name="import_way" value="{$info.importWayName}"/>
-                                                    </select>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="rowGroup">
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
-                                                    <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$info.cur_entry_time}"/>
-                                                </div>
-                                            </td>
-                                            <td>
-                                                <div class="rowGroup">
-                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                    <div class="form-control" style="border: none;background:#eee;" id="position">{$info.position}</div>
-                                                </div>
-                                            </td>
-                                            <td rowspan="3" style="width: 300%">
-                                                <table class="fileTable"></table>
-                                            </td>
-                                        </tr>
-                                    </table>
                                     <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                         <tr>
                                             <td>

app/common/api/DictApi.php

@@ -151,64 +151,67 @@ class DictApi {
 
     public static function getTalentFields($step, $isImport = 0) {
         $dict1 = [
-            "talent_type" => "人才类型",
-            "tax_insurance_month" => "在我市缴交社会保险或个人所得税月份",
-            "labor_contract_rangetime" => "劳动合同起止时间",
-            "salary_pay_way" => "工资发放渠道",
-            "salary_pay_month" => "工资发放月份",
-            "pre_import_type" => "预引进类型",
-            "return" => "流出晋江满3年后又返回晋江的",
             "name" => "姓名",
+            "nation" => "民族",
+            "headimgurl" => "头像",
             "card_type" => "证件类型",
             "card_number" => "证件号码",
             "sex" => "性别",
             "birthday" => "出生日期",
+            "politics" => "政治面貌",
             "nationality" => "国籍/地区",
             "province" => "籍贯省",
             "city" => "籍贯市",
             "county" => "籍贯县",
-            "nation" => "民族",
-            "politics" => "政治面貌",
+            "talent_type" => "人才类型",
             "fst_work_time" => "来晋工作时间",
+            "tax_insurance_month" => "在我市缴交社会保险或个人所得税月份",
+            "labor_contract_rangetime" => "劳动合同起止时间",
+            "salary_pay_way" => "工资发放渠道",
+            "salary_pay_month" => "工资发放月份",
+            "pre_import_type" => "预引进类型",
+            "return" => "流出晋江满3年后又返回晋江的",
+            "import_way" => "引进方式",
+            "cur_entry_time" => "本单位入职时间",
+            "position" => "本单位现任职务",
             "experience" => "工作简历",
             "education" => "教育背景",
-            "headimgurl" => "头像"
         ];
         $dict2 = [
-            "talent_arrange" => "人才层次",
-            "talent_arrange_category" => "人才条款",
-            "talent_condition" => "认定条件",
+            "apply_year" => "申报年度",
+            "phone" => "手机号码",
+            "email" => "电子邮箱",
             "highest_degree" => "最高学历",
             "graduate_school" => "毕业院校",
             "major" => "专业",
-            "professional" => "专业技术职称",
-            "pro_qua" => "职业资格",
-            "bank" => "开户银行",
-            "bank_number" => "银行行号",
-            "bank_branch_name" => "开户银行网点",
-            "bank_account" => "银行账号",
             "study_abroad" => "是否有留学经历",
             "abroad_school" => "留学毕业院校",
             "abroad_major" => "留学专业",
-            "phone" => "手机号码",
-            "email" => "电子邮箱",
-            "apply_year" => "申报年度",
-            "import_way" => "引进方式",
-            "cur_entry_time" => "本单位入职时间",
-            "position" => "本单位现任职务",
+            "pro_qua" => "职业资格",
+            "professional" => "专业技术职称",
+        ];
+        if ($isImport) {
+            $dict2["isMatchZhiren"] = "是否符合直认条件";
+        }
+        $dict2_ = [
             "source" => "申报来源",
             "source_city" => "入选来源地级市",
             "source_county" => "入选来源县市区",
-            //"source_batch" => "入选名单的文件号及批次",
-            //"fujian_highcert_pubtime" => "福建省高层次人才证书发证日期",
-            //"fujian_highcert_exptime" => "福建省高层次人才证书有效期",
-            //"quanzhou_highcert_pubtime" => "泉州高层次人才证书发证日期",
-            //"quanzhou_highcert_exptime" => "泉州高层次人才证书有效期",
-            "annual_salary" => "上一年度年薪（元）"
+            "talent_arrange" => "人才层次",
+            "talent_arrange_category" => "人才条款",
+            "talent_condition" => "认定条件",
+            "annual_salary" => "上一年度年薪（元）",
+            "bank" => "开户银行",
+            "bank_number" => "银行行号",
+            "bank_branch_name" => "开户银行网点",
+            "bank_account" => "银行账号"
+                //"source_batch" => "入选名单的文件号及批次",
+                //"fujian_highcert_pubtime" => "福建省高层次人才证书发证日期",
+                //"fujian_highcert_exptime" => "福建省高层次人才证书有效期",
+                //"quanzhou_highcert_pubtime" => "泉州高层次人才证书发证日期",
+                //"quanzhou_highcert_exptime" => "泉州高层次人才证书有效期",
         ];
-        if ($isImport) {
-            $dict2 = array_merge(["isMatchZhiren" => "是否符合直认条件"], $dict2);
-        }
+        $dict2 = array_merge($dict2, $dict2_);
         if ($step == 1) {
             return $dict1;
         }

app/common/api/TalentConditionApi.php

@@ -11,12 +11,12 @@ use app\common\model\TalentCondition;
  */
 class TalentConditionApi {
 
-    public static function getList($lv, $type, $cat) {
+    public static function getList($lv, $type, $cat = "") {
         $where[] = ["talentLevel", "=", $lv];
         $where[] = ["type", "=", $type];
         $where[] = ["delete", "=", 0];
         $where[] = ["active", "=", 1];
-        if ($type == 1) {
+        if ($type == 1 && $cat) {
             $where[] = ["talentLevelCat", "=", $cat];
         }
         return TalentCondition::where($where)->select()->toArray();

app/common/api/VerifyApi.php

@@ -298,6 +298,12 @@ class VerifyApi {
         if ($params["talent_arrange"]) {
             $where[] = ["ti.talent_arrange", "=", $params["talent_arrange"]];
         }
+        if ($params["talent_condition"]) {
+            $where[] = ["ti.talent_condition", "=", $params["talent_condition"]];
+        }
+        if ($params["isMatchZhiren"]) {
+            $where[] = ["ti.isMatchZhiren", "=", $params["isMatchZhiren"]];
+        }
 
         $process = $params["process"];
         if ($process == 4) {
@@ -360,18 +366,27 @@ class VerifyApi {
                     break;
                 case 3:
                     switch ($params["checkState"]) {
+                        case -1://保存未提交
+                            $where[] = ["ti.checkState", "=", TalentState::SCND_SAVE];
+                            break;
                         case 1://待审核
                             $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
-                            $where[] = ["tl.state", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
                             break;
                         case 2://驳回
                             //$where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
-                            $where[] = ["tl.new_state", "in", [TalentState::SCND_SAVE, TalentState::SCND_SUBMIT]];
-                            $where[] = ["tl.state", "in", [TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_REJECT]];
+                            $where[] = ["tl.new_state", "=", TalentState::SCND_SAVE];
+                            $where[] = ["tl.state", "=", TalentState::FST_VERIFY_REJECT];
+                            break;
+                        case 3://通过
+                            $where[] = ["tl.state", "in", [TalentState::FST_VERIFY_PASS]];
+                            break;
+                        case 4://失败
+                            $where[] = ["tl.state", "in", [TalentState::FST_VERIFY_FAIL]];
                             break;
                         default:
                             //$where[] = ["ti.checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_FAIL]];
-                            $where[] = ["tl.new_state", "in", [TalentState::SCND_SAVE, TalentState::SCND_SUBMIT]];
+                            //$where[] = ["tl.new_state", "in", [TalentState::SCND_SAVE, TalentState::SCND_SUBMIT]];
                             $where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_REJECT]];
                     }
                     break;

app/common/controller/Api.php

@@ -40,9 +40,8 @@ class Api extends BaseController {
     public function findIdentifyConditionByLevel() {
         $params = $this->request->param();
         $id = $params["id"];
-        if ($this->user["usertype"] == 2) {
-            $type = $this->user["type"];
-        } else {
+        $type = $this->user["type"];
+        if ($id) {
             $talentInfo = TalentApi::getOne($id);
             $enterprise = \app\common\model\Enterprise::findOrEmpty($talentInfo["enterprise_id"]);
             $type = $enterprise["type"];

app/enterprise/view/talent/apply.html

@@ -322,6 +322,32 @@
                                                 </td>
                                             </tr>
                                         </table>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
+                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式" value="{$row.import_way}">
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
+                                                        <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
+                                                        <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 300%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </div>                            
                                     <div class="panel-body">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
@@ -424,32 +450,6 @@
                                                 </td>
                                             </tr>
                                         </table>
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
-                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式" value="{$row.import_way}">
-                                                        </select>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
-                                                        <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                        <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 300%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                        </table>
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>

app/enterprise/view/talent/view.html

@@ -305,6 +305,33 @@
                                             </tr>
                                             {/if}
                                         </table>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
+                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
+                                                            <option value="">{$row.importWayName}</option>
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
+                                                        <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                    <div class="rowGroup">
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
+                                                        <div class="form-control" style="border: none;height:auto;background:#eee;" id="position">{$row.position}</div>
+                                                    </div>
+                                                </td>
+                                                <td rowspan="3" style="width: 300%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </div>
                                     <div class="panel-body">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
@@ -402,33 +429,6 @@
                                                 </td>
                                             </tr>
                                         </table>
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
-                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
-                                                            <option value="">{$row.importWayName}</option>
-                                                        </select>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
-                                                        <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                        <div class="form-control" style="border: none;height:auto;background:#eee;" id="position">{$row.position}</div>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 300%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                        </table>
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>

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

@@ -42,6 +42,7 @@ TalentInfo.formParams = function () {
     queryData['email'] = $("#email").val();
     queryData['breakFaith'] = $("#breakFaith").val();
     queryData['talent_type'] = $("#talent_type").val();
+    queryData['isMatchZhiren'] = $("#isMatchZhiren").val();
     queryData['talent_arrange'] = $("#talent_arrange").val();
     queryData['street'] = $("#street").val();
     if ($("#talent_condition").val() == null || $("#talent_condition").val() == '' || $("#talent_condition").val() == "null") {
@@ -89,6 +90,7 @@ TalentInfo.reset = function () {
     $("#email").val("");
     $("#breakFaith").val("");
     $("#talent_type").val("");
+    $("#isMatchZhiren").val("");
     $("#talent_arrange").val("");
     $("#street").val("");
     $("#talent_condition").val("").trigger("chosen:updated");
@@ -106,18 +108,18 @@ TalentInfo.reset = function () {
  * 获取人才认定
  */
 TalentInfo.getIdentifyCondition = function () {
-    // var level = $("#talentArrange").val();
-    // if(level==null||level==''){
-    //     $("#identifyCondition").empty();
-    //     $("#identifyCondition").trigger('chosen:updated');
-    //     return;
-    // }
+    var level = $("#talent_arrange").val();
+    if (level == null || level == '') {
+        $("#talent_condition").empty();
+        $("#talent_condition").trigger('chosen:updated');
+        return;
+    }
     Feng.addAjaxSelect({
         "id": "talent_condition",
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel"
+        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel/level/" + level
     });
     $("#talent_condition").trigger('chosen:updated');
 }