package.json

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

src/api/enterprise/index.js

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

src/components/OrgChartModal/index.js

@@ -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);
 

src/pages/Container/BusinessLicense/index.js

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

src/pages/Container/Enterprise/CorpInfo/Info/index.js

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

src/pages/Container/Enterprise/CorpInfo/Update/index.js

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

src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeList/index.js

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

src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js

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

src/pages/Container/Enterprise/OrganizationStructure/index.js

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

src/pages/Container/Enterprise/Post/index.js

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

src/pages/Container/Enterprise/StakeholderUnit/AccountManage/List/index.js

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

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

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

src/pages/Container/Enterprise/StakeholderUnit/User/UserList/index.js

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

src/pages/Container/Enterprise/User/Add/index.js

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

src/pages/Container/Enterprise/User/List/index.js

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

src/pages/Container/PersonnelCertificate/index.js

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

src/pages/Container/Stakeholder/CorpInfo/components/Qualification.js

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

src/pages/Container/Stakeholder/CorpInfo/index.js

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

src/pages/Container/Stakeholder/Department/index.js

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

src/pages/Container/Stakeholder/User/Add/index.js

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

src/pages/Container/Stakeholder/User/List/index.js

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

src/pages/Container/Stakeholder/User/ResignationReview/index.js

@@ -6,6 +6,12 @@ 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({});

src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js

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

src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js

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

src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js

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

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

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

src/pages/Container/Supervision/BranchCompany/DepartmentManage/List/index.js

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

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

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

src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/List/index.js

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

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

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

src/pages/Container/Supervision/BranchCompany/SubsidiaryUser/UserList/index.js

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

src/pages/Container/Supervision/EnterpriseMiddleground/ChangeList/index.js

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

src/pages/Container/Supervision/EnterpriseMiddleground/List/index.js

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

src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js

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

src/pages/Container/Supervision/StakeholderUnit/AccountManage/List/index.js

@@ -33,6 +33,7 @@ const ENTERPRISE_TYPE = [
 ];
 function List(props) {
   const [form] = Form.useForm();
+
   const [cityData, setCityData] = useState([]);
   const { tableProps, getData } = useTable(props["corpInfoList"], {
     form,
@@ -278,8 +279,6 @@ function List(props) {
           requestChangeCompanyName={props["corpInfoChangeCompanyName"]}
           requestCorplnfoCheckCorpcode={props["corplnfoCheckCorpcode"]}
           requestCorplnfoCheckCorpName={props["corplnfoCheckCorpName"]}
-
-          loding={props.enterprise.userLoading}
           onCancel={() => {
             setAddModalOpen(false);
             setCurrentId("");
@@ -406,14 +405,11 @@ 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}
@@ -455,9 +451,6 @@ function AddModalComponent(props) {
             label: "相关方类型",
             render: FORM_ITEM_RENDER_ENUM.SELECT,
             items: ENTERPRISE_TYPE,
-            componentProps: {
-              disabled: props.currentId,
-            },
           },
           {
             name: "selectfromList",

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

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

src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js

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

src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js

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

src/pages/Container/Supervision/StakeholderUnit/User/UserList/index.js

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

src/pages/Container/Supervision/Supervision/CorpInfo/Update/index.js

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

src/pages/Container/Supervision/Supervision/Department/index.js

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

src/pages/Container/Supervision/Supervision/User/Add/index.js

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

src/pages/Container/Supervision/Supervision/User/List/index.js

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