From 14c454d4161389fe8eefd2770751248668b6cc85 Mon Sep 17 00:00:00 2001 From: "122778500@qq.com" <122778500@qq.com> Date: Mon, 29 Jun 2026 16:45:58 +0800 Subject: [PATCH] feat --- .gitignore | 2 +- jjb.config.js | 2 +- package.json | 2 +- pnpm-lock.yaml | 19 +- src/components/PersonInChargeInfo/index.js | 6 +- src/components/PersonInChargeList/index.js | 6 +- .../SpecialCertificateInfo/index.js | 6 +- .../SpecialCertificateList/index.js | 6 +- src/main.js | 2 +- .../DepartmentPosition/index.js | 8 +- .../EnterpriseInfo/EquipInfo/index.js | 14 +- .../Container/EnterpriseInfo/OrgInfo/index.js | 409 ++++++++++++++++-- .../EnterpriseInfo/PersonnelChange/index.js | 20 +- .../PersonnelInfo/Certificate/index.js | 9 +- .../PersonnelInfo/List/index.js | 14 +- .../EnterpriseInfo/QualificationCert/index.js | 14 +- .../EnterpriseInfo/ResignationApply/index.js | 15 +- .../EnterpriseInfo/components/PageHeader.js | 13 - src/pages/Container/EnterpriseInfo/index.js | 2 +- .../BasicInfo/EnterprisePortrait/index.js | 14 +- .../BasicInfo/EvaluatorInfo/index.js | 14 +- .../Supervision/BasicInfo/OrgAccount/index.js | 14 +- .../BasicInfo/RegisteredOrg/Detail/index.js | 23 +- .../BasicInfo/RegisteredOrg/List/index.js | 14 +- .../BranchStatistics/List/index.js | 6 +- .../EnterpriseLicense/index.js | 6 +- .../StakeholderStatistics/List/index.js | 6 +- .../BranchCompanyStat/List/index.js | 6 +- .../PersonInCharge/List/index.js | 6 +- .../SecurityAdmini/List/index.js | 6 +- .../SpecialDevice/List/index.js | 6 +- .../SpecialPersonnel/List/index.js | 6 +- .../StakeholderStat/List/index.js | 6 +- .../PersonInCharge/List/index.js | 6 +- .../SecurityAdmini/List/index.js | 6 +- .../SpecialDevice/List/index.js | 6 +- .../SpecialPersonnel/List/index.js | 6 +- 37 files changed, 511 insertions(+), 215 deletions(-) delete mode 100644 src/pages/Container/EnterpriseInfo/components/PageHeader.js diff --git a/.gitignore b/.gitignore index d126d4d..97ca288 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ # production /dist /demo - +/.trae/ npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/jjb.config.js b/jjb.config.js index 04d4428..0cb15c8 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -10,7 +10,7 @@ module.exports = { javaGitBranch: "", // 本地联调 safety-eval-service（context-path: /safety-eval，默认端口 8095） // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095 - API_HOST: process.env.SAFETY_EVAL_API_HOST || "http://127.0.0.1:8095", + API_HOST: "http://192.168.0.124:8095", }, production: { // 应用后端分支名称，部署上线需要 diff --git a/package.json b/package.json index bb21e46..9ebcd3d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@rc-component/motion": "^1.0.0", "@rc-component/util": "^1.11.1", "ahooks": "^3.9.5", - "antd": "^5.11.2", + "antd": "^5.29.2", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "qrcode.react": "^4.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 74f8017..1e668a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,7 +42,7 @@ importers: specifier: ^3.9.5 version: 3.9.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) antd: - specifier: ^5.11.2 + specifier: ^5.29.2 version: 5.29.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) dayjs: specifier: ^1.11.7 @@ -1322,30 +1322,35 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] '@napi-rs/canvas-linux-arm64-musl@0.1.100': resolution: {integrity: sha512-K3mDW66N+xT2/V439u1alFANiBUjdEx2gLiNYnCmUsva5jZMxWTjafBYwTzYK+EMFMHrUoabuU+T1BIP5CgbYQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] '@napi-rs/canvas-linux-riscv64-gnu@0.1.100': resolution: {integrity: sha512-mooqUBTIsccZpnoQC4NgrC1v6C1vof39etLNMnBwCY+p0gajWJvAHLGQ6g/gGyS5YrpDW+GefSN4+Cvcr08UWw==} engines: {node: '>= 10'} cpu: [riscv64] os: [linux] + libc: [glibc] '@napi-rs/canvas-linux-x64-gnu@0.1.100': resolution: {integrity: sha512-1eCvkDCazm7FFhsT7DfGOdSaHgZVK3bt/dSBl5EWHOWmnz+I7j8tPseJqqD81NF+MH21jKUK4wQSDjN0mdhnTg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] '@napi-rs/canvas-linux-x64-musl@0.1.100': resolution: {integrity: sha512-20arT6lnI19S68qNlii73TSEDbECNgzMz2EpldC1V3mZFuRkeujXkcebRk0LRJe9SEUAooYiLokfMViY8IX7yA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] '@napi-rs/canvas-win32-arm64-msvc@0.1.100': resolution: {integrity: sha512-DZFFT1wIAg37LJw37yhMRFfjATd3vTQzjZ1Yki8u2vhO6Hi5VE6BVaGQ1aaDu7xb4iMErz+9EOwjpS7xcxFeBw==} @@ -1413,48 +1418,56 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] '@oxfmt/binding-linux-arm64-musl@0.35.0': resolution: {integrity: sha512-5Okqi+uhYFxwKz8hcnUftNNwdm8BCkf6GSCbcz9xJxYMm87k1E4p7PEmAAbhLTk7cjSdDre6TDL0pDzNX+Y22Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] '@oxfmt/binding-linux-ppc64-gnu@0.35.0': resolution: {integrity: sha512-9k66pbZQXM/lBJWys3Xbc5yhl4JexyfqkEf/tvtq8976VIJnLAAL3M127xHA3ifYSqxdVHfVGTg84eiBHCGcNw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] + libc: [glibc] '@oxfmt/binding-linux-riscv64-gnu@0.35.0': resolution: {integrity: sha512-aUcY9ofKPtjO52idT6t0SAQvEF6ctjzUQa1lLp7GDsRpSBvuTrBQGeq0rYKz3gN8dMIQ7mtMdGD9tT4LhR8jAQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] + libc: [glibc] '@oxfmt/binding-linux-riscv64-musl@0.35.0': resolution: {integrity: sha512-C6yhY5Hvc2sGM+mCPek9ZLe5xRUOC/BvhAt2qIWFAeXMn4il04EYIjl3DsWiJr0xDMTJhvMOmD55xTRPlNp39w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] + libc: [musl] '@oxfmt/binding-linux-s390x-gnu@0.35.0': resolution: {integrity: sha512-RG2hlvOMK4OMZpO3mt8MpxLQ0AAezlFqhn5mI/g5YrVbPFyoCv9a34AAvbSJS501ocOxlFIRcKEuw5hFvddf9g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] + libc: [glibc] '@oxfmt/binding-linux-x64-gnu@0.35.0': resolution: {integrity: sha512-wzmh90Pwvqj9xOKHJjkQYBpydRkaXG77ZvDz+iFDRRQpnqIEqGm5gmim2s6vnZIkDGsvKCuTdtxm0GFmBjM1+w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] '@oxfmt/binding-linux-x64-musl@0.35.0': resolution: {integrity: sha512-+HCqYCJPCUy5I+b2cf+gUVaApfgtoQT3HdnSg/l7NIcLHOhKstlYaGyrFZLmUpQt4WkFbpGKZZayG6zjRU0KFA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] '@oxfmt/binding-openharmony-arm64@0.35.0': resolution: {integrity: sha512-kFYmWfR9YL78XyO5ws+1dsxNvZoD973qfVMNFOS4e9bcHXGF7DvGC2tY5UDFwyMCeB33t3sDIuGONKggnVNSJA==} @@ -1568,21 +1581,25 @@ packages: resolution: {integrity: sha512-C8owWG+yvo7X0oVLIXetkoJhIFBP1LYNcAQqtgLmJnQLQDklGuP83dKC+zISGQWpjawHfZ1ER96vLgoTrxKZdw==} cpu: [arm64] os: [linux] + libc: [glibc] '@rspack/binding-linux-arm64-musl@1.7.12': resolution: {integrity: sha512-i51WWI64aRpsfSki6rN0aepPqXkVfS+vZM7+4bWDcmnhUmdMvhIPcYg0QRk3DtyJnu33jqNLM0WHY78k00NyfA==} cpu: [arm64] os: [linux] + libc: [musl] '@rspack/binding-linux-x64-gnu@1.7.12': resolution: {integrity: sha512-MSos0FuPEefqo9V92ULd5hggKG29EkSNg1zDcypy0OkpsKh5pfjVxTLYFXgTcVyFoUQQbdG8zFBzYbwmJ8V4ew==} cpu: [x64] os: [linux] + libc: [glibc] '@rspack/binding-linux-x64-musl@1.7.12': resolution: {integrity: sha512-JcAMVKXOnjfpC3coWjCFPWD3Yl8RBw6a+IXQQ8mfRlHaHMIiOv8IfZqx15XRxMUn49CtP7Z0Na8iiAg2aKrcfw==} cpu: [x64] os: [linux] + libc: [musl] '@rspack/binding-wasm32-wasi@1.7.12': resolution: {integrity: sha512-n+ZqP6ZMc0nhOgvadg5VhEs9ojtbES80AcWeFnmGkbzIszvGSO63GKNiRkXtjJ9KFuRzytbbmsCqkUVH+Tywxg==} diff --git a/src/components/PersonInChargeInfo/index.js b/src/components/PersonInChargeInfo/index.js index cd84ab4..8411baa 100644 --- a/src/components/PersonInChargeInfo/index.js +++ b/src/components/PersonInChargeInfo/index.js @@ -1,7 +1,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Descriptions, Divider } from "antd"; import { useEffect, useState } from "react"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PreviewImg from "zy-react-library/components/PreviewImg"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetFile from "zy-react-library/hooks/useGetFile"; @@ -49,7 +49,7 @@ function PersonInChargeInfo({ props, certificatePhotoType }) { return (
- +
人员信息
- +
); diff --git a/src/components/PersonInChargeList/index.js b/src/components/PersonInChargeList/index.js index 08386f2..19f4b51 100644 --- a/src/components/PersonInChargeList/index.js +++ b/src/components/PersonInChargeList/index.js @@ -4,7 +4,7 @@ import { Button, Form, message, Modal, Space } from "antd"; import { useEffect, useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; @@ -227,7 +227,7 @@ function List({ props, certificatePhotoType, displayType, personnelType, permiss }, [tableProps.dataSource]); return ( - + )} - + ); } function AddModalComponent(props) { diff --git a/src/components/SpecialCertificateInfo/index.js b/src/components/SpecialCertificateInfo/index.js index c1e52b9..ea1826f 100644 --- a/src/components/SpecialCertificateInfo/index.js +++ b/src/components/SpecialCertificateInfo/index.js @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Descriptions, Divider } from "antd"; import { useEffect, useState } from "react"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PreviewImg from "zy-react-library/components/PreviewImg"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetFile from "zy-react-library/hooks/useGetFile"; @@ -47,7 +47,7 @@ function SpecialCertificateInfo({ props, certificatePhotoType }) { return (
- +
人员信息
- +
); diff --git a/src/components/SpecialCertificateList/index.js b/src/components/SpecialCertificateList/index.js index 2b9832f..3607c0a 100644 --- a/src/components/SpecialCertificateList/index.js +++ b/src/components/SpecialCertificateList/index.js @@ -5,7 +5,7 @@ import { useEffect, useRef, useState } from "react"; import { useLocation } from "react-router-dom"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import Table from "zy-react-library/components/Table"; @@ -256,7 +256,7 @@ function SpecialCertificateList({ props, certificatePhotoType, displayType, pers } }; return ( - + )} - + ); } function AddModalComponent(props) { diff --git a/src/main.js b/src/main.js index 7e88ce6..5f6a7ba 100644 --- a/src/main.js +++ b/src/main.js @@ -32,7 +32,7 @@ if (!window.__POWERED_BY_QIANKUN__) { // 本地开发时注入 Token，使 API 请求可携带认证信息 sessionStorage.setItem( "token", - "jjb-saas-auth:oauth:eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjbGllbnRJZFwiOlwiWlFBUVBKXCIsXCJhY2NvdW50SWRcIjoyMDY5NTk2NDEwNTAzODg4ODk2LFwidXNlclR5cGVFbnVtXCI6XCJQTEFURk9STVwiLFwidXNlcklkXCI6MjA2OTU5NjM5NzkyMDg0OTkyMCxcInRlbmFudElkXCI6MjA2OTU5NjM5NzkyMDg0OTkyMCxcInRlbmFudE5hbWVcIjpcIumHjeW6huWuieWFqOivhOS7t1wiLFwidGVuYW50UGFyZW50SWRzXCI6XCIwLDIwNjk1OTYzOTc5MjA4NDk5MjBcIixcIm5hbWVcIjpcIumHjeW6huWuieWFqOivhOS7t1wiLFwiYWNjZXNzVGlja2V0XCI6XCJ1R2FVSWJvd210dHlJQzdsMWhiWmNQeDFPVHZxb00yZm1mUDVZZ1A5a1BBM3c2cFh0NHVUc29DMGIzaHJcIixcInJlZnJlc2hUaWNrZXRcIjpcIjA0SVVxdVBraGZXd0RkbVpyWkZDc212S3RtellhNVlOQVcxSFlncUlFUHhlQkZod1dqbVZUYzRCWHRBdFwiLFwiZXhwaXJlSW5cIjo2MDQ3OTksXCJyZWZyZXNoRXhwaXJlc0luXCI6NjA0Nzk5LFwib3JnSWRcIjoyMDY5NTk2Mzk3OTIwODQ5OTIwLFwib3JnTmFtZVwiOlwi6YeN5bqG5a6J5YWo6K-E5Lu3XCIsXCJvcmdJZHNcIjpbMjA2OTU5NjM5NzkyMDg0OTkyMF0sXCJyb2xlc1R5cGVzXCI6W1wiVEVOQU5UX0FETUlOXCJdLFwicm9sZUlkc1wiOls1MDAyXSxcInNjb3Blc1wiOltdLFwicnBjVHlwZUVudW1cIjpcIkhUVFBcIixcImJpbmRNb2JpbGVTaWduXCI6XCJGQUxTRVwifSIsImlzcyI6InByby1zZXJ2ZXIiLCJleHAiOjE3ODMwNjc3MjF9.wZFmRnwKlzDWskgfRVG8BnMTyJAA9ssnmGc4BleepGU" + "jjb-saas-auth:oauth:eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjbGllbnRJZFwiOlwiWlFBUVBKXCIsXCJhY2NvdW50SWRcIjoyMDY5Njc0MjM3ODc0MDEyMTYwLFwidXNlclR5cGVFbnVtXCI6XCJQTEFURk9STVwiLFwidXNlcklkXCI6MjA2OTY3NDIzNzE3MzQzNjQxNixcInRlbmFudElkXCI6MjA2OTU5NjM5NzkyMDg0OTkyMCxcInRlbmFudE5hbWVcIjpcIumHjeW6huWuieWFqOivhOS7t1wiLFwidGVuYW50UGFyZW50SWRzXCI6XCIwLDIwNjk1OTYzOTc5MjA4NDk5MjBcIixcIm5hbWVcIjpcInRlc3QwMVwiLFwiYWNjZXNzVGlja2V0XCI6XCJFS0FJVThJT2g4WlE3cjg4UXE5YlkxbENhd2lLOTNBWGhSMGVTN2Z4aFo2SU43QjVOclBncDlnb1pnS0JcIixcInJlZnJlc2hUaWNrZXRcIjpcInJQc2V0ZXR6SjB3aHBSSk8ycDlRb3RPaHJTcFdFY0xkblBkdURxb0JwU0F0VmdENU56QW1XTkVCc09jMFwiLFwiZXhwaXJlSW5cIjo2MDQ4MDAsXCJyZWZyZXNoRXhwaXJlc0luXCI6NjA0ODAwLFwib3JnSWRcIjoyMDY5NTk2Mzk3OTIwODQ5OTIwLFwib3JnTmFtZVwiOlwi6YeN5bqG5a6J5YWo6K-E5Lu3XCIsXCJvcmdJZHNcIjpbMjA2OTU5NjM5NzkyMDg0OTkyMF0sXCJyb2xlc1R5cGVzXCI6W1wiR0xZSlNcIl0sXCJyb2xlSWRzXCI6WzIwNjk2NzEzMDc1OTg4OTMwNThdLFwic2NvcGVzXCI6W10sXCJycGNUeXBlRW51bVwiOlwiSFRUUFwiLFwiYmluZE1vYmlsZVNpZ25cIjpcIkZBTFNFXCJ9IiwiaXNzIjoicHJvLXNlcnZlciIsImV4cCI6MTc4MzMxOTc4OX0.rt-lrdDQlyhDu9S7xUtJ3L3F9k_C8710Ah1dJ-0-A1c" ); } diff --git a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js index 02d1fbd..b86ffa4 100644 --- a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js +++ b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js @@ -2,14 +2,13 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Empty, Form, Input, message, Modal, Row, Col, Select, Space, Tree } from "antd"; import { useEffect, useMemo, useRef, useState } from "react"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; import { NS_ORG_DEPARTMENT, NS_ORG_POSITION, NS_STAFF_INFO } from "~/enumerate/namespace"; import { asId, sameId } from "~/api/enterpriseInfo/idUtil"; import { safeListRequest, safeRequest } from "~/utils"; -import PageHeader from "../components/PageHeader"; function findDeptNode(nodes = [], id) { for (const node of nodes) { @@ -218,8 +217,7 @@ function DepartmentPositionPage(props) { }; return ( - - +
@@ -339,7 +337,7 @@ function DepartmentPositionPage(props) { )} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index f0fd442..7523143 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Input, InputNumber, message, Modal, Row, Col, Select, Space } from "antd"; import { useEffect, useState } from "react"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -11,7 +11,6 @@ import { NS_EQUIP_INFO } from "~/enumerate/namespace"; import { isEquipEnabled } from "~/api/enterpriseInfo/adapter"; import { safeListRequest, safeRequest } from "~/utils"; import { positiveNumberRule } from "~/utils/validators"; -import PageHeader from "../components/PageHeader"; const DUAL_CHANNEL = { 1: "是", 0: "否" }; @@ -64,11 +63,10 @@ function EquipInfoPage(props) { }; return ( - - + +

+ 实现对评价机构内装备信息的维护管理。 +

)} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js index 5a0de35..86ff3ad 100644 --- a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js @@ -1,34 +1,69 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, message, Space } from "antd"; +import { + Button, + Col, + DatePicker, + Form, + Input, + InputNumber, + message, + Row, + Select, + Space, + Upload, +} from "antd"; +import dayjs from "dayjs"; import { useEffect, useState } from "react"; -import FormBuilder from "zy-react-library/components/FormBuilder"; -import Page from "zy-react-library/components/Page"; -import { getOrgInfoDetail } from "~/api/enterpriseInfo/orgBootstrap"; -import PageHeader from "../components/PageHeader"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; + +import { + CHONGQING_DISTRICTS, + ENTERPRISE_SCALE_OPTIONS, + ENTERPRISE_STATUS_OPTIONS, + FILING_RECORD_STATUS_OPTIONS, + FILING_TYPE_OPTIONS, +} from "~/enumerate/enterpriseOptions"; import { NS_ORG_INFO } from "~/enumerate/namespace"; import { mockUploadFileList } from "~/utils/mockUpload"; -import { buildOrgInfoFormOptions } from "./formOptions"; +import { + creditCodeRule, + latitudeRule, + longitudeRule, + nonNegativeIntegerRule, + phoneRule, + positiveNumberRule, + urlRule, +} from "~/utils/validators"; function OrgInfoPage(props) { const [form] = Form.useForm(); + const { orgInfoLoading } = props.orgInfo; const [editing, setEditing] = useState(true); const [submitting, setSubmitting] = useState(false); const [detail, setDetail] = useState({}); /** 是否已存在机构数据（有 id 视为已入库，只能修改） */ const [hasExistingData, setHasExistingData] = useState(false); - const formOptions = buildOrgInfoFormOptions(); + const selectDistrictOptions = CHONGQING_DISTRICTS.map((v) => ({ + label: v, + value: v, + })); const loadDetail = async () => { try { - const res = getOrgInfoDetail(); + const res = await props.orgInfoGet(); if (res?.data?.id) { setDetail(res.data); - form.setFieldsValue(res.data); + form.setFieldsValue({ + ...res.data, + productionDate: res.data.productionDate + ? dayjs(res.data.productionDate) + : undefined, + + }); setHasExistingData(true); setEditing(false); - } - else { + } else { setDetail({}); setHasExistingData(false); setEditing(true); @@ -38,8 +73,7 @@ function OrgInfoPage(props) { attachments: mockUploadFileList("资质申请书.pdf"), }); } - } - catch (err) { + } catch (err) { console.warn("[OrgInfo] loadDetail failed:", err); setDetail({}); setHasExistingData(false); @@ -53,17 +87,27 @@ function OrgInfoPage(props) { const handleCancelEdit = () => { if (hasExistingData) { - form.setFieldsValue(detail); + form.setFieldsValue({ + ...detail, + productionDate: detail.productionDate + ? dayjs(detail.productionDate) + : undefined, + }); setEditing(false); - } - else { + } else { form.resetFields(); } }; const handleSave = async (submitType) => { try { - const values = await form.validateFields(); + const formValues = await form.validateFields(); + const values = { + ...formValues, + productionDate: formValues.productionDate + ? dayjs(formValues.productionDate).format("YYYY-MM-DD") + : undefined, + }; setSubmitting(true); let request; @@ -71,10 +115,10 @@ function OrgInfoPage(props) { // 已有数据：仅走修改接口 request = props.orgInfoSave; values.id = detail.id; - } - else { + } else { // 无数据：暂存、提交均走保存接口（草稿/已提交由 authStatusCode 区分） - request = submitType === "draft" ? props.orgInfoDraft : props.orgInfoSave; + request = + submitType === "draft" ? props.orgInfoDraft : props.orgInfoSave; } const res = await request(values); @@ -82,61 +126,330 @@ function OrgInfoPage(props) { message.success( hasExistingData ? "修改成功" - : (submitType === "draft" ? "暂存成功" : "提交成功"), + : submitType === "draft" + ? "暂存成功" + : "提交成功", ); setEditing(false); loadDetail(); } - } - catch (err) { + } catch (err) { if (err?.errorFields) { return; } - message.error(hasExistingData ? "修改失败，请稍后重试" : "保存失败，请稍后重试"); - } - finally { + message.error( + hasExistingData ? "修改失败，请稍后重试" : "保存失败，请稍后重试", + ); + } finally { setSubmitting(false); } }; + const subTitleText = + "新成立或首次使用系统的安全评价机构，可通过系统提供的引导页面，详细填写机构的基本信息。"; + return ( - - setEditing(true)}> + setEditing(true)}> 修改 - )} - /> - + ) + } + > +

+ {subTitleText} +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{editing && (
- + {!hasExistingData && ( )} -
)} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js index 6bd32a3..4048a40 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js @@ -1,14 +1,14 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Input, message, Modal, Select, Space, Typography } from "antd"; import { useEffect, useState } from "react"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; import { NS_STAFF_CHANGE_LOG, NS_STAFF_INFO } from "~/enumerate/namespace"; import { safeListRequest, safeRequest } from "~/utils"; import { CHANGE_COUNT_STYLE, formSelectField, getChangeCount, getEmploymentStatusLabel, getResignAuditStatusLabel } from "~/utils/enterpriseForm"; -import PageHeader from "../components/PageHeader"; + const EMPLOYMENT_STATUS = { 1: "在职", 2: "离职" }; const RESIGN_AUDIT_STATUS = { 0: "未审核", 1: "已审核", 2: "已退回" }; @@ -119,8 +119,7 @@ function PersonnelChangePage(props) { if (viewMode === "log") { return ( - - +
人员： @@ -134,16 +133,15 @@ function PersonnelChangePage(props) { ]} {...logTableProps} /> - + ); } return ( - - + +

+ 机构管理员在人员信息管理页面进行相应的修改操作 +

{resignInfo.remark} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js index 60d4ea4..6348889 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js @@ -3,7 +3,7 @@ import { Button, Descriptions, Form, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PreviewImg from "zy-react-library/components/PreviewImg"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -16,7 +16,7 @@ import { NS_STAFF_CERTIFICATE } from "~/enumerate/namespace"; import { safeGetFiles, safeListRequest, safeRequest } from "~/utils"; import { mockUploadFileList, resolveUploadFileId } from "~/utils/mockUpload"; import { dateRangeRule } from "~/utils/validators"; -import PageHeader from "../../components/PageHeader"; + function StaffCertificatePage(props) { const query = useGetUrlQuery(); @@ -62,8 +62,7 @@ function StaffCertificatePage(props) { }; return ( - - + )} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js index 8de3f12..32be308 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, DatePicker, Form, Input, message, Modal, Row, Col, Select, Space } from "antd"; import { useEffect, useRef, useState } from "react"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import Upload from "zy-react-library/components/Upload"; @@ -22,7 +22,6 @@ import { getBirthDateFromIdCard, safeListRequest, safeRequest } from "~/utils"; import { toDayjs } from "~/utils/dateFormat"; import { formSelectField } from "~/utils/enterpriseForm"; import { idCardRule, mobileRule } from "~/utils/validators"; -import PageHeader from "../../components/PageHeader"; import StaffViewModal from "../StaffViewModal"; function mapPositionOptions(list = []) { @@ -111,11 +110,10 @@ function PersonnelInfoPage(props) { }; return ( - - + +

+ 机构管理员在系统中为本机构的人员进行信息录入，包括姓名、性别、身份证号、出生日期等。 +

)} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js index 0fd99ea..439fa02 100644 --- a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js +++ b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js @@ -3,7 +3,7 @@ import { Button, Descriptions, Form, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PreviewImg from "zy-react-library/components/PreviewImg"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -20,7 +20,6 @@ import { safeGetFiles, safeListRequest, safeRequest } from "~/utils"; import { toDayjs } from "~/utils/dateFormat"; import { mockUploadFileList, resolveUploadFileId } from "~/utils/mockUpload"; import { dateRangeRule } from "~/utils/validators"; -import PageHeader from "../components/PageHeader"; function QualificationCertPage(props) { const [addModalOpen, setAddModalOpen] = useState(false); @@ -91,11 +90,10 @@ function QualificationCertPage(props) { }; return ( - - + +

+ 机构需将自身拥有的安全评价资质证书信息录入系统，包括资质等级、发证机关、发证日期、有效期等。 +

)} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js index 9ede9bc..791d396 100644 --- a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js +++ b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, DatePicker, Descriptions, Form, Input, message, Modal, Select } from "antd"; import { useEffect, useState } from "react"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import Upload from "zy-react-library/components/Upload"; @@ -12,7 +12,7 @@ import { NS_STAFF_INFO, NS_STAFF_RESIGNATION_APPLY } from "~/enumerate/namespace import { safeListRequest, safeRequest } from "~/utils"; import { formSelectField, getResignAuditStatusLabel } from "~/utils/enterpriseForm"; import { DEFAULT_UPLOAD_FILE_URL, mockUploadFileList, resolveUploadFileId } from "~/utils/mockUpload"; -import PageHeader from "../components/PageHeader"; + const RESIGN_AUDIT_STATUS = { 0: "未审核", 1: "已审核", 2: "已退回" }; @@ -49,11 +49,10 @@ function ResignationApplyPage(props) { }, []); return ( - - + +

+ 机构管理员在人员信息管理页面进行相应的修改操作 +

)} - + ); } diff --git a/src/pages/Container/EnterpriseInfo/components/PageHeader.js b/src/pages/Container/EnterpriseInfo/components/PageHeader.js deleted file mode 100644 index a48f53a..0000000 --- a/src/pages/Container/EnterpriseInfo/components/PageHeader.js +++ /dev/null @@ -1,13 +0,0 @@ -export default function PageHeader({ title, subTitle, extra }) { - return ( -
-
-

{title}

- {subTitle && ( -

{subTitle}

- )} -
- {extra} -
- ); -} diff --git a/src/pages/Container/EnterpriseInfo/index.js b/src/pages/Container/EnterpriseInfo/index.js index 095faf7..bba755b 100644 --- a/src/pages/Container/EnterpriseInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/index.js @@ -51,7 +51,7 @@ function EnterpriseInfo(props) { } return ( -
+
{props.children}
); diff --git a/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js b/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js index 4ef22ea..5fc8cc9 100644 --- a/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js +++ b/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js @@ -1,6 +1,6 @@ import { Button, Card, Col, Descriptions, Form, Modal, Row, Statistic, Tag } from "antd"; import { useEffect, useState } from "react"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -11,7 +11,6 @@ import { getEnterprisePortraitDetail, queryEnterprisePortraitPage, } from "~/mock/regulator/basicInfo"; -import PageHeader from "../../../EnterpriseInfo/components/PageHeader"; const INFO_LEVEL_COLOR = { level1: "success", @@ -51,11 +50,10 @@ function EnterprisePortraitPage() { }; return ( - - + +

+ 监管端查看企业安全能力画像与综合评级（当前为 Mock 数据）。 +

)} - + ); } diff --git a/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js b/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js index 233527f..3a3529b 100644 --- a/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js +++ b/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js @@ -1,12 +1,11 @@ import { Button, Descriptions, Form, Modal, Table, Tag, Tooltip } from "antd"; import { useEffect, useState } from "react"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import TableList from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; import { getEvaluatorDetail, queryEvaluatorPage } from "~/mock/regulator/basicInfo"; -import PageHeader from "../../../EnterpriseInfo/components/PageHeader"; const YES_NO_OPTIONS = [ { label: "是", value: 1 }, @@ -52,11 +51,10 @@ function EvaluatorInfoPage() { }; return ( - - + +

+ 监管端查看辖区内评价师备案及资质状态（当前为 Mock 数据）。 +

)} - + ); } diff --git a/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js b/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js index d082274..7fce848 100644 --- a/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js +++ b/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js @@ -3,7 +3,7 @@ import { } from "antd"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { useEffect, useState } from "react"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -18,7 +18,6 @@ import { import { NS_ORG_INFO } from "~/enumerate/namespace"; import { safeListRequest, safeRequest } from "~/utils"; import { formSelectField } from "~/utils/enterpriseForm"; -import PageHeader from "../../../EnterpriseInfo/components/PageHeader"; const SEARCH_COL = { xs: 24, sm: 12, md: 8, lg: 6 }; const SEARCH_DEFAULT_VALUES = { state: "" }; @@ -164,11 +163,10 @@ function OrgAccountPage(props) { }; return ( - - + +

+ 监管端维护评价机构开户账号。 +

- + ); } diff --git a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js index 9a8a65b..d0fd166 100644 --- a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js +++ b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/Detail/index.js @@ -1,7 +1,7 @@ import { Button, Card, Form, Spin, Table, Tabs, Tag, message } from "antd"; import { useEffect, useMemo, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import FilePreviewModal from "~/components/FilePreviewModal"; import { fetchRegisteredOrgDetail, @@ -12,7 +12,6 @@ import { fetchRegisteredOrgQualificationGroups, } from "~/api/regulatorOrgInfo"; import { buildOrgInfoFormOptions } from "../../../../EnterpriseInfo/OrgInfo/formOptions"; -import PageHeader from "../../../../EnterpriseInfo/components/PageHeader"; import StaffViewModal from "../../../../EnterpriseInfo/PersonnelInfo/StaffViewModal"; const LIST_PATH = "/container/supervision/basicInfo/registeredOrg/list"; @@ -192,9 +191,11 @@ function RegisteredOrgDetailPage(props) { if (!id) { return ( - - 返回} /> - + 返回}> +

+ 缺少机构 ID 参数 +

+ ); } @@ -241,12 +242,10 @@ function RegisteredOrgDetailPage(props) { ]; return ( - - ← 返回} - /> + ← 返回}> +

+ {orgName || undefined} +

setViewPersonnelId("")} /> )} - + ); } diff --git a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js index 6c67039..cac3057 100644 --- a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js +++ b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js @@ -1,7 +1,7 @@ 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 PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import TableList from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; @@ -12,7 +12,6 @@ import { 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", @@ -46,11 +45,10 @@ function RegisteredOrgListPage(props) { }; return ( - - + +

+ 监管端查看已备案评价机构及备案详情。 +

- + ); } diff --git a/src/pages/Container/Supervision/EnterpriseLicense/BranchStatistics/List/index.js b/src/pages/Container/Supervision/EnterpriseLicense/BranchStatistics/List/index.js index a8f8ed7..f3da700 100644 --- a/src/pages/Container/Supervision/EnterpriseLicense/BranchStatistics/List/index.js +++ b/src/pages/Container/Supervision/EnterpriseLicense/BranchStatistics/List/index.js @@ -1,7 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -21,7 +21,7 @@ function List(props) { }); return ( - + - + ); } export default Connect([NS_CORP_CERTIFICATE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/EnterpriseLicense/EnterpriseLicense/index.js b/src/pages/Container/Supervision/EnterpriseLicense/EnterpriseLicense/index.js index 16eb423..e2840d3 100644 --- a/src/pages/Container/Supervision/EnterpriseLicense/EnterpriseLicense/index.js +++ b/src/pages/Container/Supervision/EnterpriseLicense/EnterpriseLicense/index.js @@ -4,7 +4,7 @@ import { Button, Descriptions, Form, message, Modal, Space } from "antd"; import { useEffect, useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PreviewImg from "zy-react-library/components/PreviewImg"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -159,7 +159,7 @@ function EnterpriseLicense(props) { }; }, [tableProps.dataSource]); return ( - + )} - + ); } function AddModalComponent(props) { diff --git a/src/pages/Container/Supervision/EnterpriseLicense/StakeholderStatistics/List/index.js b/src/pages/Container/Supervision/EnterpriseLicense/StakeholderStatistics/List/index.js index 0645648..2d8d999 100644 --- a/src/pages/Container/Supervision/EnterpriseLicense/StakeholderStatistics/List/index.js +++ b/src/pages/Container/Supervision/EnterpriseLicense/StakeholderStatistics/List/index.js @@ -1,7 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -22,7 +22,7 @@ function List(props) { }); return ( - + - + ); } export default Connect([NS_CORP_CERTIFICATE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/List/index.js index 3613729..682c3e4 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/List/index.js @@ -1,7 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -21,7 +21,7 @@ function List(props) { }); return ( - + - + ); } export default Connect([NS_USER_CERTIFICATE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/PersonInCharge/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/PersonInCharge/List/index.js index 7f0cb4e..60c0ec3 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/PersonInCharge/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/PersonInCharge/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PersonInChargeList from "~/components/PersonInChargeList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业主要负责人管理 function List(props) { return ( - +
- + ); } diff --git a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SecurityAdmini/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SecurityAdmini/List/index.js index 4441006..7599023 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SecurityAdmini/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SecurityAdmini/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PersonInChargeList from "~/components/PersonInChargeList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业安全生产管理人员管理 function List(props) { return ( - + - + ); } diff --git a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialDevice/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialDevice/List/index.js index 312b52d..f2e8176 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialDevice/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialDevice/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SpecialCertificateList from "~/components/SpecialCertificateList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业特种设备操作人员管理 function List(props) { return ( - + - + ); } diff --git a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialPersonnel/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialPersonnel/List/index.js index b763e7f..19217b6 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialPersonnel/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/BranchCompanyStat/SpecialPersonnel/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SpecialCertificateList from "~/components/SpecialCertificateList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业特种作业人员管理 function List(props) { return ( - + - + ); } diff --git a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/List/index.js index e9195fa..1e372f2 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/List/index.js @@ -1,7 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; @@ -21,7 +21,7 @@ function List(props) { }); return ( - + - + ); } export default Connect([NS_USER_CERTIFICATE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/PersonInCharge/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/PersonInCharge/List/index.js index 0cf8c90..059a93c 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/PersonInCharge/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/PersonInCharge/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PersonInChargeList from "~/components/PersonInChargeList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业主要负责人管理 function List(props) { return ( - + - + ); } diff --git a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SecurityAdmini/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SecurityAdmini/List/index.js index 758d28c..c297253 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SecurityAdmini/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SecurityAdmini/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import PersonInChargeList from "~/components/PersonInChargeList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业安全生产管理人员管理 function List(props) { return ( - + - + ); } diff --git a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialDevice/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialDevice/List/index.js index dc4c25a..908d30d 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialDevice/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialDevice/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SpecialCertificateList from "~/components/SpecialCertificateList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业特种设备操作人员管理 function List(props) { return ( - + - + ); } diff --git a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialPersonnel/List/index.js b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialPersonnel/List/index.js index 6b47c47..d7543c5 100644 --- a/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialPersonnel/List/index.js +++ b/src/pages/Container/Supervision/PersonnelLicense/StakeholderStat/SpecialPersonnel/List/index.js @@ -1,12 +1,12 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import Page from "zy-react-library/components/Page"; +import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import SpecialCertificateList from "~/components/SpecialCertificateList"; import { NS_USER_CERTIFICATE } from "~/enumerate/namespace"; // 企业特种作业人员管理 function List(props) { return ( - + - + ); }