Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev
commit
6cca9c2ae7
|
|
@ -26,7 +26,7 @@ const QualConfirm = (props) => {
|
|||
queryReviewList({
|
||||
...toQualReviewPageQuery(router.query),
|
||||
supervision: true,
|
||||
applyTypeCode: 2,
|
||||
applyTypeCode: 3,
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -65,9 +65,12 @@ const QualReview = (props) => {
|
|||
title: "专家核验",
|
||||
dataIndex: "expertStatus",
|
||||
width: 100,
|
||||
render: (status) => {
|
||||
const config = EXPERT_STATUS_MAP['pending'];
|
||||
return config ? <Tag color={config.color}>{config.label}</Tag> : '--';
|
||||
render: (status, record) => {
|
||||
if (!record.needExpertCheck) {
|
||||
return "--";
|
||||
}
|
||||
const config = EXPERT_STATUS_MAP[status];
|
||||
return config ? <Tag color={config.color}>{config.label}</Tag> : "--";
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
Loading…
Reference in New Issue