+
+ 该机构共申请
+ {materialGroups.length}
+ 个业务范围资质，以下为各范围对应的申请材料清单
+
+ {materialGroups.map((group) => (
+
+ 证书有效期：
+
+ {group.expireDate}
+ {group.expireWarning ? "（即将到期）" : ""}
+
+
+ )}
+ >
+ (
+
+ ),
+ },
+ ]}
+ />
+
+ ))}
+
+ );
+}
+
+function PersonnelTab({ personnel, loading, onView }) {
+ if (loading) {
+ return ;
+ }
+ return (
+ index + 1 },
+ { title: "姓名", dataIndex: "name", width: 90 },
+ { title: "性别", dataIndex: "gender", width: 60 },
+ { title: "岗位", dataIndex: "position", width: 110 },
+ { title: "资质范围", dataIndex: "qualScope", width: 90 },
+ { title: "学历", dataIndex: "education", width: 80 },
+ {
+ title: "注册安全工程师",
+ width: 120,
+ render: (_, record) => (
+
+ {record.registerEngineer === 1 ? "是" : "否"}
+
+ ),
+ },
+ {
+ title: "操作",
+ width: 80,
+ render: (_, record) => (
+
+ ),
+ },
+ ]}
+ />
+ );
+}
+
+function RegisteredOrgDetailPage(props) {
+ const id = useMemo(() => parseQueryId(props.location), [props.location?.search]);
+ const [form] = Form.useForm();
+ const [orgLoading, setOrgLoading] = useState(Boolean(parseQueryId(props.location)));
+ const [extrasLoading, setExtrasLoading] = useState(Boolean(parseQueryId(props.location)));
+ const [orgName, setOrgName] = useState("");
+ const [materialGroups, setMaterialGroups] = useState([]);
+ const [personnel, setPersonnel] = useState([]);
+ const [filePreview, setFilePreview] = useState(null);
+ const [viewPersonnelId, setViewPersonnelId] = useState("");
+
+ useEffect(() => {
+ if (!id) {
+ setOrgLoading(false);
+ setExtrasLoading(false);
+ return;
+ }
+
+ let cancelled = false;
+ setOrgLoading(true);
+ setExtrasLoading(true);
+
+ (async () => {
+ try {
+ const [orgRes, groups, staffList] = await Promise.all([
+ fetchRegisteredOrgDetail(id),
+ fetchRegisteredOrgQualificationGroups(id).catch((err) => {
+ console.warn("[RegisteredOrgDetail] qualification load failed:", err);
+ message.error(err?.message || "加载申请材料失败");
+ return [];
+ }),
+ fetchRegisteredOrgPersonnelList(id).catch((err) => {
+ console.warn("[RegisteredOrgDetail] personnel load failed:", err);
+ message.error(err?.message || "加载人员信息失败");
+ return [];
+ }),
+ ]);
+ if (cancelled) {
+ return;
+ }
+ if (orgRes?.data) {
+ form.setFieldsValue(orgRes.data);
+ setOrgName(orgRes.data.orgName || "");
+ }
+ setMaterialGroups(groups || []);
+ setPersonnel(staffList || []);
+ }
+ catch (err) {
+ if (!cancelled) {
+ console.warn("[RegisteredOrgDetail] load failed:", err);
+ message.error("加载机构详情失败");
+ }
+ }
+ finally {
+ if (!cancelled) {
+ setOrgLoading(false);
+ setExtrasLoading(false);
+ }
+ }
+ })();
+
+ return () => {
+ cancelled = true;
+ };
+ }, [id]);
+
+ const goBack = () => {
+ if (props.history?.goBack && props.history.length > 1) {
+ props.history.goBack();
+ return;
+ }
+ if (props.history?.push) {
+ props.history.push(LIST_PATH);
+ return;
+ }
+ window.location.href = `/certificate${LIST_PATH}`;
+ };
+
+ if (!id) {
+ return (
+
+ 返回} />
+
+ );
+ }
+
+ const tabItems = [
+ {
+ key: "info",
+ label: "备案信息",
+ children: (
+
+
+
+ ),
+ },
+ {
+ key: "materials",
+ label: "申请清单材料",
+ children: (
+
+ ),
+ },
+ {
+ key: "personnel",
+ label: "人员信息",
+ children: (
+ setViewPersonnelId(record.id)}
+ />
+ ),
+ },
+ ];
+
+ return (
+
+ ← 返回}
+ />
+
+
+ setFilePreview(null)}
+ />
+
+ {viewPersonnelId && (
+ setViewPersonnelId("")}
+ />
+ )}
+
+ );
+}
+
+export default RegisteredOrgDetailPage;
diff --git a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js
new file mode 100644
index 0000000..6c67039
--- /dev/null
+++ b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js
@@ -0,0 +1,101 @@
+import { Button, Form, Tag } from "antd";
+import { Connect } from "@cqsjjb/jjb-dva-runtime";
+import { useEffect } from "react";
+import Page from "zy-react-library/components/Page";
+import Search from "zy-react-library/components/Search";
+import TableList from "zy-react-library/components/Table";
+import useTable from "zy-react-library/hooks/useTable";
+import {
+ REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS,
+ REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS,
+} from "~/enumerate/enterpriseOptions";
+import { NS_ORG_INFO } from "~/enumerate/namespace";
+import { safeListRequest } from "~/utils";
+import { formSelectField } from "~/utils/enterpriseForm";
+import PageHeader from "../../../../EnterpriseInfo/components/PageHeader";
+
+const FILING_RECORD_STATUS_COLOR = {
+ 1: "success",
+ 2: "default",
+};
+
+const SEARCH_COL = { xs: 24, sm: 12, md: 8, lg: 6 };
+const SEARCH_DEFAULT_VALUES = { filingType: "", filingRecordStatus: "" };
+/** 约定式路由首字母小写：registeredOrg/detail */
+const DETAIL_PATH = "/container/supervision/basicInfo/registeredOrg/detail";
+
+function RegisteredOrgListPage(props) {
+ const [searchForm] = Form.useForm();
+
+ const { tableProps, getData } = useTable(safeListRequest(props.registeredOrgList), { form: searchForm });
+
+ useEffect(() => {
+ getData();
+ }, []);
+
+ const goDetail = (id) => {
+ if (!id) {
+ return;
+ }
+ const query = `${DETAIL_PATH}?id=${encodeURIComponent(id)}`;
+ if (props.history?.push) {
+ props.history.push(query);
+ return;
+ }
+ window.location.href = `/certificate${query}`;
+ };
+
+ return (
+
+
+
+ (
+
+ {record.filingRecordStatusName || "-"}
+
+ ),
+ },
+ {
+ title: "操作",
+ width: 120,
+ render: (_, record) => (
+
+ ),
+ },
+ ]}
+ />
+
+ );
+}
+
+export default Connect([NS_ORG_INFO], true)(RegisteredOrgListPage);
diff --git a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/index.js b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/index.js
new file mode 100644
index 0000000..b7e4343
--- /dev/null
+++ b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/index.js
@@ -0,0 +1,5 @@
+function RegisteredOrg(props) {
+ return props.children || null;
+}
+
+export default RegisteredOrg;
diff --git a/src/pages/Container/Supervision/BasicInfo/index.js b/src/pages/Container/Supervision/BasicInfo/index.js
new file mode 100644
index 0000000..9632cf4
--- /dev/null
+++ b/src/pages/Container/Supervision/BasicInfo/index.js
@@ -0,0 +1,5 @@
+function BasicInfo(props) {
+ return {props.children}
;
+}
+
+export default BasicInfo;
diff --git a/src/utils/dateFormat.js b/src/utils/dateFormat.js
index e28e6fe..60e093c 100644
--- a/src/utils/dateFormat.js
+++ b/src/utils/dateFormat.js
@@ -11,11 +11,38 @@ export function formatDateTime(value) {
/** 展示：2026-01-23 */
export function formatDate(value) {
- if (value == null || value === "") {
+ const normalized = normalizeDateValue(value);
+ if (normalized == null || normalized === "") {
return "-";
}
- const d = dayjs(value);
- return d.isValid() ? d.format("YYYY-MM-DD") : String(value);
+ const d = dayjs(normalized);
+ return d.isValid() ? d.format("YYYY-MM-DD") : String(normalized);
+}
+
+/** 兼容 Jackson LocalDateTime 数组 / 对象 / 字符串 */
+export function normalizeDateValue(value) {
+ if (value == null || value === "") {
+ return null;
+ }
+ if (typeof value === "string" || typeof value === "number") {
+ return value;
+ }
+ if (dayjs.isDayjs(value)) {
+ return value;
+ }
+ if (Array.isArray(value)) {
+ const [y, mo, d, h = 0, mi = 0, s = 0] = value;
+ return new Date(y, mo - 1, d, h, mi, s);
+ }
+ if (typeof value === "object") {
+ const y = value.year ?? value.y;
+ const mo = value.monthValue ?? value.month ?? value.m;
+ const d = value.dayOfMonth ?? value.day ?? value.d;
+ if (y != null && mo != null && d != null) {
+ return new Date(y, mo - 1, d);
+ }
+ }
+ return null;
}
/** 提交 API：日期 */