1

app/admin/controller/Talent.php

@@ -34,6 +34,31 @@ class Talent extends AdminController {
         if (in_array($info["checkState"], [TalentState::BASE_VERIFY_FAIL, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::BASE_REVERIFY_REJECT, TalentState::BASE_REVERIFY_FAIL])) {
             return view("talentInfo_base_check", ["info" => $info]);
         } else {
+            $last_log = TalentLogApi::getLastLog($id, \app\common\state\ProjectState::TALENT, 0, ["active", "=", 0]);
+            if ($last_log["step"] == 3 && $last_log["companyId"] != $this->user["companyId"]) {
+                $last_log = TalentLogApi::getLastLog($id, \app\common\state\ProjectState::TALENT, $this->user["companyId"], ["active", "=", 0]);
+            }
+            if ($last_log["state"] == 10 && $last_log["new_state"] == 10) {
+                
+            }
+            if ($last_log["state"] == 11 && $last_log["new_state"] == 8) {
+                
+            }
+            if ($last_log["state"] == 10 && $last_log["new_state"] == 12) {
+                
+            }
+            if ($last_log["state"] == 10 && $last_log["new_state"] == 9) {
+                
+            }
+            if ($last_log["state"] == 14 && $last_log["new_state"] == 14) {
+                
+            }
+            if ($last_log["state"] == 15 && $last_log["new_state"] == 9) {
+                
+            }
+            if ($last_log["state"] == 16 && $last_log["new_state"] == 16) {
+                
+            }
             switch ($info["enterpriseType"]) {
                 case 1:
                     $tpl = "talentInfo_common_check"; //$info["isImport"] ? "nofile_talentInfo_common_check" : "talentInfo_common_check";

app/admin/view/talent/talentInfo_common_check.html

@@ -314,13 +314,13 @@
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class="control-label spacing td-label"><span style="color: red">*</span>工作简历</label>
-                                                    <textarea class="form-control" style="border: none">{$info.experience}</textarea>
+                                                    <textarea class="form-control" style="border: none;height:120px;">{$info.experience}</textarea>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
-                                                    <textarea class="form-control" style="border: none">{$info.education}</textarea>
+                                                    <textarea class="form-control" style="border: none;height:120px;">{$info.education}</textarea>
                                                 </div>
                                             </td>
                                         </tr>

app/common/api/DictApi.php

@@ -171,6 +171,7 @@ class DictApi {
             "fst_work_time" => "来晋工作时间",
             "experience" => "工作简历",
             "education" => "教育背景",
+            "headimgurl" => "头像"
         ];
         $dict2 = [
             "talent_arrange" => "人才层次",
@@ -253,7 +254,8 @@ class DictApi {
             "bank_account" => "银行账号",
             "education" => "教育背景及工作简历",
             "experience" => "主要业绩及取得的荣誉",
-            "description" => "备注"
+            "description" => "备注",
+            "headimgurl" => "头像"
         ];
         return $dict;
     }

public/static/modular/gate/talentBase/talentInfo_ic_info.js

@@ -555,6 +555,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
     var checkState = $("#checkState").val();
     var fields = $("#fields").val();
     if(checkState==10){
+        $("#photoImg").removeAttr("onclick");
         $("input,textarea").each(function () {
             $(this).attr("readonly","readonly");
         });
@@ -564,6 +565,12 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         if(fields!=null && fields!=''){
             var arr = fields.split(",");
             for(var key in arr){
+                if (arr[key] == "headimgurl") {
+                    $("#photoImg").bind("click", function () {
+                        $("#photo").click();
+                    });
+                    continue;
+                }
                 var name = $("#" + arr[key]).prop("tagName");
                 if(name=='select' || name=='SELECT'){
                     $("#" + arr[key]).removeAttr("disabled");

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

@@ -1150,6 +1150,7 @@ TalentInfoInfoDlg.setNoChangeField = function () {
     var fields = $("#fields").val();
     var realState = $("#realState").val();
     if (realState == 11) {
+        $("#photoImg").removeAttr("onclick");
         $("input,textarea").each(function () {
             $(this).attr("readonly", "readonly");
         });
@@ -1159,6 +1160,12 @@ TalentInfoInfoDlg.setNoChangeField = function () {
         if (fields != null && fields != '') {
             var arr = fields.split(",");
             for (var key in arr) {
+                if (arr[key] == "headimgurl") {
+                    $("#photoImg").bind("click", function () {
+                        $("#photo").click();
+                    });
+                    continue;
+                }
                 if (arr[key] != "") {
                     var name = $("#" + arr[key]).prop("tagName");
                     if (name == 'select' || name == 'SELECT') {