1

app/admin/controller/Talent.php

@@ -1806,7 +1806,7 @@ class Talent extends AdminController {
         $talentInfo = VerifyApi::getOne($id);
         $lastLog = TalentLogApi::getLastLog($id, ProjectState::TALENT);
         $responseObj = new \stdClass();
-        if ($talentInfo["checkState"] == TalentState::SCND_SAVE && $lastLog["state"] == TalentState::FST_VERIFY_REJECT) {
+        if (($talentInfo["checkState"] == TalentState::SCND_SAVE || $talentInfo["checkState"] == TalentState::FST_SAVE || $talentInfo["checkState"] == TalentState::FST_SUBMIT) && $lastLog["state"] == TalentState::FST_VERIFY_REJECT) {
             if ($this->user["type"] == CommonConst::ENTERPRISE_JC) {
                 $fields = DictApi::getTalentFields_IC();
             } else if ($this->user["type"] == CommonConst::ENTERPRISE_WJ) {
@@ -1867,7 +1867,7 @@ class Talent extends AdminController {
         $talentInfo = VerifyApi::getOne($id);
         $lastLog = TalentLogApi::getLastLog($id, ProjectState::TALENT);
         $responseObj = new \stdClass();
-        if ($talentInfo["checkState"] == TalentState::SCND_SAVE && $lastLog["state"] == TalentState::FST_VERIFY_REJECT) {
+        if (($talentInfo["checkState"] == TalentState::SCND_SAVE || $talentInfo["checkState"] == TalentState::FST_SAVE || $talentInfo["checkState"] == TalentState::FST_SUBMIT) && $lastLog["state"] == TalentState::FST_VERIFY_REJECT) {
             if (!$fields && !$files) {
                 $responseObj->msg = "请选择可修改的字段或附件！";
                 return json($responseObj);

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

@@ -1,6 +1,7 @@
 /**
  * 初始化人才认定申报详情对话框
  */
+var locked = false;
 var TalentInfoInfoDlg = {
     talentInfoInfoData: {},
 };

public/static/modular/talentIdentify/talentInfo/hospital/talentInfo_common_check_new.js

@@ -486,11 +486,11 @@ TalentInfoInfoDlg.toggledepField = function () {
 /**
  * 显示字段或者隐藏字段选择
  */
-TalentInfoInfoDlg.toggleField = function () {
+TalentInfoInfoDlg.toggleField = function () {    
     var checkState = $("#checkStateFirstModal").val();
     var checkMsgFirst = $("#checkMsgFirst").val();
     $("#company_list").hide();
-    if (checkState == 2) {
+    if (checkState == 2 || checkState == 6) {
         $("#field").show();
         $("#checkMsgFirst").val("");
     } else if (checkState == 3 || checkState == 4 || checkState == 5) {

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

@@ -282,6 +282,9 @@ TalentInfo.checkAll = function () {
     $("#field_info input").each(function () {
         this.checked = true;
     })
+    $("#field_file input").each(function () {
+        this.checked = true;
+    })
 }
 /**
  * 反选
@@ -294,5 +297,12 @@ TalentInfo.unCheckAll = function () {
             this.checked = true;
         }
     })
+    $("#field_file input").each(function () {
+        if (this.checked) {
+            this.checked = false;
+        } else {
+            this.checked = true;
+        }
+    })
 }