diff --git a/jjb.config.js b/jjb.config.js index 509411b..b974c27 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -13,8 +13,8 @@ module.exports = { //API_HOST: "http://localhost:80", // API_HOST: "http://192.168.0.134", - API_HOST: "http://192.168.0.150", //太浅 - // API_HOST: "https://gbs-gateway.qhdsafety.com", + // API_HOST: "http://192.168.0.150", //太浅 + API_HOST: "https://gbs-gateway.qhdsafety.com", // API_HOST: "http://192.168.0.103", //huwei }, production: { diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js index c6b9435..6969f57 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js @@ -230,10 +230,13 @@ const TeamContent = ({ readOnly, ...props }) => { // 导出Word:按当前项目组配置填充模板(聘请所需技术专家、备注事项、部门经理或负责人、年月日保留空白) const handleExport = async () => { + /** 人员展示文本:姓名后追加能力,如"张三(化工)" */ + const personText = (m) => + `${m.personnelName}${m.capacity ? `(${m.capacity})` : ""}`; const namesByRole = (role) => teamMembers .filter((m) => m.roles.some((r) => r.role === role)) - .map((m) => m.personnelName) + .map(personText) .join("、"); const data = { projectName: evalProjectDetailData?.projectName || "", @@ -241,7 +244,7 @@ const TeamContent = ({ readOnly, ...props }) => { projectLeader: namesByRole("PROJECT_LEAD"), membersText: teamMembers .filter((m) => !m.roles.some((r) => r.role === "PROJECT_LEAD")) - .map((m) => m.personnelName) + .map(personText) .join("、"), compiler: namesByRole("REPORT_COMPILER"), auditor: namesByRole("INTERNAL_AUDITOR"), @@ -557,7 +560,7 @@ const TeamContent = ({ readOnly, ...props }) => { { ( - + {!readOnly &&