diff --git a/src/api/qualFiling/index.js b/src/api/qualFiling/index.js index d9592a7..da48a21 100644 --- a/src/api/qualFiling/index.js +++ b/src/api/qualFiling/index.js @@ -16,6 +16,7 @@ const APPLY_TYPE_APPLICATION = 1; export function toFilingListRow(data = {}) { return { id: asId(data.id), + filingId: data.filingId, filingTerritoryCode: data.filingTerritoryCode, filingTerritoryName: data.filingTerritoryName, filingUnitName: data.filingUnitName, @@ -181,9 +182,9 @@ export async function fetchQualChangeDetail(id) { return fromSingleResponse(res, toFilingDetail); } -export async function fetchQualFilingChangeHistory(originFilingId) { +export async function fetchQualFilingChangeHistory(filingId) { const res = await apiGet("/safetyEval/qual-filing-change/history", { - originFilingId: asId(originFilingId), + filingId: asId(filingId), }); return fromSingleResponse(res, toChangeHistory); } diff --git a/src/pages/Container/QualApplication/FilingChange/List/index.js b/src/pages/Container/QualApplication/FilingChange/List/index.js index 57934db..fbd2f03 100644 --- a/src/pages/Container/QualApplication/FilingChange/List/index.js +++ b/src/pages/Container/QualApplication/FilingChange/List/index.js @@ -99,7 +99,7 @@ console.log(historyRecord); /> setHistoryRecord(null)} /> diff --git a/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx index 6280586..d03381a 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx @@ -2,21 +2,21 @@ import { Modal, Table } from "antd"; import { useEffect, useState } from "react"; import { fetchQualFilingChangeHistory } from "~/api/qualFiling"; -export default function ChangeHistoryModal({ open, originFilingId, onCancel }) { - console.log(originFilingId); +export default function ChangeHistoryModal({ open, filingId, onCancel }) { + const [loading, setLoading] = useState(false); const [records, setRecords] = useState([]); const [changeCount, setChangeCount] = useState(0); useEffect(() => { - if (!open || !originFilingId) { + if (!open || !filingId) { setRecords([]); setChangeCount(0); return; } let cancelled = false; setLoading(true); - fetchQualFilingChangeHistory(originFilingId) + fetchQualFilingChangeHistory(filingId) .then((res) => { if (cancelled) { return; @@ -33,7 +33,7 @@ export default function ChangeHistoryModal({ open, originFilingId, onCancel }) { return () => { cancelled = true; }; - }, [open, originFilingId]); + }, [open, filingId]); return (