diff --git a/public/安全评价师简历表(修正版).docx b/public/安全评价师简历表(修正版)V2.docx similarity index 74% rename from public/安全评价师简历表(修正版).docx rename to public/安全评价师简历表(修正版)V2.docx index b55db5f..5e81878 100644 --- a/public/安全评价师简历表(修正版).docx +++ b/public/安全评价师简历表(修正版)V2.docx @@ -17,17 +17,11 @@ {idCardNo} 联系电话 {phone} - 学 历 - 学 位 - 全日制教育 + 学 历学 位 + 学历层次 {education} 毕业院校及专业 {schoolMajor} - - 在职教育 - {ZYeducation} - 毕业院校及专业 - {ZYschoolMajor} 出版学术专著、专利、科技发明、获得科技进步奖、发表学术论文等情况 {publications} 自我申报的专业能力及认定方式 diff --git a/src/components/StaffResumeModal/index.js b/src/components/StaffResumeModal/index.js index 097bada..584a230 100644 --- a/src/components/StaffResumeModal/index.js +++ b/src/components/StaffResumeModal/index.js @@ -9,7 +9,7 @@ import { } from "~/enumerate/constant"; import "./index.less"; -const RESUME_TEMPLATE_URL = "https://test-dragon-yf-pub.oss-cn-hangzhou.aliyuncs.com/jjb/6a87b61be4b063db1579e790.docx"; +const RESUME_TEMPLATE_URL = "https://gbs-cqaqpj.oss-cn-beijing.aliyuncs.com/jjb/6a8fd835e4b043684e055900.docx"; const GENDER_MAP = { 1: "男", 2: "女" }; @@ -93,11 +93,7 @@ export default function StaffResumeModal({ const regCert = info.registeredSafetyEngineerCert; const regCertFiles = parseFileList(regCert?.certAttachmentUrl); - const isZyEducation = info.educationTypeName === "在职教育"; - - const educationText = [info.educationTypeName, info.educationLevelName] - .filter(Boolean) - .join("") || "-"; + const educationText = info.educationLevelName || "-"; const schoolMajorText = [info.graduateSchool, info.basicDisciplineMajorName] .filter(Boolean) @@ -134,11 +130,8 @@ export default function StaffResumeModal({ certNo: display(regCert?.certNo), idCardNo: maskIdCard(info.idCardNo), phone: maskPhone(info.account), - // 全日制填 education/schoolMajor,在职教育填 ZYeducation/ZYschoolMajor - education: isZyEducation ? "" : info.educationLevelName, - schoolMajor: isZyEducation ? "" : schoolMajorText, - ZYeducation: isZyEducation ? info.educationLevelName : "", - ZYschoolMajor: isZyEducation ? schoolMajorText : "", + education: info.educationLevelName, + schoolMajor: schoolMajorText, publications: info.publications || "无", capability: capabilityText, certFiles: diff --git a/src/components/StaffViewModal/index.js b/src/components/StaffViewModal/index.js index b6c3edb..2264cc0 100644 --- a/src/components/StaffViewModal/index.js +++ b/src/components/StaffViewModal/index.js @@ -217,9 +217,6 @@ export default function StaffViewModal({ 学历信息 - - {info.educationTypeName || "-"} - {info.graduateSchool} diff --git a/src/enumerate/enterpriseOptions.js b/src/enumerate/enterpriseOptions.js index ea0c7a0..34f6f30 100644 --- a/src/enumerate/enterpriseOptions.js +++ b/src/enumerate/enterpriseOptions.js @@ -145,12 +145,6 @@ export const PERSON_TYPE_OPTIONS = [ -/** 学历类型 */ -export const EDUCATION_TYPE_OPTIONS = [ - { label: "全日制", value: "全日制" }, - { label: "在职教育", value: "在职教育" }, -]; - /** 学历层次 */ export const EDUCATION_LEVEL_OPTIONS = [ { label: "博士研究生", value: "博士研究生" }, @@ -195,9 +189,9 @@ export const PERSONNEL_POST_TYPE_MAP = PERSONNEL_POST_TYPE_OPTIONS.reduce( /** 能力来源 */ export const ABILITY_SOURCE_OPTIONS = [ - { label: "注册安全工程师", value: "REGISTERED_SAFETY_ENGINEER" }, - { label: "学历", value: "EDUCATION" }, - { label: "职称", value: "PROFESSIONAL_TITLE" }, + { label: "注册安全工程师证书", value: "REGISTERED_SAFETY_ENGINEER" }, + { label: "学历证书", value: "EDUCATION" }, + { label: "职称证书", value: "PROFESSIONAL_TITLE" }, { label: "出版学术专著、专利、获奖、发表学术论文等", value: "ACADEMIC_ACHIEVEMENT" }, ]; export const ABILITY_SOURCE_MAP = ABILITY_SOURCE_OPTIONS.reduce( diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js index 415e3eb..dbffdc9 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js @@ -31,7 +31,6 @@ import { tools } from "@cqsjjb/jjb-common-lib"; import { NS_STAFF_INFO, NS_ORG_DEPARTMENT } from "~/enumerate/namespace"; import { EDUCATION_LEVEL_OPTIONS, - EDUCATION_TYPE_OPTIONS, REGISTER_ENGINEER_OPTIONS, REGISTER_ENGINEER_CATEGORY_OPTIONS, ABILITY_SOURCE_OPTIONS, @@ -1127,26 +1126,6 @@ function StaffFormModal({ 学历信息 - - -