瀏覽代碼

部门审核未保存过时,进入选择审核通过修改”等待部门审核“默认审核意见为”审核通过“

sugangqiang 2 年之前
父節點
當前提交
e1a6cf0372

+ 6 - 1
app/admin/controller/Talent.php

@@ -1613,9 +1613,14 @@ class Talent extends AdminController {
                     }
                 } else {
                     if ($talent_info["re_check_companys"] && $talent_info["highProcess"] >= 4) {
+                        $talent_info["re_check_companys"] = array_filter(explode(",", $talent_info["re_check_companys"]));
                         $check["checkState"] = 5; //初审通过(需要再次部门并审)
                     } else {
-                        $check["checkState"] = 3; //初审通过
+                        if ($process == 4) {
+                            $check["checkState"] = ""; //部门待审核(系统自动生成的记录,应该算未保存状态,所以设成空,未选择状态)
+                        } else {
+                            $check["checkState"] = 3; //初审通过
+                        }
                     }
                 }
             }

+ 10 - 1
public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -447,6 +447,15 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                             //}
                         });
                     }
+                    if(obj.re_check_companys != null && obj.re_check_companys != ''){
+                        $("#company_list input").each(function () {
+                            for (var key in obj.re_check_companys) {
+                                if ($(this).val() == obj.re_check_companys[key]) {
+                                    this.checked = true;
+                                }
+                            }
+                        });
+                    }
                 },
                 yes: function (index, layero) {
                     TalentInfoInfoDlg.firstCheck(index);
@@ -488,7 +497,7 @@ TalentInfoInfoDlg.toggleField = function () {
     } else if (checkState == 3 || checkState == 4 || checkState == 5) {
         $("#field").hide();
         $("#field").find("input[type=checkbox]").removeAttr("checked");
-        if (checkMsgFirst == null || checkMsgFirst == '') {
+        if (checkMsgFirst == null || checkMsgFirst == '' || checkMsgFirst == "等待部门审核") {
             $("#checkMsgFirst").val("审核通过");
         }
         if (checkState == 5) {