diff --git a/package.json b/package.json index 65747e3..daab48b 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.0.141" + "zy-react-library": "^1.0.152" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/api/department/index.js b/src/api/department/index.js index e0fe728..721c4ca 100644 --- a/src/api/department/index.js +++ b/src/api/department/index.js @@ -27,7 +27,7 @@ export const userGetInfo = declareRequest( ); export const corpDepartlist = declareRequest( "departmentLoading", - "Post > @/basic-info/corpInfo/corpDepartlist", + "Post > @/basicInfo/corpInfo/corpDepartlist", ); diff --git a/src/components/OrgChartModal/index.js b/src/components/OrgChartModal/index.js index 67a941f..5a13808 100644 --- a/src/components/OrgChartModal/index.js +++ b/src/components/OrgChartModal/index.js @@ -9,9 +9,9 @@ const ExpandAnimation = (departmentData) => { const graphOptions = { layout: { layoutName: "tree", - min_per_width: 80, - max_per_width: 150, - min_per_height: 200, + min_per_width: 150, + max_per_width: 200, + min_per_height: 230, }, defaultNodeShape: 1, defaultNodeWidth: 130, diff --git a/src/pages/Container/Enterprise/CorpInfo/Info/index.js b/src/pages/Container/Enterprise/CorpInfo/Info/index.js index 014ace8..1ca6a44 100644 --- a/src/pages/Container/Enterprise/CorpInfo/Info/index.js +++ b/src/pages/Container/Enterprise/CorpInfo/Info/index.js @@ -131,26 +131,26 @@ function Info(props) { children: info.lrName, }, { - label: "法人手机号", + label: "法定代表人手机号", children: (
- {info.lrMobile && info.lrMobile.label} - { (info.lrMobile && info.lrMobile.label) - && ( - - )} + {info.lrMobile } + {/* { (info.lrMobile && info.lrMobile.label) */} + {/* && ( */} + {/* */} + {/* )} */}
), @@ -164,22 +164,22 @@ function Info(props) { children: (
- { info.contactsPhone && info.contactsPhone.label} - { (info.contactsPhone && info.contactsPhone.label) - && ( - - )} + { info.contactsPhone } + {/* { (info.contactsPhone && info.contactsPhone.label) */} + {/* && ( */} + {/* */} + {/* )} */}
), @@ -193,23 +193,23 @@ function Info(props) { label: "安全负责人手机号", children: (
- - {info.safetyPhone && info.safetyPhone.label} - { (info.safetyPhone && info.safetyPhone.label) - && ( - - )} + {info.lrMobile && info.lrMobile.label} + {info.safetyPhone } + {/* { (info.safetyPhone && info.safetyPhone.label) */} + {/* && ( */} + {/* */} + {/* )} */}
), @@ -329,7 +329,7 @@ function Info(props) { {viewData}