zcloud_gbs
/
zcloud_gbs_basic_info_gwj-react
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

相关方BUG修改

master
853931625@qq.com 2026-06-04 10:14:35 +08:00
parent b032a65aa8
commit f9c8788d1a
10 changed files with 98 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Container/Enterprise/CorpInfo/Info/index.js
View File

@ -214,7 +214,7 @@ function Info(props) {
), ),
}, },
{ {
label: "企事业单位经营地址", label: "单位经营地址",
children: info.addressBusiness, children: info.addressBusiness,
}, },
{ {

2
src/pages/Container/Enterprise/CorpInfo/Update/index.js
View File

@ -467,7 +467,7 @@ function Update(props) {
items: WHETHER_ENUM, items: WHETHER_ENUM,
}, },
{ {
label: "企事业单位经营地址", label: "单位经营地址",
name: "addressBusiness", name: "addressBusiness",
}, },
{ {

2
src/pages/Container/Enterprise/OrganizationStructure/index.js
View File

@ -157,11 +157,13 @@ function OrganizationStructure(props) {
<Button <Button
block block
type="link" type="link"
title={record.name}
onClick={() => handleTableNodeClick(record)} onClick={() => handleTableNodeClick(record)}
> >
{`${record.name.length > 25 ? `${record.name.slice(0, 25)}...` : record.name}>`} {`${record.name.length > 25 ? `${record.name.slice(0, 25)}...` : record.name}>`}
</Button> </Button>
), ),
}, },
{ title: "部门负责人", dataIndex: "departmentUserLeaderList" }, { title: "部门负责人", dataIndex: "departmentUserLeaderList" },
{ title: "部门级别", dataIndex: "levelName" }, { title: "部门级别", dataIndex: "levelName" },

14
src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
View File

@ -261,16 +261,16 @@ function View(props) {
label: "营业执照", label: "营业执照",
children: <PreviewImg files={info.licenseFile} />, children: <PreviewImg files={info.licenseFile} />,
}, },
{ // {
label: "营业执照有效期", // label: "营业执照有效期",
children: info.licenseStart ? ` ${info.licenseStart} 至 ${info.licenseEnd}` : "", // children: info.licenseStart ? ` ${info.licenseStart} 至 ${info.licenseEnd}` : "",
}, // },
]} ]}
column={2} column={1}
labelStyle={{ labelStyle={{
width: 200, width: 185,
}} }}
contentStyle={{ width: "40%" }}
/> />
</Page> </Page>
{corpInfoQrCodeOpen && ( {corpInfoQrCodeOpen && (

2
src/pages/Container/Stakeholder/CorpInfo/index.js
View File

@ -338,7 +338,7 @@ function CorpInfo(props) {
}, },
{ {
label: "企事业单位经营地址", label: "单位经营地址",
name: "addressBusiness", name: "addressBusiness",
}, },
{ {

1
src/pages/Container/Stakeholder/Department/index.js
View File

@ -179,6 +179,7 @@ function Department(props) {
<Button <Button
block block
type="link" type="link"
title={record.name}
onClick={() => handleTableNodeClick(record)} onClick={() => handleTableNodeClick(record)}
> >
{`${record.name.length > 25 ? `${record.name.slice(0, 25)}...` : record.name}>`} {`${record.name.length > 25 ? `${record.name.slice(0, 25)}...` : record.name}>`}

123
src/pages/Container/Stakeholder/User/Add/index.js
View File

@ -16,7 +16,7 @@ import useUploadFile from "zy-react-library/hooks/useUploadFile";
import nation from "zy-react-library/json/nation.json"; import nation from "zy-react-library/json/nation.json";
import { PHONE } from "zy-react-library/regular"; import { PHONE } from "zy-react-library/regular";
import { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils"; import { getFileUrl, getLabelName, idCardGetDateAndGender } from "zy-react-library/utils";
import { NS_USER } from "~/enumerate/namespace"; import { NS_USER } from "~/enumerate/namespace";
import { import {
getAgeByIdCard, getAgeByIdCard,
@ -90,10 +90,18 @@ function Add(props) {
data.sex = data.sex === "男" ? "1" : "0"; data.sex = data.sex === "男" ? "1" : "0";
setUserID(data.userId); setUserID(data.userId);
const userImg = await getFile({
const userImg = (data && data.userAvatarUrl)
? [
{
url: getFileUrl() + data.userAvatarUrl,
},
]
: await getFile({
eqType: UPLOAD_FILE_TYPE_ENUM["13"], eqType: UPLOAD_FILE_TYPE_ENUM["13"],
eqForeignKey: data.userId, eqForeignKey: data.userId,
}); });
const cardImg = await getFile({ const cardImg = await getFile({
eqType: UPLOAD_FILE_TYPE_ENUM["14"], eqType: UPLOAD_FILE_TYPE_ENUM["14"],
eqForeignKey: data.userId, eqForeignKey: data.userId,
@ -105,6 +113,7 @@ function Add(props) {
eqType: UPLOAD_FILE_TYPE_ENUM["15"], eqType: UPLOAD_FILE_TYPE_ENUM["15"],
eqForeignKey: data.userId, eqForeignKey: data.userId,
}); });
const empInsurance = await getFile({ const empInsurance = await getFile({
eqType: UPLOAD_FILE_TYPE_ENUM["16"], eqType: UPLOAD_FILE_TYPE_ENUM["16"],
eqForeignKey: data.userId, eqForeignKey: data.userId,
@ -197,15 +206,17 @@ function Add(props) {
if (values.userIdCard) { if (values.userIdCard) {
values.userIdCard = btoa(values.userIdCard); // Base64 编码 values.userIdCard = btoa(values.userIdCard); // Base64 编码
} }
const { id } = await uploadFile({
single: false, const { filePath } = await uploadFile({
single: true,
files: values.userImg, files: values.userImg,
params: { params: {
type: UPLOAD_FILE_TYPE_ENUM["13"], type: UPLOAD_FILE_TYPE_ENUM["13"],
foreignKey: userID, foreignKey: userID,
}, },
}); });
await uploadFile({
const { id } = await uploadFile({
single: false, single: false,
files: values.cardImg, files: values.cardImg,
params: { params: {
@ -264,6 +275,7 @@ function Add(props) {
return; return;
} }
values.userId = userID || id; values.userId = userID || id;
values.userAvatarUrl = filePath;
if (queryParams["id"]) { if (queryParams["id"]) {
values.id = queryParams["id"]; values.id = queryParams["id"];
@ -422,6 +434,7 @@ function Add(props) {
render: ( render: (
<Upload <Upload
size={4} size={4}
maxCount={1}
fileType="image" fileType="image"
tipContent={( tipContent={(
<div <div
@ -620,18 +633,6 @@ function Add(props) {
// hidden: formValues => !(formValues.politicalStatus === "zhonggongdangyuan"), // hidden: formValues => !(formValues.politicalStatus === "zhonggongdangyuan"),
// }, // },
// { name: "postId", label: "岗位名称（工种）" }, // { name: "postId", label: "岗位名称（工种）" },
{
name: "isSocial",
label: "是否缴纳社保",
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
componentProps: {
onChange: () => {
form.setFieldValue("socialNumber", undefined);
form.setFieldValue("socSecurity", undefined);
},
},
},
{ {
name: "isLevelThree", name: "isLevelThree",
@ -643,14 +644,9 @@ function Add(props) {
form.setFieldValue("threeLevel", undefined); form.setFieldValue("threeLevel", undefined);
}, },
}, },
span: 24,
}, },
{
name: "socialNumber",
label: "社会保障号码",
dependencies: ["isSocial"],
hidden: formValues => !(formValues.isSocial === 1),
},
{ {
name: "isSpecialJob", name: "isSpecialJob",
label: "是否特殊工种", label: "是否特殊工种",
@ -658,6 +654,36 @@ function Add(props) {
render: FORM_ITEM_RENDER_ENUM.RADIO, render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM, items: WHETHER_ENUM,
componentProps: { disabled: true }, componentProps: { disabled: true },
span: 24,
},
{
name: "isDepaRrtmentHead",
label: "是否为部门负责人",
required: false,
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
span: 24,
// componentProps: { disabled: true },
},
{
name: "isSocial",
label: "是否缴纳社保",
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
componentProps: {
onChange: () => {
form.setFieldValue("socialNumber", undefined);
form.setFieldValue("socSecurity", undefined);
},
},
span: 24,
},
{
name: "socialNumber",
label: "社会保障号码",
dependencies: ["isSocial"],
hidden: formValues => !(formValues.isSocial === 1),
}, },
{ {
name: "socSecurity", name: "socSecurity",
@ -674,14 +700,6 @@ function Add(props) {
dependencies: ["isSocial"], dependencies: ["isSocial"],
hidden: formValues => !(formValues.isSocial === 1), hidden: formValues => !(formValues.isSocial === 1),
}, },
{
name: "isDepaRrtmentHead",
label: "是否为部门负责人",
required: false,
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
// componentProps: { disabled: true },
},
{ {
name: "isInjuriesPay", name: "isInjuriesPay",
label: "是否按期缴纳工伤保险", label: "是否按期缴纳工伤保险",
@ -693,18 +711,7 @@ function Add(props) {
form.setFieldValue("empInsurance", undefined); form.setFieldValue("empInsurance", undefined);
}, },
}, },
}, span: 24,
{
name: "isPay",
label: "是否缴纳商业保险",
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
componentProps: {
onChange: () => {
form.setFieldValue("isPayNumber", undefined);
form.setFieldValue("insurance", undefined);
},
},
}, },
{ {
name: "isInjuriesPayTime", name: "isInjuriesPayTime",
@ -713,13 +720,6 @@ function Add(props) {
render: FORM_ITEM_RENDER_ENUM.DATE, render: FORM_ITEM_RENDER_ENUM.DATE,
hidden: formValues => !(formValues.isInjuriesPay === 1), hidden: formValues => !(formValues.isInjuriesPay === 1),
}, },
{
name: "isPayNumber",
label: "商业保险单号",
dependencies: ["isPay"],
hidden: formValues => !(formValues.isPay === 1),
},
{ {
name: "empInsurance", name: "empInsurance",
label: "工伤保险凭证", label: "工伤保险凭证",
@ -735,6 +735,27 @@ function Add(props) {
dependencies: ["isInjuriesPay"], dependencies: ["isInjuriesPay"],
hidden: formValues => !(formValues.isInjuriesPay === 1), hidden: formValues => !(formValues.isInjuriesPay === 1),
}, },
{
name: "isPay",
label: "是否缴纳商业保险",
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
componentProps: {
onChange: () => {
form.setFieldValue("isPayNumber", undefined);
form.setFieldValue("insurance", undefined);
},
},
span: 24,
},
{
name: "isPayNumber",
label: "商业保险单号",
dependencies: ["isPay"],
hidden: formValues => !(formValues.isPay === 1),
},
{ {
name: "insurance", name: "insurance",
label: "保险图片", label: "保险图片",
@ -760,6 +781,7 @@ function Add(props) {
form.setFieldValue("contract", undefined); form.setFieldValue("contract", undefined);
}, },
}, },
span: 24,
}, },
{ {
@ -782,6 +804,7 @@ function Add(props) {
label: "是否缴纳其他人身伤害保险", label: "是否缴纳其他人身伤害保险",
render: FORM_ITEM_RENDER_ENUM.RADIO, render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM, items: WHETHER_ENUM,
span: 24,
}, },
{ {
name: "threeLevel", name: "threeLevel",

2
src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/List/index.js
View File

@ -116,7 +116,7 @@ function List(props) {
dataIndex: "corpName", dataIndex: "corpName",
}, },
{ {
title: "企事业单位经营地址", title: "单位经营地址",
dataIndex: "addressBusiness", dataIndex: "addressBusiness",
}, },
{ {

2
src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js
View File

@ -127,7 +127,7 @@ function View(props) {
}, },
{ {
label: "企事业单位经营地址", label: "单位经营地址",
children: info.addressBusiness, children: info.addressBusiness,
}, },

13
src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
View File

@ -252,6 +252,7 @@ function View(props) {
labelStyle={{ labelStyle={{
width: 200, width: 200,
}} }}
/> />
<Divider orientation="left">营业执照</Divider> <Divider orientation="left">营业执照</Divider>
<Descriptions <Descriptions
@ -262,16 +263,16 @@ function View(props) {
label: "营业执照", label: "营业执照",
children: <PreviewImg files={info.licenseFile} />, children: <PreviewImg files={info.licenseFile} />,
}, },
{ // {
label: "营业执照有效期", // label: "营业执照有效期",
children: info.licenseStart ? ` ${info.licenseStart} 至 ${info.licenseEnd}` : "", // children: info.licenseStart ? ` ${info.licenseStart} 至 ${info.licenseEnd}` : "",
}, // },
]} ]}
column={2} column={2}
labelStyle={{ labelStyle={{
width: 200, width: 185,
}} }}
contentStyle={{ width: "40%" }}
/> />
</div> </div>
{corpInfoQrCodeOpen && ( {corpInfoQrCodeOpen && (