From 4bcdfb894ba8bbe6a68ff24ec254f32e6b72d173 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Wed, 8 Jul 2026 17:18:14 +0800 Subject: [PATCH] feat --- src/api/qualFiling/index.js | 5 ++ src/enumerate/qualFilingOptions.js | 8 +- .../QualApplication/FiledManage/List/index.js | 88 +++++++++++++++---- .../QualApplication/FilingListTable.jsx | 5 +- .../ExpertVerification/index.js | 2 +- .../QualificationReview/QualConfirm/index.js | 2 +- .../QualConfirmForm/index.js | 2 +- .../QualificationReview/QualReview/index.js | 2 +- 8 files changed, 83 insertions(+), 31 deletions(-) diff --git a/src/api/qualFiling/index.js b/src/api/qualFiling/index.js index dd90f28..9f2b8cf 100644 --- a/src/api/qualFiling/index.js +++ b/src/api/qualFiling/index.js @@ -363,6 +363,11 @@ export const qualFilingChangeSubmit = declareRequest("qualFilingLoading", safeAc return apiPost("/safetyEval/qual-filing-change/submit", { draftFilingId: asId(draftFilingId) }); })); +export const qualFilingReviewGet = declareRequest( + "qualFilingLoading", + "Get > /safetyEval/qual-filing-review/page", +); + export const submitQualFiling = declareRequest( "qualFilingSubmitLoading", "Post > @/safetyEval/qual-filing/aggregationSaveOrEdit", diff --git a/src/enumerate/qualFilingOptions.js b/src/enumerate/qualFilingOptions.js index 24316b3..afc8bc4 100644 --- a/src/enumerate/qualFilingOptions.js +++ b/src/enumerate/qualFilingOptions.js @@ -99,10 +99,4 @@ export function canStartFilingChange(statusCode) { return Number(statusCode) === 1; } -/** 已备案资质管理:周期性填报审核中可修改 */ -export function isFiledManageEditable(statusCode, mode) { - if (mode !== FILING_FORM_MODE.FILED) { - return isQualFilingEditable(statusCode); - } - return Number(statusCode) === 2; -} + diff --git a/src/pages/Container/QualApplication/FiledManage/List/index.js b/src/pages/Container/QualApplication/FiledManage/List/index.js index fe71833..d736887 100644 --- a/src/pages/Container/QualApplication/FiledManage/List/index.js +++ b/src/pages/Container/QualApplication/FiledManage/List/index.js @@ -1,5 +1,5 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Form, message } from "antd"; +import { Button, Empty, Form, Modal, Table } from "antd"; import { useEffect, useState } from "react"; import { tools } from "@cqsjjb/jjb-common-lib"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; @@ -12,6 +12,8 @@ import { goFilingForm } from "../../filingPaths"; const { router } = tools; function FiledManageListPage(props) { + const { qualFiling } = props; + const {qualFilingLoading}= qualFiling; const [searchForm] = Form.useForm(); const [loading, setLoading] = useState(false); const [dataSource, setDataSource] = useState([]); @@ -57,22 +59,76 @@ function FiledManageListPage(props) { goFilingForm({ mode: FILING_FORM_MODE.FILED }); }; + const [reviewModalOpen, setReviewModalOpen] = useState(false); + const [reviewList, setReviewList] = useState([]); + + const handleShowReview = async (record) => { + setReviewModalOpen(true); + setReviewList([]); + try { + const res = await props.qualFilingReviewGet({ filingId: record.filingId || record.id, current: 1, size: 999 }); + setReviewList(res?.data || []); + } catch { + setReviewList([]); + } + }; + + const handleCloseReview = () => { + setReviewModalOpen(false); + setReviewList([]); + }; + + const REVIEW_RESULT_MAP = { 1: "通过", 2: "待定", 3: "不通过" }; + const reviewColumns = [ + { title: "审核结果", dataIndex: "reviewResult", width: 100, render: (v) => REVIEW_RESULT_MAP[v] || v || "-" }, + { title: "审核结果说明", dataIndex: "reviewResultRemark", ellipsis: true }, + { title: "审核专家", dataIndex: "filingExpertName", width: 120 }, + { title: "综合审核意见", dataIndex: "reviewOpinion", ellipsis: true }, + ]; + return ( - + <> + + Number(record.filingStatusCode) === 3 + ? + : null + } + /> + + {reviewList.length ? ( + + ) : !qualFilingLoading ? : null} + + ); } diff --git a/src/pages/Container/QualApplication/FilingListTable.jsx b/src/pages/Container/QualApplication/FilingListTable.jsx index 7e58cb7..101de96 100644 --- a/src/pages/Container/QualApplication/FilingListTable.jsx +++ b/src/pages/Container/QualApplication/FilingListTable.jsx @@ -6,7 +6,6 @@ import { CHONGQING_DISTRICTS } from "~/enumerate/enterpriseOptions"; import { FILING_FORM_MODE, getFilingStatusOptions, - isFiledManageEditable, isQualFilingEditable, QUAL_FILING_STATUS_COLOR, } from "~/enumerate/qualFilingOptions"; @@ -35,9 +34,7 @@ export default function FilingListTable({ const statusOptions = getFilingStatusOptions(mode); const canEditRow = (record) => { - if (mode === FILING_FORM_MODE.FILED) { - return isFiledManageEditable(record.filingStatusCode, mode); - } + return isQualFilingEditable(record.filingStatusCode); }; diff --git a/src/pages/Container/QualificationReview/ExpertVerification/index.js b/src/pages/Container/QualificationReview/ExpertVerification/index.js index b22e4c0..ae0d40d 100644 --- a/src/pages/Container/QualificationReview/ExpertVerification/index.js +++ b/src/pages/Container/QualificationReview/ExpertVerification/index.js @@ -61,7 +61,7 @@ const ExpertVerification = (props) => { ellipsis: true, }, { title: "机构类型", dataIndex: "filingUnitTypeName", width: 100 }, - { title: "证书编号", dataIndex: "filingNo", width: 140, ellipsis: true }, + { title: "证书编号", dataIndex: "qualCertNo", width: 140, ellipsis: true }, { title: "安全评价业务范围", dataIndex: "businessScope", diff --git a/src/pages/Container/QualificationReview/QualConfirm/index.js b/src/pages/Container/QualificationReview/QualConfirm/index.js index d1fc045..d21e5f9 100644 --- a/src/pages/Container/QualificationReview/QualConfirm/index.js +++ b/src/pages/Container/QualificationReview/QualConfirm/index.js @@ -54,7 +54,7 @@ const QualConfirm = (props) => { }, { title: "机构名称", dataIndex: "filingUnitName", width: 220, ellipsis: true }, { title: "机构类型", dataIndex: "filingUnitTypeName", width: 100 }, - { title: "证书编号", dataIndex: "filingNo", width: 140, ellipsis: true }, + { title: "证书编号", dataIndex: "qualCertNo", width: 140, ellipsis: true }, { title: "安全评价业务范围", dataIndex: "businessScope", width: 180, ellipsis: true }, { title: "确认状态", diff --git a/src/pages/Container/QualificationReview/QualConfirmForm/index.js b/src/pages/Container/QualificationReview/QualConfirmForm/index.js index e01cf70..5235470 100644 --- a/src/pages/Container/QualificationReview/QualConfirmForm/index.js +++ b/src/pages/Container/QualificationReview/QualConfirmForm/index.js @@ -60,7 +60,7 @@ const QualConfirmForm = (props) => {
证书编号
-
{qualFilingDetail.filingNo || '--'}
+
{qualFilingDetail.qualCertNo || '--'}
业务范围
diff --git a/src/pages/Container/QualificationReview/QualReview/index.js b/src/pages/Container/QualificationReview/QualReview/index.js index a83462b..77c0bc1 100644 --- a/src/pages/Container/QualificationReview/QualReview/index.js +++ b/src/pages/Container/QualificationReview/QualReview/index.js @@ -149,7 +149,7 @@ const QualReview = (props) => { allowClear style={{ width: "100%" }} > - + 已审核 审核中 打回