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

添加 物资中心选项 添加点击空白弹窗不再关闭

master
853931625@qq.com 2026-01-08 17:36:37 +08:00
parent e5909ef864
commit b91899d3ea
43 changed files with 130 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -32,7 +32,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"relation-graph": "^2.2.11",
"zy-react-library": "^1.1.10"
"zy-react-library": "^1.1.24"
},
"devDependencies": {
"@antfu/eslint-config": "^5.4.1",

2
src/api/enterprise/index.js
View File

@ -2,7 +2,7 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime";
export const corpInfoList = declareRequest(
"enterpriseLoading",
"Post > @/basicInfo/corpInfo/list",
"Post > @/basicInfo/corpInfo/basicList",
);
export const corpInfoDetails = declareRequest(
"enterpriseLoading",

2
src/components/OrgChartModal/index.js
View File

@ -3,7 +3,7 @@ import RelationGraph from "relation-graph/react";
import { MySwitch } from "./RGDemoComponents/MyUIComponents";
const ExpandAnimation = (departmentData) => {
console.log(departmentData);
const graphRef = useRef(null);
const [relayout, setRelayout] = useState(true);

1
src/pages/Container/BusinessLicense/index.js
View File

@ -181,6 +181,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

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

@ -275,6 +275,7 @@ function Info(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}

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

@ -277,7 +277,7 @@ function Update(props) {
whetherLiquidammoniaFlag: 0,
whetherPipelineFlag: 0,
}}
confirmLoading={
loading={
deleteFileLoading
|| uploadFileLoading
|| getFileLoading

4
src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js
View File

@ -19,6 +19,10 @@ const ENTERPRISE_TYPE = [
bianma: 1,
name: "集团单位",
},
{
bianma: 6,
name: "物资中心",
},
];
function ChangeList(props) {
const [form] = Form.useForm();

1
src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js
View File

@ -217,6 +217,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title="查看"
cancelText="关闭"

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

@ -272,6 +272,7 @@ function AddModalComponent(props) {
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

1
src/pages/Container/Enterprise/Post/index.js
View File

@ -222,6 +222,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

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

@ -181,7 +181,7 @@ function List(props) {
},
{
title: "创建单位",
dataIndex: "createName",
dataIndex: "tenantName",
},
{
title: "开户人",
@ -408,6 +408,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}
@ -420,7 +421,7 @@ function AddModalComponent(props) {
form={form}
span={24}
confirmLoading={props.loading}
loading={props.loading}
options={[
{
name: "corpName",

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

@ -277,6 +277,7 @@ function View(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}
@ -325,6 +326,7 @@ const CorpInfoQrCode = (props) => {
return (
<Modal
open={props.open}
maskClosable={false}
title="企业二维码"
footer={[
<Button

2
src/pages/Container/Enterprise/StakeholderUnit/User/UserList/index.js
View File

@ -244,6 +244,7 @@ function AddModalComponent(props) {
return (
<>
<Modal
maskClosable={false}
open={props.open}
title="查看"
width={1200}
@ -385,6 +386,7 @@ function AddModalComponent(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}

2
src/pages/Container/Enterprise/User/Add/index.js
View File

@ -275,7 +275,7 @@ function Add(props) {
values={{
departmentLeaderFlag: 0,
}}
confirmLoading={uploadFileLoading || props.user.userLoading}
loading={uploadFileLoading || props.user.userLoading}
options={[
{
name: "roleId",

2
src/pages/Container/Enterprise/User/List/index.js
View File

@ -372,6 +372,7 @@ function AddModalComponent(props) {
return (
<>
<Modal
maskClosable={false}
open={props.open}
title="查看"
cancelText="关闭"
@ -507,6 +508,7 @@ function AddModalComponent(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}

1
src/pages/Container/PersonnelCertificate/index.js
View File

@ -184,6 +184,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

2
src/pages/Container/Stakeholder/CorpInfo/components/Qualification.js
View File

@ -127,6 +127,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}
@ -168,6 +169,7 @@ function AddModalComponent(props) {
function PreviewModalComponent(props) {
return (
<Modal
maskClosable={false}
open={props.open}
title="预览"
footer={[

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

@ -289,7 +289,7 @@ function CorpInfo(props) {
<FormBuilder
showCancelButton={false}
form={form}
confirmLoading={
loading={
deleteFileLoading
|| uploadFileLoading
|| getFileLoading
@ -509,6 +509,7 @@ function CorpInfo(props) {
const CorpInfoQrCode = (props) => {
return (
<Modal
maskClosable={false}
open={props.open}
title="企业二维码"
footer={[

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

@ -309,6 +309,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

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

@ -281,7 +281,7 @@ function Add(props) {
>
<FormBuilder
form={form}
confirmLoading={
loading={
deleteFileLoading
|| uploadFileLoading
|| getFileLoading

10
src/pages/Container/Stakeholder/User/List/index.js
View File

@ -18,7 +18,13 @@ import { UseDecodeIdCard } from "~/utils";
const JOB_STATUS = {
1: "在职",
0: "离职",
3: "离职",
2: "信息变更中",
3: "未入职",
4: "实习生",
5: "实习结束",
6: "退休",
7: "劳务派遣",
8: "劳务派遣结束",
11: "入职待审核",
10: "离职待审核",
};
@ -389,6 +395,7 @@ function AddModalComponent(props) {
return (
<>
<Modal
maskClosable={false}
open={props.open}
title={props.modalType === "see" ? "查看" : "审核"}
width={1200}
@ -539,6 +546,7 @@ function AddModalComponent(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}

6
src/pages/Container/Stakeholder/User/ResignationReview/index.js
View File

@ -6,12 +6,6 @@ import Table from "zy-react-library/components/Table";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import { NS_USER } from "~/enumerate/namespace";
const JOB_STATUS = {
1: "在职",
0: "离职",
11: "入职待审核",
10: "离职待审核",
};
function ResignationReview(props) {
const queryParams = useGetUrlQuery();
const [info, setInfo] = useState({});

1
src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js
View File

@ -313,6 +313,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

1
src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js
View File

@ -347,6 +347,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

63
src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js
View File

@ -34,6 +34,7 @@ const ENTERPRISE_TYPE = [
bianma: 1,
name: "集团单位",
},
];
const ENTERPRISE_STATUS = [
{
@ -229,23 +230,23 @@ function List(props) {
width: 500,
render: (_, record) => (
<Space>
{" "}
{
props.permission("zgszhgl-edit")
&& (
<Button
type="link"
onClick={() => {
setAddModalOpen(true);
setCurrentId(record.id);
setOpenType("edit");
}}
>
编辑
</Button>
)
}
{/* { */}
{/* props.permission("zgszhgl-edit") */}
{/* && ( */}
{/* <Button */}
{/* type="link" */}
{/* onClick={() => { */}
{/* setAddModalOpen(true); */}
{/* setCurrentId(record.id); */}
{/* setOpenType("edit"); */}
{/* }} */}
{/* > */}
{/* 编辑 */}
{/* </Button> */}
{/* ) */}
{/* } */}
{
props.permission("zgszhgl-editName")
&& (
@ -373,19 +374,32 @@ function AddModalComponent(props) {
const onSubmit = async (values) => {
if (props.openType === "editName") {
values.id = props.currentId;
await props.requestChangeCompanyName(values);
await props.requestChangeCompanyName(values).then((res) => {
if (res.success) {
message.success("修改成功");
onCancel();
props.getData();
}
});
}
if (props.openType === "edit") {
values.id = props.currentId;
await props.requestEdit(values).then(() => {
onCancel();
props.getData();
await props.requestEdit(values).then((res) => {
if (res.success) {
message.success("编辑成功");
onCancel();
props.getData();
}
});
}
if (props.openType === "add") {
await props.requestAdd(values).then(() => {
onCancel();
props.getData();
await props.requestAdd(values).then((res) => {
if (res.success) {
message.success("新增成功");
onCancel();
props.getData();
}
});
}
};
@ -452,6 +466,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}
@ -463,7 +478,7 @@ function AddModalComponent(props) {
<FormBuilder
form={form}
span={24}
confirmLoading={props.loading}
loading={props.loading}
options={[
{
name: "corpName",

4
src/pages/Container/Supervision/BranchCompany/AccountManage/View/index.js
View File

@ -32,6 +32,10 @@ const ENTERPRISE_TYPE = [
bianma: 5,
name: "驻港单位",
},
{
bianma: 6,
name: "物资中心",
},
];
function View(props) {
const queryParams = useGetUrlQuery();

4
src/pages/Container/Supervision/BranchCompany/DepartmentManage/List/index.js
View File

@ -18,6 +18,10 @@ const ENTERPRISE_TYPE = [
bianma: 1,
name: "集团单位",
},
{
bianma: 6,
name: "物资中心",
},
];
const BRANCH_CONPANY_STATUS = [
{

1
src/pages/Container/Supervision/BranchCompany/DepartmentManage/View/index.js
View File

@ -124,6 +124,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title="查看"
width={800}

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

@ -81,7 +81,6 @@ function List(props) {
message.success("定位成功！");
}
});
// props.
};
return (
<Page isShowAllAction={false}>

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

@ -299,6 +299,7 @@ function View(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}

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

@ -155,6 +155,7 @@ function AddModalComponent(props) {
return (
<>
<Modal
maskClosable={false}
open={props.open}
title="查看"
width={1200}
@ -294,6 +295,7 @@ function AddModalComponent(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}

4
src/pages/Container/Supervision/EnterpriseMiddleground/ChangeList/index.js
View File

@ -18,6 +18,10 @@ const ENTERPRISE_TYPE = [
bianma: 1,
name: "集团单位",
},
{
bianma: 6,
name: "物资中心",
},
];
function List(props) {
const [form] = Form.useForm();

4
src/pages/Container/Supervision/EnterpriseMiddleground/List/index.js
View File

@ -19,6 +19,10 @@ const ENTERPRISE_TYPE = [
bianma: 1,
name: "集团单位",
},
{
bianma: 6,
name: "物资中心",
},
];
function List(props) {
const [form] = Form.useForm();

1
src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js
View File

@ -234,6 +234,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title="查看"
cancelText="关闭"

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

@ -33,7 +33,6 @@ const ENTERPRISE_TYPE = [
];
function List(props) {
const [form] = Form.useForm();
const [cityData, setCityData] = useState([]);
const { tableProps, getData } = useTable(props["corpInfoList"], {
form,
@ -279,6 +278,8 @@ function List(props) {
requestChangeCompanyName={props["corpInfoChangeCompanyName"]}
requestCorplnfoCheckCorpcode={props["corplnfoCheckCorpcode"]}
requestCorplnfoCheckCorpName={props["corplnfoCheckCorpName"]}
loding={props.enterprise.userLoading}
onCancel={() => {
setAddModalOpen(false);
setCurrentId("");
@ -405,11 +406,14 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}
onOk={form.submit}
onCancel={onCancel}
loading={props.loading}
>
<FormBuilder
form={form}
@ -451,6 +455,9 @@ function AddModalComponent(props) {
label: "相关方类型",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: ENTERPRISE_TYPE,
componentProps: {
disabled: props.currentId,
},
},
{
name: "selectfromList",

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

@ -277,6 +277,8 @@ function View(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}
@ -324,6 +326,7 @@ function View(props) {
const CorpInfoQrCode = (props) => {
return (
<Modal
maskClosable={false}
open={props.open}
title="企业二维码"
footer={[

1
src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js
View File

@ -287,6 +287,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

1
src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js
View File

@ -315,6 +315,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

14
src/pages/Container/Supervision/StakeholderUnit/User/UserList/index.js
View File

@ -38,11 +38,11 @@ function List(props) {
const FLOW_USER_TYPE = [
{
name: "流动人员",
bianma: 1,
bianma: "1",
},
{
name: "非流动人员",
bianma: 0,
bianma: "0",
},
];
@ -109,7 +109,7 @@ function List(props) {
label: "姓名",
},
{
name: "eqEmploymentFlag",
name: "eqFlowFlag",
label: "人员类型",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: FLOW_USER_TYPE,
@ -133,7 +133,11 @@ function List(props) {
},
{
title: "人员类型",
dataIndex: "personnelTypeName",
dataIndex: "flowFlag",
render: (_, record) => (
record.flowFlag === 1 ? "流动人员" : record.flowFlag === 0 ? "非流动人员" : ""
),
},
{
@ -243,6 +247,7 @@ function AddModalComponent(props) {
return (
<>
<Modal
maskClosable={false}
open={props.open}
title="查看"
cancelText="关闭"
@ -384,6 +389,7 @@ function AddModalComponent(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}

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

@ -132,7 +132,7 @@ function Update(props) {
<FormBuilder
form={form}
confirmLoading={
loading={
props.enterprise.enterpriseLoading
}

2
src/pages/Container/Supervision/Supervision/Department/index.js
View File

@ -269,6 +269,7 @@ function Department(props) {
{chartModalOpen
&& (
<Modal
maskClosable={false}
open={chartModalOpen}
title="组织架构图"
width="80%"
@ -327,6 +328,7 @@ function AddModalComponent(props) {
};
return (
<Modal
maskClosable={false}
open={props.open}
title={props.currentId ? "编辑" : "新增"}
width={800}

2
src/pages/Container/Supervision/Supervision/User/Add/index.js
View File

@ -270,7 +270,7 @@ function Add(props) {
values={{
departmentLeaderFlag: 0,
}}
confirmLoading={uploadFileLoading || props.user.userLoading}
loading={uploadFileLoading || props.user.userLoading}
options={[
{
name: "roleId",

3
src/pages/Container/Supervision/Supervision/User/List/index.js
View File

@ -292,7 +292,6 @@ function List(props) {
render: (_, record) => (
<div>
{
getLabelName({
status: String(record.employmentFlag),
list: employmentFlagData,
@ -442,6 +441,7 @@ function AddModalComponent(props) {
<>
<Modal
maskClosable={false}
open={props.open}
title="查看"
width={1200}
@ -580,6 +580,7 @@ function AddModalComponent(props) {
{isModalOpen
&& (
<Modal
maskClosable={false}
title="查看"
open={isModalOpen}
onOk={handleOk}