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}
{viewData}
diff --git a/src/pages/Container/Enterprise/CorpInfo/Update/index.js b/src/pages/Container/Enterprise/CorpInfo/Update/index.js
index dffa731..8a49700 100644
--- a/src/pages/Container/Enterprise/CorpInfo/Update/index.js
+++ b/src/pages/Container/Enterprise/CorpInfo/Update/index.js
@@ -83,9 +83,9 @@ function Update(props) {
const { data } = await props["corpInfoDetails"]({
id: queryParams["id"],
});
- data.lrMobile = data.lrMobile && data.lrMobile.label;
- data.contactsPhone = data.contactsPhone && data.contactsPhone.label;
- data.safetyPhone = data.safetyPhone && data.safetyPhone.label;
+ // data.lrMobile = data.lrMobile && data.lrMobile.label;
+ // data.contactsPhone = data.contactsPhone && data.contactsPhone.label;
+ // data.safetyPhone = data.safetyPhone && data.safetyPhone.label;
setKeyId(data.corpinfoId);
data.region = data.village || data.street || data.country || data.city || data.province;
const licenseFile = await getFile({
@@ -120,7 +120,7 @@ function Update(props) {
fetchData();
}, []);
- // 校验社会统一信用代码重复
+ // 校验统一社会信用代码重复
useEffect(() => {
if (!debouncedCode) {
form.setFields([
@@ -139,7 +139,7 @@ function Update(props) {
form.setFields([
{
name: "code",
- errors: ["该社会统一信用代码已被其他企业使用"],
+ errors: ["该统一社会信用代码已被其他企业使用"],
},
]);
}
@@ -303,7 +303,7 @@ function Update(props) {
},
},
{
- label: "社会统一信用代码",
+ label: "统一社会信用代码",
name: "code",
required: false,
componentProps: {
@@ -313,7 +313,7 @@ function Update(props) {
rules: [
{
pattern: UNIFIED_SOCIAL_CREDIT_CODE,
- message: "请输入正确的社会统一信用代码",
+ message: "请输入正确的统一社会信用代码",
},
],
@@ -412,7 +412,6 @@ function Update(props) {
render: (
{
- console.log(data);
setIndustryData(data);
}}
/>
@@ -424,7 +423,7 @@ function Update(props) {
required: false,
},
{
- label: "法人手机号",
+ label: "法定代表人手机号",
name: "lrMobile",
required: false,
rules: [
diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js
index 5986464..ba0ee3a 100644
--- a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js
+++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js
@@ -26,6 +26,7 @@ function List(props) {
transform: (formData) => {
return {
...formData,
+ usePermission: false,
};
},
});
diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js
index 9652ba5..8035f68 100644
--- a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js
+++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js
@@ -13,8 +13,10 @@ function ChangeView(props) {
useEffect(() => {
props["getChangerRecordInfoById"]({ corpinfoId: queryParams["corpinfoId"], userId: queryParams["id"] }).then((res) => {
- console.log(res);
- setInfo(res.data);
+ if(res.data){
+ setInfo(res.data);
+ }
+
});
}, []);
diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js
index b401f8c..dc59027 100644
--- a/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js
+++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js
@@ -39,7 +39,6 @@ function List(props) {
});
const onTreeChange = (selectedKeys) => {
const key = selectedKeys[0] || null;
- console.log(selectedKeys);
setSelectedNodeId(key);
getData();
};
@@ -125,6 +124,7 @@ function List(props) {