diff --git a/jjb.config.js b/jjb.config.js index 2edd237..04111c0 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,7 +10,7 @@ module.exports = { javaGitBranch: "", // 本地联调 safetyEval-service（context-path: /safetyEval，默认端口 8095） // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095 - API_HOST: "http://192.168.0.134", + API_HOST: "http://192.168.0.149", }, production: { // 应用后端分支名称，部署上线需要 diff --git a/public/index.html b/public/index.html index 1a8b3ef..3d27dd8 100644 --- a/public/index.html +++ b/public/index.html @@ -5,97 +5,124 @@ + - - - - + + + + <% for (const item of $links) { %> - - <% } %> - -- - - - <% for (const item of $scripts) { %> - - <% } %> + + + <% for (const item of $scripts) { %> + + <% } %> - + + - <% const { root } = $element; %> -
+ <% const { root }=$element; %> +
- + + \ No newline at end of file diff --git a/src/api/qualFiling/index.js b/src/api/qualFiling/index.js index ac4aaec..7c60fe9 100644 --- a/src/api/qualFiling/index.js +++ b/src/api/qualFiling/index.js @@ -33,39 +33,7 @@ export function toFilingListRow(data = {}) { }; } -// ─── 字段映射：基本表单 ─── -export function toFilingBasicForm(data = {}) { - return { - id: asId(data.id), - businessScope: data.businessScope, - filingTerritoryCode: data.filingTerritoryCode, - filingTerritoryName: data.filingTerritoryName, - filingUnitName: data.filingUnitName, - filingUnitTypeCode: data.filingUnitTypeCode, - filingUnitTypeName: data.filingUnitTypeName, - filingNo: data.filingNo, - registerAddress: data.registerAddress, - officeAddress: data.officeAddress, - creditCode: data.creditCode, - qualCertNo: data.qualCertNo, - legalPersonPhone: data.legalPersonPhone, - contactPhone: data.contactPhone, - infoDisclosureUrl: data.infoDisclosureUrl, - fixedAssetAmount: data.fixedAssetAmount, - workplaceArea: data.workplaceArea, - archiveRoomArea: data.archiveRoomArea, - fulltimeEvaluatorCount: data.fulltimeEvaluatorCount, - registeredEngineerCount: data.registeredEngineerCount, - unitIntro: data.unitIntro, - attachmentUrl: data.attachmentUrl, - attachments: parseUploadFileList(data.attachmentUrl, "备案附件.pdf"), - filingStatusCode: data.filingStatusCode, - filingStatusName: data.filingStatusName, - applyTypeCode: data.applyTypeCode, - originFilingId: asId(data.originFilingId), - }; -} export function fromFilingBasicForm(values = {}) { const territoryName = values.filingTerritoryName || values.filingTerritoryCode; @@ -100,7 +68,7 @@ export function fromFilingBasicForm(values = {}) { export function toFilingDetail(data = {}) { return { - ...toFilingBasicForm(data), + ...data, materials: (data.materials || []), commitment: data.commitment ? toFilingCommitmentForm(data.commitment, data.filingUnitName) : null, personnelList: (data.personnelList || []).map(toFilingPersonnelRow), @@ -222,6 +190,11 @@ export async function fetchQualFilingDetail(id) { return fromSingleResponse(res, toFilingDetail); } +export async function fetchQualChangeDetail(id) { + const res = await apiGet("/safetyEval/qual-filing-change/detail", { id: asId(id) }); + return fromSingleResponse(res, toFilingDetail); +} + export async function fetchQualFilingChangeHistory(originFilingId) { const res = await apiGet("/safetyEval/qual-filing-change/history", { originFilingId: asId(originFilingId), @@ -230,7 +203,7 @@ export async function fetchQualFilingChangeHistory(originFilingId) { } export const qualFilingPage = declareRequest("qualFilingLoading", safePageResult(async (params) => { - const query = toFilingPageQuery(params, { applyTypeCode: APPLY_TYPE_APPLICATION }); + const query = toFilingPageQuery(params, { }); const res = await apiGet("/safetyEval/qual-filing/page", query); return fromPageResponse(res, toFilingListRow); })); @@ -340,4 +313,8 @@ export const submitQualFiling = declareRequest( "Post > @/safetyEval/qual-filing/aggregationSaveOrEdit", ); +export const submitQualFilingChange = declareRequest( + "qualFilingSubmitLoading", + "Post > @/safetyEval/qual-filing-change/aggregationSaveOrEdit", +); diff --git a/src/pages/Container/QualApplication/FiledManage/List/index.js b/src/pages/Container/QualApplication/FiledManage/List/index.js index 715d805..8859cae 100644 --- a/src/pages/Container/QualApplication/FiledManage/List/index.js +++ b/src/pages/Container/QualApplication/FiledManage/List/index.js @@ -23,9 +23,10 @@ function FiledManageListPage(props) { const params = { ...router.query, current: pagination?.current || router.query.current || 1, - pageSize: pagination?.pageSize || router.query.pageSize || 10, + size: pagination?.size || router.query.size || 10, + applyTypeCode: 2, }; - const res = await props.qualFilingFiledPage(params); + const res = await props.qualFilingPage(params); if (res?.success !== false) { setDataSource(res?.data || []); setTotal(res?.totalCount || 0); @@ -43,12 +44,12 @@ function FiledManageListPage(props) { }, []); const handleSearch = (values) => { - router.query = { ...router.query, ...values, current: 1, pageSize: 10 }; + router.query = { ...router.query, ...values, current: 1, size: 10 }; getData(); }; const handlePageChange = (pagination) => { - router.query = { ...router.query, current: pagination.current, pageSize: pagination.pageSize }; + router.query = { ...router.query, current: pagination.current, size: pagination.size }; getData(pagination); }; diff --git a/src/pages/Container/QualApplication/FilingApplication/List/index.js b/src/pages/Container/QualApplication/FilingApplication/List/index.js index 699df3b..6b47b6f 100644 --- a/src/pages/Container/QualApplication/FilingApplication/List/index.js +++ b/src/pages/Container/QualApplication/FilingApplication/List/index.js @@ -24,6 +24,7 @@ function FilingApplicationListPage(props) { ...router.query, current: pagination?.current || router.query.current || 1, pageSize: pagination?.pageSize || router.query.pageSize || 10, + applyTypeCode: 1, }; const res = await props.qualFilingPage(params); if (res?.success !== false) { @@ -60,7 +61,7 @@ function FilingApplicationListPage(props) { }; const handleCreate = () => { - props.history.push(`/safetyEval/container/qualApplication/filingForm?mode=application`); + props.history.push(`/container/qualApplication/filingForm?mode=application`); }; const handleDelete = (record) => { @@ -71,10 +72,7 @@ function FilingApplicationListPage(props) { cancelText: "否", onOk: async () => { const res = await props.qualFilingDelete({ id: record.id }); - if (res?.success === false) { - message.error(res.message || "删除失败"); - return; - } + message.success("删除成功"); getData(); }, diff --git a/src/pages/Container/QualApplication/FilingChange/List/index.js b/src/pages/Container/QualApplication/FilingChange/List/index.js index 0a52869..f45c48e 100644 --- a/src/pages/Container/QualApplication/FilingChange/List/index.js +++ b/src/pages/Container/QualApplication/FilingChange/List/index.js @@ -17,7 +17,7 @@ const { router } = tools; function FilingChangeListPage(props) { const [searchForm] = Form.useForm(); const [historyRecord, setHistoryRecord] = useState(null); - const [startingId, setStartingId] = useState(""); + const [loading, setLoading] = useState(false); const [dataSource, setDataSource] = useState([]); const [total, setTotal] = useState(0); @@ -28,7 +28,7 @@ function FilingChangeListPage(props) { const params = { ...router.query, current: pagination?.current || router.query.current || 1, - pageSize: pagination?.pageSize || router.query.pageSize || 10, + size: pagination?.size || router.query.size || 10, }; const res = await props.qualFilingChangePage(params); if (res?.success !== false) { @@ -48,23 +48,23 @@ function FilingChangeListPage(props) { }, []); const handleSearch = (values) => { - router.query = { ...router.query, ...values, current: 1, pageSize: 10 }; + router.query = { ...router.query, ...values, current: 1, size: 10 }; getData(); }; const handlePageChange = (pagination) => { - router.query = { ...router.query, current: pagination.current, pageSize: pagination.pageSize }; + router.query = { ...router.query, current: pagination.current, size: pagination.size }; getData(pagination); }; const handleStartChange = async (record) => { - setStartingId(record.id); + try { - props.history.push(`/safetyEval/container/qualApplication/filingForm?mode=change&id=${record.id}`); + props.history.push(`/container/qualApplication/filingForm?mode=change&id=${record.id}`); } finally { - setStartingId(""); + } }; @@ -89,7 +89,7 @@ function FilingChangeListPage(props) {