diff --git a/src/components/XgfUserInfo/index.js b/src/components/XgfUserInfo/index.js
index 0db17f6..fccc3b7 100644
--- a/src/components/XgfUserInfo/index.js
+++ b/src/components/XgfUserInfo/index.js
@@ -176,7 +176,6 @@ function XgfUserInfo(props) {
),
},
-
...(
props.showEmail
? [
@@ -226,10 +225,6 @@ function XgfUserInfo(props) {
bordered
items={[
- {
- label: "是否缴纳保险",
- children: info.isBf === 1 ? "是" : "否",
- },
{
label: "是否特殊工种",
children: info.isSpecialJob === 1 ? "是" : "否",
@@ -237,8 +232,30 @@ function XgfUserInfo(props) {
{
label: "是否为部门负责人",
children: info.isDepaRrtmentHead === 1 ? "是" : "否",
+
+ },
+ {
+ label: "是否参加三级安全培训",
+ children: info.isLevelThree === 1 ? "是" : "否",
+
+ },
+ {
+ label: "是否签订劳动合同",
+ children: info.isSignLabor === 1 ? "是" : "否",
span: 4,
},
+ ...(
+ info.isPay === 1
+ ? [
+
+ {
+ label: "合同图片",
+ children: ,
+ span: 4,
+ },
+ ]
+ : []
+ ),
{
label: "是否缴纳社保",
children: info.isSocial === 1 ? "是" : "否",
@@ -279,15 +296,15 @@ function XgfUserInfo(props) {
),
{
label: "是否缴纳商业保险",
- children: info.ispay === 1 ? "是" : "否",
+ children: info.isPay === 1 ? "是" : "否",
span: 4,
},
...(
- info.ispay === 1
+ info.isPay === 1
? [
{
label: "商业保险单号",
- children: info.ispayNumber,
+ children: info.isPayNumber,
},
{
label: "保险图片",
@@ -297,33 +314,15 @@ function XgfUserInfo(props) {
: []
),
{
- label: "是否签订劳动合同",
- children: info.isSignLabor === 1 ? "是" : "否",
- span: 4,
+ label: "是否缴纳其他人身伤害保险",
+ children: info.isBf === 1 ? "是" : "否",
},
...(
- info.ispay === 1
+ info.isBf === 1
? [
{
- label: "合同图片",
- children: ,
- span: 4,
- },
- ]
- : []
- ),
- {
- label: "是否参加三级安全培训",
- children: info.isLevelThree === 1 ? "是" : "否",
- span: 4,
- },
- ...(
- info.ispay === 1
- ? [
-
- {
- label: "三级安全培训照片",
+ label: "其他人身伤害保险照片",
children: ,
span: 4,
},
diff --git a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
index 0b0968d..336b58c 100644
--- a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
+++ b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
@@ -10,7 +10,6 @@ import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import { getLabelName } from "zy-react-library/utils";
import { NS_ENTERPRISE } from "~/enumerate/namespace";
-import { getCorpTypeNamePath } from "~/utils";
const ENTERPRISE_TYPE = [
{
@@ -102,7 +101,14 @@ function View(props) {
label: "统一社会信用代码",
children: info.code,
},
-
+ {
+ label: "开户银行",
+ children: info.depositBank,
+ },
+ {
+ label: "开户银行账号",
+ children: info.depositBankAccount,
+ },
// {
// label: "属地",
// children: {getAreaNamePath(info)}
,
diff --git a/src/pages/Container/Enterprise/User/Add/index.js b/src/pages/Container/Enterprise/User/Add/index.js
index ee89e08..d0c6aa1 100644
--- a/src/pages/Container/Enterprise/User/Add/index.js
+++ b/src/pages/Container/Enterprise/User/Add/index.js
@@ -322,6 +322,10 @@ function Add(props) {
{
name: "name",
label: "姓名",
+ componentProps: {
+ maxLength: 20,
+ },
+
},
{
diff --git a/src/pages/Container/Stakeholder/CorpInfo/index.js b/src/pages/Container/Stakeholder/CorpInfo/index.js
index a940c65..9df4025 100644
--- a/src/pages/Container/Stakeholder/CorpInfo/index.js
+++ b/src/pages/Container/Stakeholder/CorpInfo/index.js
@@ -33,6 +33,8 @@ const REQUIRED_FIELDS = [
"contactsPhone",
// "createDate",
"employees",
+ "depositBank",
+ "depositBankAccount",
// "regcapital",
// "totalAssets",
// "licenseStart",
@@ -335,6 +337,18 @@ function CorpInfo(props) {
],
},
+ {
+ label: "企事业单位经营地址",
+ name: "addressBusiness",
+ },
+ {
+ name: "depositBank",
+ label: "开户银行",
+ },
+ {
+ name: "depositBankAccount",
+ label: "开户银行账号",
+ },
// {
// label: "属地",
// name: "region",
@@ -387,10 +401,7 @@ function CorpInfo(props) {
// render: ,
// span: 24,
// },
- {
- label: "企事业单位经营地址",
- name: "addressBusiness",
- },
+
// {
// label: "企业规模",
// name: "scale",
diff --git a/src/pages/Container/Stakeholder/User/Add/index.js b/src/pages/Container/Stakeholder/User/Add/index.js
index deda754..dbb6f31 100644
--- a/src/pages/Container/Stakeholder/User/Add/index.js
+++ b/src/pages/Container/Stakeholder/User/Add/index.js
@@ -98,6 +98,7 @@ function Add(props) {
eqType: UPLOAD_FILE_TYPE_ENUM["14"],
eqForeignKey: data.userId,
});
+
// 15 社保卡照片 10 劳动合同图片 11 商业保险图片 16 工伤保险凭证 19三级教育培训
const socSecurity = await getFile({
@@ -204,7 +205,14 @@ function Add(props) {
foreignKey: userID,
},
});
-
+ await uploadFile({
+ single: false,
+ files: values.cardImg,
+ params: {
+ type: UPLOAD_FILE_TYPE_ENUM["14"],
+ foreignKey: userID || id,
+ },
+ });
await uploadFile({
single: false,
files: values.socSecurity,
@@ -401,7 +409,7 @@ function Add(props) {
|| getFileLoading
|| props.user.userLoading
}
- values={{ flowFlag: 0, isSocial: 0, isBf: 0, isSpecialJob: 0, isDepaRrtmentHead: 0, isInjuriesPay: 0, ispay: 0, isSignLabor: 0, isLevelThree: 0 }}
+ values={{ flowFlag: 0, isSocial: 0, isBf: 0, isSpecialJob: 0, isDepaRrtmentHead: 0, isInjuriesPay: 0, isPay: 0, isSignLabor: 0, isLevelThree: 0 }}
options={[
{
label: "基础信息",
@@ -466,6 +474,9 @@ function Add(props) {
{
name: "name",
label: "姓名",
+ componentProps: {
+ maxLength: 20,
+ },
},
{
name: "phone",
@@ -501,6 +512,7 @@ function Add(props) {
},
],
},
+
{
name: "email",
label: "电子邮箱",
@@ -620,12 +632,19 @@ function Add(props) {
},
},
},
+
{
- name: "isBf",
- label: "是否缴纳保险",
+ name: "isLevelThree",
+ label: "是否参加三级安全培训",
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
+ componentProps: {
+ onChange: () => {
+ form.setFieldValue("threeLevel", undefined);
+ },
+ },
},
+
{
name: "socialNumber",
label: "社会保障号码",
@@ -645,7 +664,7 @@ function Add(props) {
label: "社保卡照片",
render: (
{
setDeleteSocSecurityImageFiles([...deleteSocSecurityImageFiles, file]);
@@ -676,13 +695,13 @@ function Add(props) {
},
},
{
- name: "ispay",
+ name: "isPay",
label: "是否缴纳商业保险",
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
componentProps: {
onChange: () => {
- form.setFieldValue("ispayNumber", undefined);
+ form.setFieldValue("isPayNumber", undefined);
form.setFieldValue("insurance", undefined);
},
},
@@ -696,10 +715,10 @@ function Add(props) {
},
{
- name: "ispayNumber",
+ name: "isPayNumber",
label: "商业保险单号",
- dependencies: ["ispay"],
- hidden: formValues => !(formValues.ispay === 1),
+ dependencies: ["isPay"],
+ hidden: formValues => !(formValues.isPay === 1),
},
{
name: "empInsurance",
@@ -721,15 +740,15 @@ function Add(props) {
label: "保险图片",
render: (
{
setDeleteInsuranceImageFiles([...deleteInsuranceImageFiles, file]);
}}
/>
),
- dependencies: ["ispay"],
- hidden: formValues => !(formValues.ispay === 1),
+ dependencies: ["isPay"],
+ hidden: formValues => !(formValues.isPay === 1),
},
{
name: "isSignLabor",
@@ -742,23 +761,13 @@ function Add(props) {
},
},
},
- {
- name: "isLevelThree",
- label: "是否参加三级安全培训",
- render: FORM_ITEM_RENDER_ENUM.RADIO,
- items: WHETHER_ENUM,
- componentProps: {
- onChange: () => {
- form.setFieldValue("threeLevel", undefined);
- },
- },
- },
+
{
name: "contract",
label: "合同图片",
render: (
{
setDeleteContractImageFiles([...deleteContractImageFiles, file]);
@@ -768,21 +777,26 @@ function Add(props) {
dependencies: ["isSignLabor"],
hidden: formValues => !(formValues.isSignLabor === 1),
},
-
+ {
+ name: "isBf",
+ label: "是否缴纳其他人身伤害保险",
+ render: FORM_ITEM_RENDER_ENUM.RADIO,
+ items: WHETHER_ENUM,
+ },
{
name: "threeLevel",
- label: "三级安全培训照片",
+ label: "其他人身伤害保险照片",
render: (
{
setDeleteThreeLevelImageFiles([...deleteThreeLevelImageFiles, file]);
}}
/>
),
- dependencies: ["isLevelThree"],
- hidden: formValues => !(formValues.isLevelThree === 1),
+ dependencies: ["isBf"],
+ hidden: formValues => !(formValues.isBf === 1),
},
]}
diff --git a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
index 81fbfc9..59f8ea4 100644
--- a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
+++ b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
@@ -102,7 +102,14 @@ function View(props) {
label: "统一社会信用代码",
children: info.code,
},
-
+ {
+ label: "开户银行",
+ children: info.depositBank,
+ },
+ {
+ label: "开户银行账号",
+ children: info.depositBankAccount,
+ },
// {
// label: "属地",
// children: {getAreaNamePath(info)}
,
diff --git a/src/pages/Container/Supervision/Supervision/User/Add/index.js b/src/pages/Container/Supervision/Supervision/User/Add/index.js
index 9540a40..4dda9e5 100644
--- a/src/pages/Container/Supervision/Supervision/User/Add/index.js
+++ b/src/pages/Container/Supervision/Supervision/User/Add/index.js
@@ -322,6 +322,9 @@ function Add(props) {
{
name: "name",
label: "姓名",
+ componentProps: {
+ maxLength: 20,
+ },
},
{
name: "phone",