From f6fa4864a6c11eccdf7acc9c64a312107d5f81d8 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Thu, 6 Aug 2026 12:00:07 +0800 Subject: [PATCH] fix --- jjb.config.js | 4 ++-- .../EvalProject/Create/index.js | 2 +- .../ProjectFlow/ControlContent.js | 4 ++-- .../ProjectFlow/InternalReviewContent.js | 10 +++++++--- .../SafetyEvalBusiness/ProjectFlow/TeamContent.js | 2 +- .../ProjectFlow/TechnicalReviewContent.js | 15 ++++++++------- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/jjb.config.js b/jjb.config.js index aa44c0d..9f0818b 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,10 +10,10 @@ module.exports = { javaGitBranch: "dev", // 本地联调 safetyEval-service（context-path: /safetyEval，默认端口 8095） // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095 - // API_HOST: "https://gbs-gateway.qhdsafety.com", + API_HOST: "https://gbs-gateway.qhdsafety.com", // API_HOST: "http://192.168.0.134", - API_HOST: "http://192.168.0.150", //太浅 + // API_HOST: "http://192.168.0.150", //太浅 // API_HOST: "http://192.168.0.152", //API_HOST: "http://192.168.0.103", //huwei }, diff --git a/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js b/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js index 82cfa30..289b694 100644 --- a/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js +++ b/src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js @@ -106,7 +106,7 @@ const EvalProjectCreate = (props) => { name: item.userName, deptName: item.deptName, posName: item.postName, - capacity: '', + capacity: item.abilityNames, })), }; if (isView) { diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js index d809b9b..a46928c 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js @@ -270,11 +270,11 @@ const ControlContent = ({ readOnly, ...props }) => { {!readOnly && ( )} diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js index 3a98a72..d874f6b 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js @@ -73,8 +73,12 @@ const InternalReviewContent = ({ readOnly, ...props }) => { setRows(next); }; - const isDispatched = - internalReview?.reviewerSignatureTaskStatus === "dispatched"; + const isDispatched = ["dispatched", 'completed'].includes(internalReview?.reviewerSignatureTaskStatus); + const textMap={ + "dispatched": "已下发", + "completed": "已完成", + }; + const problemCount = rows.filter( (r) => r.reviewConclusion === "not_conform_to", ).length; @@ -274,7 +278,7 @@ const InternalReviewContent = ({ readOnly, ...props }) => { loading={internalReviewAssignLoading || props.safetyEvalBusiness?.internalReviewConfirmLoading} disabled={isDispatched || !selectedReviewer || readOnly} > - {isDispatched ? "已下发APP签字" : "下发APP签字"} + {textMap[internalReview?.reviewerSignatureTaskStatus] || '下发App签字'} diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js index f0d31bb..7c64ec2 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TeamContent.js @@ -206,7 +206,7 @@ const TeamContent = ({ readOnly, ...props }) => { ), }, - { title: "资质与专业", dataIndex: "capacity", width: 200, ellipsis: true }, + { title: "能力", dataIndex: "capacity", width: 200, ellipsis: true }, { title: "主要职责", dataIndex: "roles", diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TechnicalReviewContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TechnicalReviewContent.js index 2002847..d3e3697 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TechnicalReviewContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/TechnicalReviewContent.js @@ -70,12 +70,13 @@ const TechnicalReviewContent = ({ readOnly, ...props }) => { next[index] = { ...next[index], [field]: value }; setRows(next); }; - - const isDispatched = techReview?.reviewerSignatureTaskStatus === "dispatched"; - const staffMatch = techReview?.staffMatchCode === 1 ? "满足" : "不满足"; - const inBizScope = - techReview?.inBizScopeFlag === 1 ? "在范围内" : "不在范围内"; - + + const isDispatched = ["dispatched", 'completed'].includes(techReview?.reviewerSignatureTaskStatus); + const textMap={ + "dispatched": "已下发", + "completed": "已完成", + }; + const handleAssign = async () => { if (!projectId) return; const result = await handleConfirm("not_passed"); @@ -276,7 +277,7 @@ const TechnicalReviewContent = ({ readOnly, ...props }) => { loading={props.safetyEvalBusiness?.techReviewAssignLoading || props.safetyEvalBusiness?.techReviewConfirmLoading} disabled={isDispatched || !selectedReviewer || readOnly} > - {isDispatched ? "已下发APP签字" : "下发APP签字"} + {textMap[techReview?.reviewerSignatureTaskStatus] || '下发App签字'}