diff --git a/src/components/XgfUserInfo/index.js b/src/components/XgfUserInfo/index.js
index 545cf63..da03612 100644
--- a/src/components/XgfUserInfo/index.js
+++ b/src/components/XgfUserInfo/index.js
@@ -56,6 +56,7 @@ function XgfUserInfo(props) {
});
res.data.userImg = userImg;
res.data.cardImg = cardImg;
+
res.data.socSecurity = socSecurity;
res.data.empInsurance = empInsurance;
res.data.insurance = insurance;
@@ -216,37 +217,33 @@ function XgfUserInfo(props) {
},
]}
column={2}
- labelStyle={{
- width: 200,
- }}
- contentStyle={{
- width: "300px",
- }}
+ styles={{ label: { width: 200 }, content: { width: 500 } }}
/>
社保信息
diff --git a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
index b3bb9d9..e19ef10 100644
--- a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
+++ b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
@@ -217,6 +217,22 @@ function View(props) {
// children: info.totalAssets,
// },
+
+ {
+ label: "相关方类型",
+ children: getLabelName({
+ status: info.type,
+ list: ENTERPRISE_TYPE,
+ }),
+ },
+ {
+ label: "创建单位",
+ children: info.tenantName,
+ },
+ {
+ label: "经营范围",
+ children: info.natureBusiness,
+ },
{
label: "企业二维码",
children: (
@@ -230,17 +246,6 @@ function View(props) {
),
},
- {
- label: "相关方类型",
- children: getLabelName({
- status: info.type,
- list: ENTERPRISE_TYPE,
- }),
- },
- {
- label: "创建单位",
- children: info.tenantName,
- },
// {
// label: "选取形式",
// children: info.selectfromList,
diff --git a/src/pages/Container/Stakeholder/CorpInfo/index.js b/src/pages/Container/Stakeholder/CorpInfo/index.js
index 3f63d1a..ea3f4c7 100644
--- a/src/pages/Container/Stakeholder/CorpInfo/index.js
+++ b/src/pages/Container/Stakeholder/CorpInfo/index.js
@@ -16,7 +16,6 @@ import {
PHONE,
UNIFIED_SOCIAL_CREDIT_CODE,
} from "zy-react-library/regular";
-import { getLabelName } from "zy-react-library/utils";
import { NS_ENTERPRISE } from "~/enumerate/namespace";
import { useDebounce } from "~/utils";
@@ -35,33 +34,34 @@ const REQUIRED_FIELDS = [
"employees",
"depositBank",
"depositBankAccount",
+ "natureBusiness",
// "regcapital",
// "totalAssets",
// "licenseStart",
// "licenseEnd",
];
-const ENTERPRISE_STATUS = [
- {
- bianma: "filialstate01",
- name: "在产",
- },
- {
- bianma: "filialstate02",
- name: "在建",
- },
- {
- bianma: "filialstate03",
- name: "代建",
- },
- {
- bianma: "filialstate04",
- name: "停产",
- },
- {
- bianma: "filialstate05",
- name: "破产",
- },
-];
+// const ENTERPRISE_STATUS = [
+// {
+// bianma: "filialstate01",
+// name: "在产",
+// },
+// {
+// bianma: "filialstate02",
+// name: "在建",
+// },
+// {
+// bianma: "filialstate03",
+// name: "代建",
+// },
+// {
+// bianma: "filialstate04",
+// name: "停产",
+// },
+// {
+// bianma: "filialstate05",
+// name: "破产",
+// },
+// ];
// const WHETHER_ENUM = [
// {
// bianma: 1,
@@ -89,10 +89,10 @@ function CorpInfo(props) {
const [canShowQrCode, setCanShowQrCode] = useState(false);
const [keyId, setKeyId] = useState({});
- const [scaleData, setScaleData] = useState([]);
- const [ecoTypeData, setEcoTypeData] = useState([]);
- const [industryData, setIndustryData] = useState([]);
- const [cityData, setCityData] = useState([]);
+ // const [scaleData, setScaleData] = useState([]);
+ // const [ecoTypeData, setEcoTypeData] = useState([]);
+ // const [industryData, setIndustryData] = useState([]);
+ // const [cityData, setCityData] = useState([]);
const [info, setInfoData] = useState([]);
const [codeValue, setCodeValue] = useState("");
const [corpNameValue, setCorpNameValue] = useState("");
@@ -167,46 +167,46 @@ function CorpInfo(props) {
single: false,
files: deleteHiddenImageFiles,
});
- values.ecoTypeName = getLabelName({
- status: values.ecoType,
- list: ecoTypeData,
- idKey: "dictValue",
- nameKey: "dictLabel",
- });
- values.scaleName = getLabelName({
- status: values.scale,
- list: scaleData,
- idKey: "dictValue",
- nameKey: "dictLabel",
- });
- values.corpStateName = getLabelName({
- status: values.corpState,
- list: ENTERPRISE_STATUS,
+ // values.ecoTypeName = getLabelName({
+ // status: values.ecoType,
+ // list: ecoTypeData,
+ // idKey: "dictValue",
+ // nameKey: "dictLabel",
+ // });
+ // values.scaleName = getLabelName({
+ // status: values.scale,
+ // list: scaleData,
+ // idKey: "dictValue",
+ // nameKey: "dictLabel",
+ // });
+ // values.corpStateName = getLabelName({
+ // status: values.corpState,
+ // list: ENTERPRISE_STATUS,
+ //
+ // });
- });
-
- if (cityData.length > 0) {
- values.province = cityData[0].value;
- values.provinceName = cityData[0].label;
- values.city = cityData[1] && cityData[1].value;
- values.cityName = cityData[1] && cityData[1].label;
- values.country = cityData[2] && cityData[2].value;
- values.countryName = cityData[2] && cityData[2].label;
- values.street = cityData[3] && cityData[3].value;
- values.streetName = cityData[3] && cityData[3].label;
- values.village = cityData[4] && cityData[4].value;
- values.villageName = cityData[4] && cityData[4].label;
- }
- if (industryData.length > 0) {
- values.corpType = industryData[0].dict_value;
- values.corpTypeName = industryData[0].dict_label;
- values.corpType2 = industryData[1] && industryData[1].dict_value;
- values.corpType2Name = industryData[1] && industryData[1].dict_label;
- values.corpType3 = industryData[2] && industryData[2].dict_value;
- values.corpType3Name = industryData[2] && industryData[2].dict_label;
- values.corpType4 = industryData[3] && industryData[3].dict_value;
- values.corpType4Name = industryData[3] && industryData[3].dict_label;
- }
+ // if (cityData.length > 0) {
+ // values.province = cityData[0].value;
+ // values.provinceName = cityData[0].label;
+ // values.city = cityData[1] && cityData[1].value;
+ // values.cityName = cityData[1] && cityData[1].label;
+ // values.country = cityData[2] && cityData[2].value;
+ // values.countryName = cityData[2] && cityData[2].label;
+ // values.street = cityData[3] && cityData[3].value;
+ // values.streetName = cityData[3] && cityData[3].label;
+ // values.village = cityData[4] && cityData[4].value;
+ // values.villageName = cityData[4] && cityData[4].label;
+ // }
+ // if (industryData.length > 0) {
+ // values.corpType = industryData[0].dict_value;
+ // values.corpTypeName = industryData[0].dict_label;
+ // values.corpType2 = industryData[1] && industryData[1].dict_value;
+ // values.corpType2Name = industryData[1] && industryData[1].dict_label;
+ // values.corpType3 = industryData[2] && industryData[2].dict_value;
+ // values.corpType3Name = industryData[2] && industryData[2].dict_label;
+ // values.corpType4 = industryData[3] && industryData[3].dict_value;
+ // values.corpType4Name = industryData[3] && industryData[3].dict_label;
+ // }
await uploadFile({
single: false,
files: values.licenseFile,
@@ -469,10 +469,15 @@ function CorpInfo(props) {
// name: "totalAssets",
// render: FORM_ITEM_RENDER_ENUM.NUMBER,
// },
-
+ {
+ label: "经营范围",
+ name: "natureBusiness",
+ render: FORM_ITEM_RENDER_ENUM.TEXTAREA,
+ },
{
label: "营业执照",
name: "licenseFile",
+
render: (
{
@@ -484,11 +489,7 @@ function CorpInfo(props) {
/>
),
},
- // {
- // label: "营业执照有效期",
- // name: "license",
- // render: FORM_ITEM_RENDER_ENUM.DATE_RANGE,
- // },
+
{
name: "qrCode",
label: "企业二维码",
diff --git a/src/pages/Container/Stakeholder/User/Add/index.js b/src/pages/Container/Stakeholder/User/Add/index.js
index 32e0d64..8c5532a 100644
--- a/src/pages/Container/Stakeholder/User/Add/index.js
+++ b/src/pages/Container/Stakeholder/User/Add/index.js
@@ -752,7 +752,7 @@ function Add(props) {
items: WHETHER_ENUM,
componentProps: {
onChange: () => {
- form.setFieldValue("isPayNumber", undefined);
+ form.setFieldValue("payNumber", undefined);
form.setFieldValue("insurance", undefined);
},
},
@@ -760,7 +760,7 @@ function Add(props) {
},
{
- name: "isPayNumber",
+ name: "payNumber",
label: "商业保险单号",
dependencies: ["isPay"],
hidden: formValues => !(formValues.isPay === 1),
diff --git a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
index 482d094..20c4ca1 100644
--- a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
+++ b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
@@ -218,6 +218,22 @@ function View(props) {
// children: info.totalAssets,
// },
+ {
+ label: "相关方类型",
+ children: getLabelName({
+ status: info.type,
+ list: ENTERPRISE_TYPE,
+ }),
+ },
+ {
+ label: "创建单位",
+ children: info.tenantName,
+ },
+ {
+ label: "经营范围",
+ children: info.natureBusiness,
+ },
+
{
label: "企业二维码",
children: (
@@ -231,17 +247,6 @@ function View(props) {
),
},
- {
- label: "相关方类型",
- children: getLabelName({
- status: info.type,
- list: ENTERPRISE_TYPE,
- }),
- },
- {
- label: "创建单位",
- children: info.tenantName,
- },
// {
// label: "选取形式",
// children: info.selectfromList,