From b91899d3eaaeb755928cbf92c0c88cdac89d9581 Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Thu, 8 Jan 2026 17:36:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=89=A9=E8=B5=84?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=80=89=E9=A1=B9=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD=E5=BC=B9=E7=AA=97=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/api/enterprise/index.js | 2 +- src/components/OrgChartModal/index.js | 2 +- src/pages/Container/BusinessLicense/index.js | 1 + .../Enterprise/CorpInfo/Info/index.js | 1 + .../Enterprise/CorpInfo/Update/index.js | 2 +- .../ChangeList/index.js | 4 ++ .../EnterpriseMiddleground/List/index.js | 1 + .../Enterprise/OrganizationStructure/index.js | 1 + src/pages/Container/Enterprise/Post/index.js | 1 + .../AccountManage/List/index.js | 5 +- .../AccountManage/View/index.js | 2 + .../StakeholderUnit/User/UserList/index.js | 2 + .../Container/Enterprise/User/Add/index.js | 2 +- .../Container/Enterprise/User/List/index.js | 2 + .../Container/PersonnelCertificate/index.js | 1 + .../CorpInfo/components/Qualification.js | 2 + .../Container/Stakeholder/CorpInfo/index.js | 3 +- .../Container/Stakeholder/Department/index.js | 1 + .../Container/Stakeholder/User/Add/index.js | 2 +- .../Container/Stakeholder/User/List/index.js | 10 ++- .../User/ResignationReview/index.js | 6 -- .../User/SecurityPersonnel/index.js | 1 + .../User/SpecialPersonnel/index.js | 1 + .../BranchCompany/AccountManage/List/index.js | 63 ++++++++++++------- .../BranchCompany/AccountManage/View/index.js | 4 ++ .../DepartmentManage/List/index.js | 4 ++ .../DepartmentManage/View/index.js | 1 + .../EnterpriseInfo/List/index.js | 1 - .../EnterpriseInfo/View/index.js | 1 + .../SubsidiaryUser/UserList/index.js | 2 + .../ChangeList/index.js | 4 ++ .../EnterpriseMiddleground/List/index.js | 4 ++ .../EnterpriseMiddleground/UserList/index.js | 1 + .../AccountManage/List/index.js | 9 ++- .../AccountManage/View/index.js | 3 + .../CertificateList/index.js | 1 + .../SpecialPersonnel/CertificateList/index.js | 1 + .../StakeholderUnit/User/UserList/index.js | 14 +++-- .../Supervision/CorpInfo/Update/index.js | 2 +- .../Supervision/Department/index.js | 2 + .../Supervision/Supervision/User/Add/index.js | 2 +- .../Supervision/User/List/index.js | 3 +- 43 files changed, 130 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index fd4abbd..89ca309 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "relation-graph": "^2.2.11", - "zy-react-library": "^1.1.10" + "zy-react-library": "^1.1.24" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/api/enterprise/index.js b/src/api/enterprise/index.js index dc9ba65..427d845 100644 --- a/src/api/enterprise/index.js +++ b/src/api/enterprise/index.js @@ -2,7 +2,7 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; export const corpInfoList = declareRequest( "enterpriseLoading", - "Post > @/basicInfo/corpInfo/list", + "Post > @/basicInfo/corpInfo/basicList", ); export const corpInfoDetails = declareRequest( "enterpriseLoading", diff --git a/src/components/OrgChartModal/index.js b/src/components/OrgChartModal/index.js index 9adcda7..573c705 100644 --- a/src/components/OrgChartModal/index.js +++ b/src/components/OrgChartModal/index.js @@ -3,7 +3,7 @@ import RelationGraph from "relation-graph/react"; import { MySwitch } from "./RGDemoComponents/MyUIComponents"; const ExpandAnimation = (departmentData) => { - console.log(departmentData); + const graphRef = useRef(null); const [relayout, setRelayout] = useState(true); diff --git a/src/pages/Container/BusinessLicense/index.js b/src/pages/Container/BusinessLicense/index.js index 3a14edc..8631e90 100644 --- a/src/pages/Container/BusinessLicense/index.js +++ b/src/pages/Container/BusinessLicense/index.js @@ -181,6 +181,7 @@ function AddModalComponent(props) { }; return ( { return ( { return ( ( - {" "} - { - props.permission("zgszhgl-edit") - && ( - - ) - } + {/* { */} + {/* props.permission("zgszhgl-edit") */} + {/* && ( */} + + {/* */} + {/* ) */} + {/* } */} { props.permission("zgszhgl-editName") && ( @@ -373,19 +374,32 @@ function AddModalComponent(props) { const onSubmit = async (values) => { if (props.openType === "editName") { values.id = props.currentId; - await props.requestChangeCompanyName(values); + await props.requestChangeCompanyName(values).then((res) => { + if (res.success) { + message.success("修改成功"); + onCancel(); + props.getData(); + } + }); } + if (props.openType === "edit") { values.id = props.currentId; - await props.requestEdit(values).then(() => { - onCancel(); - props.getData(); + await props.requestEdit(values).then((res) => { + if (res.success) { + message.success("编辑成功"); + onCancel(); + props.getData(); + } }); } if (props.openType === "add") { - await props.requestAdd(values).then(() => { - onCancel(); - props.getData(); + await props.requestAdd(values).then((res) => { + if (res.success) { + message.success("新增成功"); + onCancel(); + props.getData(); + } }); } }; @@ -452,6 +466,7 @@ function AddModalComponent(props) { }; return ( diff --git a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js index 0ecf733..2090eec 100644 --- a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js +++ b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js @@ -299,6 +299,7 @@ function View(props) { {isModalOpen && ( { setAddModalOpen(false); setCurrentId(""); @@ -405,11 +406,14 @@ function AddModalComponent(props) { }; return ( { return ( ( + record.flowFlag === 1 ? "流动人员" : record.flowFlag === 0 ? "非流动人员" : "" + ), }, { @@ -243,6 +247,7 @@ function AddModalComponent(props) { return ( <> (
{ - getLabelName({ status: String(record.employmentFlag), list: employmentFlagData, @@ -442,6 +441,7 @@ function AddModalComponent(props) { <>