添加经营范围字段 调整保险信息位置

master
853931625@qq.com 2026-06-15 15:50:23 +08:00
parent 734b265041
commit 306e8193f9
5 changed files with 120 additions and 117 deletions

View File

@ -56,6 +56,7 @@ function XgfUserInfo(props) {
}); });
res.data.userImg = userImg; res.data.userImg = userImg;
res.data.cardImg = cardImg; res.data.cardImg = cardImg;
res.data.socSecurity = socSecurity; res.data.socSecurity = socSecurity;
res.data.empInsurance = empInsurance; res.data.empInsurance = empInsurance;
res.data.insurance = insurance; res.data.insurance = insurance;
@ -216,37 +217,33 @@ function XgfUserInfo(props) {
}, },
]} ]}
column={2} column={2}
labelStyle={{ styles={{ label: { width: 200 }, content: { width: 500 } }}
width: 200,
}}
contentStyle={{
width: "300px",
}}
/> />
<Divider orientation="left">社保信息</Divider> <Divider orientation="left">社保信息</Divider>
<Descriptions <Descriptions
bordered bordered
items={[ items={[
{
label: "是否参加三级安全培训",
children: info.isLevelThree === 1 ? "是" : "否",
span: 2,
},
{ {
label: "是否特殊工种", label: "是否特殊工种",
children: info.isSpecialJob === 1 ? "是" : "否", children: info.isSpecialJob === 1 ? "是" : "否",
span: 2,
}, },
{ {
label: "是否为部门负责人", label: "是否为部门负责人",
children: info.isDepaRrtmentHead === 1 ? "是" : "否", children: info.isDepaRrtmentHead === 1 ? "是" : "否",
span: 2,
}, },
{
label: "是否参加三级安全培训",
children: info.isLevelThree === 1 ? "是" : "否",
},
{ {
label: "是否签订劳动合同", label: "是否签订劳动合同",
children: info.isSignLabor === 1 ? "是" : "否", children: info.isSignLabor === 1 ? "是" : "否",
span: 4, span: 2,
}, },
...( ...(
info.isPay === 1 info.isPay === 1
@ -266,7 +263,7 @@ function XgfUserInfo(props) {
span: 4, span: 4,
}, },
...( ...(
info.isSocia === 1 info.isSocial === 1
? [ ? [
{ {
label: "社会保障号码", label: "社会保障号码",
@ -308,7 +305,7 @@ function XgfUserInfo(props) {
? [ ? [
{ {
label: "商业保险单号", label: "商业保险单号",
children: info.isPayNumber, children: info.payNumber,
}, },
{ {
label: "保险图片", label: "保险图片",
@ -335,12 +332,7 @@ function XgfUserInfo(props) {
), ),
]} ]}
column={2} column={2}
labelStyle={{ styles={{ label: { width: 200 }, content: { width: 500 } }}
width: 200,
}}
contentStyle={{
width: "300px",
}}
/> />
</div> </div>
</Modal> </Modal>

View File

@ -217,6 +217,22 @@ function View(props) {
// children: info.totalAssets, // children: info.totalAssets,
// }, // },
{
label: "相关方类型",
children: getLabelName({
status: info.type,
list: ENTERPRISE_TYPE,
}),
},
{
label: "创建单位",
children: info.tenantName,
},
{
label: "经营范围",
children: info.natureBusiness,
},
{ {
label: "企业二维码", label: "企业二维码",
children: ( children: (
@ -230,17 +246,6 @@ function View(props) {
</Button> </Button>
), ),
}, },
{
label: "相关方类型",
children: getLabelName({
status: info.type,
list: ENTERPRISE_TYPE,
}),
},
{
label: "创建单位",
children: info.tenantName,
},
// { // {
// label: "选取形式", // label: "选取形式",
// children: info.selectfromList, // children: info.selectfromList,

View File

@ -16,7 +16,6 @@ import {
PHONE, PHONE,
UNIFIED_SOCIAL_CREDIT_CODE, UNIFIED_SOCIAL_CREDIT_CODE,
} from "zy-react-library/regular"; } from "zy-react-library/regular";
import { getLabelName } from "zy-react-library/utils";
import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
import { useDebounce } from "~/utils"; import { useDebounce } from "~/utils";
@ -35,33 +34,34 @@ const REQUIRED_FIELDS = [
"employees", "employees",
"depositBank", "depositBank",
"depositBankAccount", "depositBankAccount",
"natureBusiness",
// "regcapital", // "regcapital",
// "totalAssets", // "totalAssets",
// "licenseStart", // "licenseStart",
// "licenseEnd", // "licenseEnd",
]; ];
const ENTERPRISE_STATUS = [ // const ENTERPRISE_STATUS = [
{ // {
bianma: "filialstate01", // bianma: "filialstate01",
name: "在产", // name: "在产",
}, // },
{ // {
bianma: "filialstate02", // bianma: "filialstate02",
name: "在建", // name: "在建",
}, // },
{ // {
bianma: "filialstate03", // bianma: "filialstate03",
name: "代建", // name: "代建",
}, // },
{ // {
bianma: "filialstate04", // bianma: "filialstate04",
name: "停产", // name: "停产",
}, // },
{ // {
bianma: "filialstate05", // bianma: "filialstate05",
name: "破产", // name: "破产",
}, // },
]; // ];
// const WHETHER_ENUM = [ // const WHETHER_ENUM = [
// { // {
// bianma: 1, // bianma: 1,
@ -89,10 +89,10 @@ function CorpInfo(props) {
const [canShowQrCode, setCanShowQrCode] = useState(false); const [canShowQrCode, setCanShowQrCode] = useState(false);
const [keyId, setKeyId] = useState({}); const [keyId, setKeyId] = useState({});
const [scaleData, setScaleData] = useState([]); // const [scaleData, setScaleData] = useState([]);
const [ecoTypeData, setEcoTypeData] = useState([]); // const [ecoTypeData, setEcoTypeData] = useState([]);
const [industryData, setIndustryData] = useState([]); // const [industryData, setIndustryData] = useState([]);
const [cityData, setCityData] = useState([]); // const [cityData, setCityData] = useState([]);
const [info, setInfoData] = useState([]); const [info, setInfoData] = useState([]);
const [codeValue, setCodeValue] = useState(""); const [codeValue, setCodeValue] = useState("");
const [corpNameValue, setCorpNameValue] = useState(""); const [corpNameValue, setCorpNameValue] = useState("");
@ -167,46 +167,46 @@ function CorpInfo(props) {
single: false, single: false,
files: deleteHiddenImageFiles, files: deleteHiddenImageFiles,
}); });
values.ecoTypeName = getLabelName({ // values.ecoTypeName = getLabelName({
status: values.ecoType, // status: values.ecoType,
list: ecoTypeData, // list: ecoTypeData,
idKey: "dictValue", // idKey: "dictValue",
nameKey: "dictLabel", // nameKey: "dictLabel",
}); // });
values.scaleName = getLabelName({ // values.scaleName = getLabelName({
status: values.scale, // status: values.scale,
list: scaleData, // list: scaleData,
idKey: "dictValue", // idKey: "dictValue",
nameKey: "dictLabel", // nameKey: "dictLabel",
}); // });
values.corpStateName = getLabelName({ // values.corpStateName = getLabelName({
status: values.corpState, // status: values.corpState,
list: ENTERPRISE_STATUS, // list: ENTERPRISE_STATUS,
//
// });
}); // if (cityData.length > 0) {
// values.province = cityData[0].value;
if (cityData.length > 0) { // values.provinceName = cityData[0].label;
values.province = cityData[0].value; // values.city = cityData[1] && cityData[1].value;
values.provinceName = cityData[0].label; // values.cityName = cityData[1] && cityData[1].label;
values.city = cityData[1] && cityData[1].value; // values.country = cityData[2] && cityData[2].value;
values.cityName = cityData[1] && cityData[1].label; // values.countryName = cityData[2] && cityData[2].label;
values.country = cityData[2] && cityData[2].value; // values.street = cityData[3] && cityData[3].value;
values.countryName = cityData[2] && cityData[2].label; // values.streetName = cityData[3] && cityData[3].label;
values.street = cityData[3] && cityData[3].value; // values.village = cityData[4] && cityData[4].value;
values.streetName = cityData[3] && cityData[3].label; // values.villageName = cityData[4] && cityData[4].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;
if (industryData.length > 0) { // values.corpTypeName = industryData[0].dict_label;
values.corpType = industryData[0].dict_value; // values.corpType2 = industryData[1] && industryData[1].dict_value;
values.corpTypeName = industryData[0].dict_label; // values.corpType2Name = industryData[1] && industryData[1].dict_label;
values.corpType2 = industryData[1] && industryData[1].dict_value; // values.corpType3 = industryData[2] && industryData[2].dict_value;
values.corpType2Name = industryData[1] && industryData[1].dict_label; // values.corpType3Name = industryData[2] && industryData[2].dict_label;
values.corpType3 = industryData[2] && industryData[2].dict_value; // values.corpType4 = industryData[3] && industryData[3].dict_value;
values.corpType3Name = industryData[2] && industryData[2].dict_label; // values.corpType4Name = industryData[3] && industryData[3].dict_label;
values.corpType4 = industryData[3] && industryData[3].dict_value; // }
values.corpType4Name = industryData[3] && industryData[3].dict_label;
}
await uploadFile({ await uploadFile({
single: false, single: false,
files: values.licenseFile, files: values.licenseFile,
@ -469,10 +469,15 @@ function CorpInfo(props) {
// name: "totalAssets", // name: "totalAssets",
// render: FORM_ITEM_RENDER_ENUM.NUMBER, // render: FORM_ITEM_RENDER_ENUM.NUMBER,
// }, // },
{
label: "经营范围",
name: "natureBusiness",
render: FORM_ITEM_RENDER_ENUM.TEXTAREA,
},
{ {
label: "营业执照", label: "营业执照",
name: "licenseFile", name: "licenseFile",
render: ( render: (
<Upload <Upload
onGetRemoveFile={(file) => { onGetRemoveFile={(file) => {
@ -484,11 +489,7 @@ function CorpInfo(props) {
/> />
), ),
}, },
// {
// label: "营业执照有效期",
// name: "license",
// render: FORM_ITEM_RENDER_ENUM.DATE_RANGE,
// },
{ {
name: "qrCode", name: "qrCode",
label: "企业二维码", label: "企业二维码",

View File

@ -752,7 +752,7 @@ function Add(props) {
items: WHETHER_ENUM, items: WHETHER_ENUM,
componentProps: { componentProps: {
onChange: () => { onChange: () => {
form.setFieldValue("isPayNumber", undefined); form.setFieldValue("payNumber", undefined);
form.setFieldValue("insurance", undefined); form.setFieldValue("insurance", undefined);
}, },
}, },
@ -760,7 +760,7 @@ function Add(props) {
}, },
{ {
name: "isPayNumber", name: "payNumber",
label: "商业保险单号", label: "商业保险单号",
dependencies: ["isPay"], dependencies: ["isPay"],
hidden: formValues => !(formValues.isPay === 1), hidden: formValues => !(formValues.isPay === 1),

View File

@ -218,6 +218,22 @@ function View(props) {
// children: info.totalAssets, // children: info.totalAssets,
// }, // },
{
label: "相关方类型",
children: getLabelName({
status: info.type,
list: ENTERPRISE_TYPE,
}),
},
{
label: "创建单位",
children: info.tenantName,
},
{
label: "经营范围",
children: info.natureBusiness,
},
{ {
label: "企业二维码", label: "企业二维码",
children: ( children: (
@ -231,17 +247,6 @@ function View(props) {
</Button> </Button>
), ),
}, },
{
label: "相关方类型",
children: getLabelName({
status: info.type,
list: ENTERPRISE_TYPE,
}),
},
{
label: "创建单位",
children: info.tenantName,
},
// { // {
// label: "选取形式", // label: "选取形式",
// children: info.selectfromList, // children: info.selectfromList,