소스 검색

bug修复

sugangqiang 2 년 전
부모
커밋
6f914bffdf
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      app/common/api/TalentLogApi.php
  2. 2 2
      public/static/modular/gate/talentInfo/talentInfo_info.js

+ 1 - 1
app/common/api/TalentLogApi.php

@@ -26,7 +26,7 @@ class TalentLogApi {
         $where[] = ["mainId", "=", $mainId];
         $where[] = ["active", "=", 1];
         $where[] = ["step", "=", 3];
-        $where[] = ["new_state", "=", 9];
+        $where[] = ["new_state", "=", TalentState::DEPT_VERIFY_PASS];
         return TalentLog::where($where)->column("companyId");
     }
 

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

@@ -822,8 +822,8 @@ TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableI
     files = files.split(",");
     var checkState = $("#checkState").val();
     var realState = $("#realState").val();
-    console.log(checkState,realState);
-    if (Feng.isEmptyStr(checkState) || checkState == 0 || checkState == 1 || checkState == 3 || (checkState == 5 && realState == 5) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(fileTypeId.toString()) != -1)) {
+    console.log(checkState, realState);
+    if (Feng.isEmptyStr(checkState) || checkState == 0 || checkState == 1 || checkState == 3 || (checkState == 5 && realState == 5) || (checkState == 8 && realState == 8) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(fileTypeId.toString()) != -1)) {
         if (type == 1) {          //上传
             return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
                     "<i class=\"fa fa-upload\"></i>上传" +