fix
parent
7147cff0bf
commit
f6fa4864a6
|
|
@ -10,10 +10,10 @@ module.exports = {
|
||||||
javaGitBranch: "dev",
|
javaGitBranch: "dev",
|
||||||
// 本地联调 safetyEval-service(context-path: /safetyEval,默认端口 8095)
|
// 本地联调 safetyEval-service(context-path: /safetyEval,默认端口 8095)
|
||||||
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x: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.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.152",
|
||||||
//API_HOST: "http://192.168.0.103", //huwei
|
//API_HOST: "http://192.168.0.103", //huwei
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ const EvalProjectCreate = (props) => {
|
||||||
name: item.userName,
|
name: item.userName,
|
||||||
deptName: item.deptName,
|
deptName: item.deptName,
|
||||||
posName: item.postName,
|
posName: item.postName,
|
||||||
capacity: '',
|
capacity: item.abilityNames,
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
if (isView) {
|
if (isView) {
|
||||||
|
|
|
||||||
|
|
@ -270,11 +270,11 @@ const ControlContent = ({ readOnly, ...props }) => {
|
||||||
{!readOnly && (
|
{!readOnly && (
|
||||||
<Button
|
<Button
|
||||||
type="primary"
|
type="primary"
|
||||||
disabled={processControl?.reviewerSignatureTaskStatus !== "non_dispatched"}
|
disabled={ ["dispatched", 'completed'].includes(processControl?.reviewerSignatureTaskStatus)}
|
||||||
onClick={() => handleConfirm("passed")}
|
onClick={() => handleConfirm("passed")}
|
||||||
loading={props.safetyEvalBusiness?.processControlConfirmLoading}
|
loading={props.safetyEvalBusiness?.processControlConfirmLoading}
|
||||||
>
|
>
|
||||||
{reviewerSignatureTaskStatusMap[processControl?.reviewerSignatureTaskStatus]}
|
{reviewerSignatureTaskStatusMap[processControl?.reviewerSignatureTaskStatus] || '过程控制签字提交'}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
|
||||||
|
|
@ -73,8 +73,12 @@ const InternalReviewContent = ({ readOnly, ...props }) => {
|
||||||
setRows(next);
|
setRows(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
const isDispatched =
|
const isDispatched = ["dispatched", 'completed'].includes(internalReview?.reviewerSignatureTaskStatus);
|
||||||
internalReview?.reviewerSignatureTaskStatus === "dispatched";
|
const textMap={
|
||||||
|
"dispatched": "已下发",
|
||||||
|
"completed": "已完成",
|
||||||
|
};
|
||||||
|
|
||||||
const problemCount = rows.filter(
|
const problemCount = rows.filter(
|
||||||
(r) => r.reviewConclusion === "not_conform_to",
|
(r) => r.reviewConclusion === "not_conform_to",
|
||||||
).length;
|
).length;
|
||||||
|
|
@ -274,7 +278,7 @@ const InternalReviewContent = ({ readOnly, ...props }) => {
|
||||||
loading={internalReviewAssignLoading || props.safetyEvalBusiness?.internalReviewConfirmLoading}
|
loading={internalReviewAssignLoading || props.safetyEvalBusiness?.internalReviewConfirmLoading}
|
||||||
disabled={isDispatched || !selectedReviewer || readOnly}
|
disabled={isDispatched || !selectedReviewer || readOnly}
|
||||||
>
|
>
|
||||||
{isDispatched ? "已下发APP签字" : "下发APP签字"}
|
{textMap[internalReview?.reviewerSignatureTaskStatus] || '下发App签字'}
|
||||||
</Button>
|
</Button>
|
||||||
</Flex>
|
</Flex>
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
|
||||||
|
|
@ -206,7 +206,7 @@ const TeamContent = ({ readOnly, ...props }) => {
|
||||||
</div>
|
</div>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
{ title: "资质与专业", dataIndex: "capacity", width: 200, ellipsis: true },
|
{ title: "能力", dataIndex: "capacity", width: 200, ellipsis: true },
|
||||||
{
|
{
|
||||||
title: "主要职责",
|
title: "主要职责",
|
||||||
dataIndex: "roles",
|
dataIndex: "roles",
|
||||||
|
|
|
||||||
|
|
@ -71,10 +71,11 @@ const TechnicalReviewContent = ({ readOnly, ...props }) => {
|
||||||
setRows(next);
|
setRows(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
const isDispatched = techReview?.reviewerSignatureTaskStatus === "dispatched";
|
const isDispatched = ["dispatched", 'completed'].includes(techReview?.reviewerSignatureTaskStatus);
|
||||||
const staffMatch = techReview?.staffMatchCode === 1 ? "满足" : "不满足";
|
const textMap={
|
||||||
const inBizScope =
|
"dispatched": "已下发",
|
||||||
techReview?.inBizScopeFlag === 1 ? "在范围内" : "不在范围内";
|
"completed": "已完成",
|
||||||
|
};
|
||||||
|
|
||||||
const handleAssign = async () => {
|
const handleAssign = async () => {
|
||||||
if (!projectId) return;
|
if (!projectId) return;
|
||||||
|
|
@ -276,7 +277,7 @@ const TechnicalReviewContent = ({ readOnly, ...props }) => {
|
||||||
loading={props.safetyEvalBusiness?.techReviewAssignLoading || props.safetyEvalBusiness?.techReviewConfirmLoading}
|
loading={props.safetyEvalBusiness?.techReviewAssignLoading || props.safetyEvalBusiness?.techReviewConfirmLoading}
|
||||||
disabled={isDispatched || !selectedReviewer || readOnly}
|
disabled={isDispatched || !selectedReviewer || readOnly}
|
||||||
>
|
>
|
||||||
{isDispatched ? "已下发APP签字" : "下发APP签字"}
|
{textMap[techReview?.reviewerSignatureTaskStatus] || '下发App签字'}
|
||||||
</Button>
|
</Button>
|
||||||
</Flex>
|
</Flex>
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue