From 101d87c98faa945705bb81af43d70809c859d8f0 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 7 Jul 2026 17:28:44 +0800 Subject: [PATCH 1/5] bug fix --- src/pages/Container/QualificationReview/QualChange/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Container/QualificationReview/QualChange/index.js b/src/pages/Container/QualificationReview/QualChange/index.js index c2cbf6b..99d2ab4 100644 --- a/src/pages/Container/QualificationReview/QualChange/index.js +++ b/src/pages/Container/QualificationReview/QualChange/index.js @@ -69,7 +69,7 @@ const QualChange = (props) => { - {record.filingStatusCode == 2 && ( + {(record.filingStatusCode == 2 || record.filingStatusCode == 4) && ( From 7342b7643d7d6a5cb2c78eb0297f5efe7cc2b113 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Tue, 7 Jul 2026 17:45:27 +0800 Subject: [PATCH 2/5] feat --- src/api/regulatorOrgInfo/index.js | 10 +- .../Supervision/BasicInfo/OrgAccount/index.js | 21 +-- .../Supervision/ExperManage/index.js | 145 ++++++++++++++---- src/pages/Container/index.less | 1 + 4 files changed, 131 insertions(+), 46 deletions(-) diff --git a/src/api/regulatorOrgInfo/index.js b/src/api/regulatorOrgInfo/index.js index 590a5f7..c421f8d 100644 --- a/src/api/regulatorOrgInfo/index.js +++ b/src/api/regulatorOrgInfo/index.js @@ -39,17 +39,17 @@ export const orgAccountModify = declareRequest("orgInfoLoading", safeAction(asyn return fromSingleResponse(res, toOrgInfoForm); })); -export const orgAccountDelete = declareRequest("orgInfoLoading", safeAction(async ({ id }) => { - return apiPostDelete("/safetyEval/org-info/delete", id, NO_ORG_CONTEXT); +export const orgAccountDelete = declareRequest("orgInfoLoading", safeAction(async (data) => { + return apiPost("/safetyEval/org-info/delete", data, {}, NO_ORG_CONTEXT); })); export const orgAccountUpdateState = declareRequest("orgInfoLoading", safeAction(async ({ id, state }) => { return apiPost("/safetyEval/org-info/update-state", { id, state }, {}, NO_ORG_CONTEXT); })); -export const orgAccountResetPassword = declareRequest("orgInfoLoading", safeAction(async ({ id }) => { - const url = `/safetyEval/org-info/reset-password?id=${encodeURIComponent(id)}`; - return apiPost(url, {}, {}, NO_ORG_CONTEXT); +export const orgAccountResetPassword = declareRequest("orgInfoLoading", safeAction(async (data ) => { + const url = `/safetyEval/org-info/reset-password`; + return apiPost(url, data, {}, NO_ORG_CONTEXT); })); export const registeredOrgList = declareRequest("orgInfoLoading", safePageResult(async (params) => { diff --git a/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js b/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js index 28bde9d..146c71b 100644 --- a/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js +++ b/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js @@ -85,14 +85,13 @@ function OrgAccountPage(props) { message.success("操作成功"); await getData(); } - else { - message.error(res?.message || "操作失败"); - } + }, }); }; const onResetPassword = (record) => { + console.log(record); Modal.confirm({ title: "重置密码", content: ( @@ -108,13 +107,11 @@ function OrgAccountPage(props) { okText: "确认重置", cancelText: "取消", onOk: async () => { - const res = await props.orgAccountResetPassword({ id: record.id }); + const res = await props.orgAccountResetPassword({ data: record.id }); if (res?.success !== false) { message.success("密码已重置"); } - else { - message.error(res?.message || "重置失败"); - } + }, }); }; @@ -136,14 +133,12 @@ function OrgAccountPage(props) { okButtonProps: { danger: true }, cancelText: "取消", onOk: async () => { - const res = await props.orgAccountDelete({ id: record.id }); + const res = await props.orgAccountDelete({ data: record.id }); if (res?.success !== false) { message.success("删除成功"); await getData(); } - else { - message.error(res?.message || "删除失败"); - } + }, }); }; @@ -165,9 +160,7 @@ function OrgAccountPage(props) { editForm.resetFields(); await getData(); } - else { - message.error(res?.message || "保存失败"); - } + }; const columns = [ diff --git a/src/pages/Container/Supervision/ExperManage/index.js b/src/pages/Container/Supervision/ExperManage/index.js index 33b499b..846dee1 100644 --- a/src/pages/Container/Supervision/ExperManage/index.js +++ b/src/pages/Container/Supervision/ExperManage/index.js @@ -1,5 +1,14 @@ import React, { useEffect, useState } from "react"; -import { Button, Descriptions, Form, Input, message, Modal, Select, Table } from "antd"; +import { + Button, + Descriptions, + Form, + Input, + message, + Modal, + Select, + Table, +} from "antd"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; @@ -9,6 +18,7 @@ import { tools } from "@cqsjjb/jjb-common-lib"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { NS_QUAL_EXPERT } from "~/enumerate/namespace"; import { GENDER_OPTIONS, GENDER_MAP } from "~/enumerate/constant"; +import AttachmentUpload from "~/components/AttachmentUpload"; const { router } = tools; @@ -20,8 +30,21 @@ const ExperManage = (props) => { const [editingId, setEditingId] = useState(null); const [submiting, setSubmiting] = useState(false); - const { qualExpert, queryExpertPage, getExpertDetail, saveExpert, modifyExpert, deleteExpert } = props; - const { qualExpertList, qualExpertTotal, qualExpertLoading, qualExpertDetail, qualExpertDetailLoading } = qualExpert || {}; + const { + qualExpert, + queryExpertPage, + getExpertDetail, + saveExpert, + modifyExpert, + deleteExpert, + } = props; + const { + qualExpertList, + qualExpertTotal, + qualExpertLoading, + qualExpertDetail, + qualExpertDetailLoading, + } = qualExpert || {}; const getData = () => { queryExpertPage({ @@ -66,7 +89,11 @@ const ExperManage = (props) => { setEditVisible(true); const res = await getExpertDetail({ id }); if (res?.success !== false) { - editForm.setFieldsValue(res.data || qualExpertDetail); + const params = res.data; + if (params.certificate) { + params.certificate = JSON.parse(params.certificate); + } + editForm.setFieldsValue(params); } }; @@ -75,6 +102,9 @@ const ExperManage = (props) => { setSubmiting(true); const action = editingId ? modifyExpert : saveExpert; const params = editingId ? { ...values, id: editingId } : values; + if (values.certificate) { + params.certificate = JSON.stringify(values.certificate); + } const res = await action(params); setSubmiting(false); if (res?.success !== false) { @@ -94,7 +124,7 @@ const ExperManage = (props) => { okButtonProps: { danger: true }, cancelText: "取消", onOk: async () => { - const res = await deleteExpert({ id: record.id }); + const res = await deleteExpert({ data: record.id }); if (res?.success !== false) { message.success("删除成功"); getData(); @@ -121,16 +151,31 @@ const ExperManage = (props) => { render: (code) => GENDER_MAP[code] || "--", }, { title: "身份证号", dataIndex: "idCardNo", width: 180 }, - { title: "证书", dataIndex: "certificate", width: 120, ellipsis: true }, + { title: "操作", width: 180, fixed: "right", render: (_, record) => ( - - - + + + ), }, @@ -140,7 +185,9 @@ const ExperManage = (props) => { 新增专家 + } > { loading={qualExpertLoading} formLine={[ - + , - + , { style={{ width: "100%" }} > {GENDER_OPTIONS.map((item) => ( - {item.label} + + {item.label} + ))} , - + , ]} onReset={handleReset} @@ -210,12 +271,31 @@ const ExperManage = (props) => { footer={} width={560} > - - {qualExpertDetail?.userName || "--"} - {qualExpertDetail?.account || "--"} - {GENDER_MAP[qualExpertDetail?.genderCode] || "--"} - {qualExpertDetail?.idCardNo || "--"} - {qualExpertDetail?.certificate || "--"} + + + {qualExpertDetail?.userName || "--"} + + + {qualExpertDetail?.account || "--"} + + + {GENDER_MAP[qualExpertDetail?.genderCode] || "--"} + + + {qualExpertDetail?.idCardNo || "--"} + + + {(qualExpertDetail?.certificate? JSON.parse(qualExpertDetail?.certificate): [])?.map((item) => ( + + {item.name} + + ))} + @@ -229,29 +309,40 @@ const ExperManage = (props) => { width={520} >
- + - + - - - +
); }; -export default Connect([NS_QUAL_EXPERT], true)(AntdTableFuncControl(ExperManage)); \ No newline at end of file +export default Connect( + [NS_QUAL_EXPERT], + true, +)(AntdTableFuncControl(ExperManage)); diff --git a/src/pages/Container/index.less b/src/pages/Container/index.less index 9c445de..4600d2f 100644 --- a/src/pages/Container/index.less +++ b/src/pages/Container/index.less @@ -7,6 +7,7 @@ .micro-temp-modal-body { max-height: 630px; overflow-y: auto; + overflow-x: hidden; scrollbar-width: thin; } body { From 487459a5673e62d4b2278f23214d7e51ba239747 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Tue, 7 Jul 2026 17:51:09 +0800 Subject: [PATCH 3/5] feat --- .../Container/QualApplication/FilingChange/List/index.js | 4 ++-- .../FilingForm/components/ChangeHistoryModal.jsx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/Container/QualApplication/FilingChange/List/index.js b/src/pages/Container/QualApplication/FilingChange/List/index.js index f45c48e..57934db 100644 --- a/src/pages/Container/QualApplication/FilingChange/List/index.js +++ b/src/pages/Container/QualApplication/FilingChange/List/index.js @@ -67,7 +67,7 @@ function FilingChangeListPage(props) { } }; - +console.log(historyRecord); return ( <> setHistoryRecord(null)} /> diff --git a/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx index 8d2460f..6280586 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/ChangeHistoryModal.jsx @@ -3,6 +3,7 @@ import { useEffect, useState } from "react"; import { fetchQualFilingChangeHistory } from "~/api/qualFiling"; export default function ChangeHistoryModal({ open, originFilingId, onCancel }) { + console.log(originFilingId); const [loading, setLoading] = useState(false); const [records, setRecords] = useState([]); const [changeCount, setChangeCount] = useState(0); From 04db2ccb7ec9a411050319b91a2f98cb62fe15ea Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Tue, 7 Jul 2026 17:57:15 +0800 Subject: [PATCH 4/5] feat --- src/api/qualFiling/index.js | 5 +++-- .../QualApplication/FilingChange/List/index.js | 2 +- .../FilingForm/components/ChangeHistoryModal.jsx | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) 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 ( Date: Tue, 7 Jul 2026 18:03:48 +0800 Subject: [PATCH 5/5] feat --- .../Container/QualificationReview/QualReviewForm/ReviewModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Container/QualificationReview/QualReviewForm/ReviewModal.js b/src/pages/Container/QualificationReview/QualReviewForm/ReviewModal.js index 8966b39..180be4d 100644 --- a/src/pages/Container/QualificationReview/QualReviewForm/ReviewModal.js +++ b/src/pages/Container/QualificationReview/QualReviewForm/ReviewModal.js @@ -34,7 +34,7 @@ const ReviewModal = (props) => { const expertOptions = useMemo( () => (qualExpertList || []).map((item) => ({ - label: `${item.userName}${item.certificate ? `（${item.certificate}）` : ""}`, + label: item.userName, value: item.id, expert: item, })),