sugangqiang 2 年之前
父节点
当前提交
1827c8a489

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

@@ -1355,7 +1355,9 @@ class Talent extends AdminController {
                     if ($enterprise["type"] == 2) {
                         $fields = DictApi::getTalentFields_IC();
                     } else {
-                        $fields = DictApi::getTalentFields(4);
+                        if ($process != 4) {
+                            $fields = DictApi::getTalentFields(4);
+                        }
                     }
                 }
                 if ($checkState != TalentState::FST_SUBMIT) {

+ 9 - 1
app/enterprise/controller/Talent.php

@@ -161,6 +161,9 @@ class Talent extends EnterpriseController {
             echo sprintf("<script>parent.TalentInfoInfoDlg.submitCallback(%s);</script>", json_encode($res));
             exit;
         }
+        if ($info) {
+            $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
+        }
         $checkState = $info["checkState"];
         if ($checkState == TalentState::SCND_SAVE || $checkState == TalentState::BASE_REVERIFY_PASS) {
             $field_dict = \app\common\api\DictApi::getTalentFields(2);
@@ -283,6 +286,9 @@ class Talent extends EnterpriseController {
         $params = $this->request->param();
         $id = $params["id"];
         $info = TalentApi::chkIsOwner($id, $this->user["uid"]);
+        if ($info) {
+            $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
+        }
         $checkState = $info["checkState"];
         if ($checkState == TalentState::SCND_SAVE || !$id) {
             $field_dict = \app\common\api\DictApi::getTalentFields(4);
@@ -435,6 +441,9 @@ class Talent extends EnterpriseController {
         if (!$info = TalentApi::chkIsOwner($id, $this->user["uid"])) {
             return json(["msg" => "没有对应的人才认定申报信息"]);
         }
+        if ($info) {
+            $info["real_state"] = TalentLogApi::getLastLog($id, 1)["state"];
+        }
         $checkState = $info["checkState"];
         if ($checkState == TalentState::SCND_SAVE) {
             $field_dict = \app\common\api\DictApi::getTalentFields_IC();
@@ -729,7 +738,6 @@ class Talent extends EnterpriseController {
             } else {
                 $data["annual_salary"] = null;
             }
-
             if ($info["real_state"] == TalentState::FST_VERIFY_REJECT) {
                 //真实状态11是驳回,需要判断什么字段可以提交                
                 $modify_fields = array_filter(explode(",", $info["modify_fields"]));

+ 2 - 2
public/static/modular/gate/talentBase/talentInfo_info.js

@@ -948,7 +948,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
-        $("select").each(function () {
+        $("select,input[type=radio]").each(function () {
             $(this).attr("disabled", "disabled");
         });
         if (fields != null && fields != '') {
@@ -961,7 +961,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
                     $("#" + arr[key]).removeAttr("readonly");
                 } else {
                     if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled");
+                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
                     }
                 }
             }

+ 2 - 2
public/static/modular/gate/talentInfo/new_talentInfo_info.js

@@ -1055,7 +1055,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
-        $("select").each(function () {
+        $("select,input[type=radio]").each(function () {
             $(this).attr("disabled", "disabled");
         });
         if (fields != null && fields != '') {
@@ -1068,7 +1068,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
                     $("#" + arr[key]).removeAttr("readonly");
                 } else {
                     if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled");
+                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
                     }
                 }
             }

+ 2 - 2
public/static/modular/gate/talentInfo/talentInfo_ic_info.js

@@ -569,7 +569,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
-        $("select").each(function () {
+        $("select,input[type=radio]").each(function () {
             $(this).attr("disabled", "disabled");
         });
         if (fields != null && fields != '') {
@@ -582,7 +582,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
                     $("#" + arr[key]).removeAttr("readonly");
                 } else {
                     if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled");
+                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
                     }
                 }
             }

+ 2 - 2
public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -889,7 +889,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
-        $("select").each(function () {
+        $("select,input[type=radio]").each(function () {
             $(this).attr("disabled", "disabled");
         });
         if (fields != null && fields != '') {
@@ -902,7 +902,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
                     $("#" + arr[key]).removeAttr("readonly");
                 } else {
                     if (name == "undefined") {
-                        $("input[name=" + arr[key] + "]").removeAttr("disabled");
+                        $("input[name=" + arr[key] + "]").removeAttr("disabled").removeAttr("readonly");
                     }
                 }
             }