diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index 0d69070..5a26e1a 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -520,7 +520,7 @@ function EquipFormModal({ ); } -function EquipViewModal({ open, currentId, equipInfoGet, onCancel }) { +export function EquipViewModal({ open, currentId, equipInfoGet, onCancel }) { const [info, setInfo] = useState({}); const [detailLoading, setDetailLoading] = useState(false); diff --git a/src/pages/Container/QualificationReview/ExpertVerification/index.js b/src/pages/Container/QualificationReview/ExpertVerification/index.js index 18647b8..522fd1c 100644 --- a/src/pages/Container/QualificationReview/ExpertVerification/index.js +++ b/src/pages/Container/QualificationReview/ExpertVerification/index.js @@ -17,10 +17,6 @@ import { REVIEW_UNIT_TYPE_OPTIONS, toQualReviewPageQuery, } from "../reviewPageQuery"; -import { - getQualReviewMockEnabled, - mockQueryExpertList, -} from "../mockData"; import "../QualReview/index.less"; const { router } = tools; @@ -35,19 +31,8 @@ const ExpertVerification = (props) => { const [form] = Form.useForm(); const { qualReview, queryReviewList } = props; const { qualReviewList, qualReviewTotal, qualReviewLoading } = qualReview || {}; - // mock 默认关闭(真实接口);?mock=1 可临时开启演示。变更时间:2026-08-10 - const mockEnabled = getQualReviewMockEnabled(); - const loadList = (useMock = mockEnabled) => { - if (useMock) { - const res = mockQueryExpertList(router.query); - props.resetModelState(NS_QUAL_REVIEW, { - qualReviewList: res.data, - qualReviewTotal: res.total, - qualReviewLoading: false, - }); - return; - } + const loadList = () => { queryReviewList({ ...toQualReviewPageQuery(router.query), supervision: true, @@ -140,8 +125,8 @@ const ExpertVerification = (props) => { > 查看 - {/* mock 演示模式展示全部“核验”按钮便于与原型对比;真实模式仅待确认可操作 */} - {(mockEnabled || Number(record.filingStatusCode) === 2) && ( + {/* 仅待确认状态可操作 */} + {Number(record.filingStatusCode) === 2 && ( - } - > - {record && ( -
- {rows.map((row) => - row.value != null ? ( - - ) : ( -
- -
- {calibration && ( - - {calibration.label} - - )} -
-
- ), - )} -
- -
- {record.calibrationReportUrl ? ( - 预览检定报告 - ) : ( - 未上传 - )} -
-
-
- )} - - ); -} - const FilingTabs = ({ detail = {}, isReview = false, @@ -176,9 +111,11 @@ const FilingTabs = ({ * 不传时保持原 6 Tab,不影响初审/确认/专家核验展示。变更时间:2026-08-10 */ extraTabs, + equipInfoGet, }) => { const [viewId, setViewId] = useState(""); - const [equipRecord, setEquipRecord] = useState(null); + const [equipViewOpen, setEquipViewOpen] = useState(false); + const [equipId, setEquipId] = useState(""); const personnelRows = useMemo( () => @@ -520,7 +457,14 @@ const FilingTabs = ({ title: "操作", width: 80, render: (_, record) => ( - ), @@ -592,9 +536,19 @@ const FilingTabs = ({ onCancel={() => setViewId("")} /> - setEquipRecord(null)} /> + {equipViewOpen && ( + { + setEquipViewOpen(false); + setEquipId(""); + }} + /> + )} ); }; -export default Connect([NS_QUAL_REVIEW], true)(FilingTabs); +export default Connect([NS_QUAL_REVIEW, NS_EQUIP_INFO], true)(FilingTabs); diff --git a/src/pages/Container/QualificationReview/QualChange/index.js b/src/pages/Container/QualificationReview/QualChange/index.js index e493b1d..45a2903 100644 --- a/src/pages/Container/QualificationReview/QualChange/index.js +++ b/src/pages/Container/QualificationReview/QualChange/index.js @@ -10,10 +10,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { NS_QUAL_REVIEW } from "~/enumerate/namespace"; import { QUALIFICATION_INDUSTRY_OPTIONS_MAP } from "~/enumerate/enterpriseOptions"; import { REVIEW_BUSINESS_SCOPE_OPTIONS, REVIEW_STATUS_CLASS } from "../reviewPageQuery"; -import { - getQualReviewMockEnabled, - mockQueryChangeList, -} from "../mockData"; import "../QualReview/index.less"; const { router } = tools; @@ -45,19 +41,8 @@ const QualChange = (props) => { const [form] = Form.useForm(); const { qualReview, queryQualChangePage } = props; const { qualReviewList, qualReviewTotal, qualReviewLoading } = qualReview || {}; - // mock 默认关闭(真实接口);?mock=1 可临时开启演示。变更时间:2026-08-10 - const mockEnabled = getQualReviewMockEnabled(); - const loadList = (useMock = mockEnabled) => { - if (useMock) { - const res = mockQueryChangeList(router.query); - props.resetModelState(NS_QUAL_REVIEW, { - qualReviewList: res.data, - qualReviewTotal: res.total, - qualReviewLoading: false, - }); - return; - } + const loadList = () => { queryQualChangePage({ ...router.query, current: router.query.current || 1, @@ -143,8 +128,8 @@ const QualChange = (props) => { > 查看 - {/* mock 演示模式展示全部“审核”按钮;真实模式仅 审核中/变更审核中 可审核 */} - {(mockEnabled || [2, 4].includes(Number(record.filingStatusCode))) && ( + {/* 仅审核中/变更审核中可审核 */} + {[2, 4].includes(Number(record.filingStatusCode)) && ( - {/* mock 演示模式展示全部“确认”按钮便于与原型对比;真实模式仅待确认可操作 */} - {(mockEnabled || Number(record.filingStatusCode) === 2) && ( + {/* 仅待确认状态可操作 */} + {Number(record.filingStatusCode) === 2 && ( - {/* mock 演示模式展示全部“审核”按钮便于与原型对比;真实模式按状态显示 */} - {(mockEnabled || Number(record.filingStatusCode) !== 1) && ( + {/* 仅已审核状态不可审核 */} + {Number(record.filingStatusCode) !== 1 && (