diff --git a/src/pages/Container/QualificationReview/QualConfirm/index.js b/src/pages/Container/QualificationReview/QualConfirm/index.js index d937b71..d1fc045 100644 --- a/src/pages/Container/QualificationReview/QualConfirm/index.js +++ b/src/pages/Container/QualificationReview/QualConfirm/index.js @@ -26,7 +26,7 @@ const QualConfirm = (props) => { queryReviewList({ ...toQualReviewPageQuery(router.query), supervision: true, - applyTypeCode: 2, + applyTypeCode: 3, }); }; diff --git a/src/pages/Container/QualificationReview/QualReview/index.js b/src/pages/Container/QualificationReview/QualReview/index.js index 46bb8dc..da06fea 100644 --- a/src/pages/Container/QualificationReview/QualReview/index.js +++ b/src/pages/Container/QualificationReview/QualReview/index.js @@ -65,9 +65,12 @@ const QualReview = (props) => { title: "专家核验", dataIndex: "expertStatus", width: 100, - render: (status) => { - const config = EXPERT_STATUS_MAP['pending']; - return config ? {config.label} : '--'; + render: (status, record) => { + if (!record.needExpertCheck) { + return "--"; + } + const config = EXPERT_STATUS_MAP[status]; + return config ? {config.label} : "--"; }, }, { diff --git a/src/pages/Container/QualificationReview/reviewPageQuery.js b/src/pages/Container/QualificationReview/reviewPageQuery.js index 62a5a91..33784be 100644 --- a/src/pages/Container/QualificationReview/reviewPageQuery.js +++ b/src/pages/Container/QualificationReview/reviewPageQuery.js @@ -21,12 +21,15 @@ export const REVIEW_BUSINESS_SCOPE_OPTIONS = QUALIFICATION_INDUSTRY_OPTIONS; /** 资质审核列表查询参数映射 */ export function toQualReviewPageQuery(query = {}) { - const { confirmStatus, orgType, filingUnitTypeName, filingStatusCode, ...rest } = query; + const { confirmStatus, orgType, filingUnitTypeName, filingStatusCode, needExpertCheck, ...rest } = query; const params = { ...rest }; const unitType = filingUnitTypeName || orgType; if (unitType) { params.filingUnitTypeName = unitType; } + if (needExpertCheck) { + params.needExpertCheck = needExpertCheck; + } const statusKey = confirmStatus || filingStatusCode; if (statusKey && CONFIRM_STATUS_TO_FILING_CODE[statusKey] != null) { params.filingStatusCode = CONFIRM_STATUS_TO_FILING_CODE[statusKey];