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.10"
+    "zy-react-library": "^1.0.153"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

src/main.js

@@ -6,7 +6,6 @@ import "dayjs/locale/zh-cn";
 import "../blessed_by_buddha";
 
 require("antd/dist/reset.css");
-require("zy-react-library/css/common.less");
 
 dayjs.locale("zh-cn");
 setJJBCommonAntdMessage(message);

src/pages/Container/BusinessLicense/index.js

@@ -67,7 +67,7 @@ function Department(props) {
             onFinish={getData}
           />
           <Table
-            loding={props.businessLicense.corpQualificationLoading}
+            loading={props.businessLicense.corpQualificationLoading}
             toolBarRender={() => (
               <>
                 <Button
@@ -184,7 +184,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={props.loding}
+      loading={props.loding}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -1,9 +1,8 @@
 import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
-import { Button, Descriptions, Divider, Form, Input, Modal } from "antd";
 
+import { Button, Descriptions, Divider, Form, Input, Modal } from "antd";
 import { useEffect, useState } from "react";
-import Page from "zy-react-library/components/Page";
 import PreviewImg from "zy-react-library/components/PreviewImg";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 
@@ -48,8 +47,11 @@ function Info(props) {
     }
   };
   return (
-    <div>
+    <div
-      <Page isShowAllAction={false}>
+      style={{
+        padding: 20,
+      }}
+    >
       <Divider orientation="left">基本信息</Divider>
       <Descriptions
         bordered
@@ -227,7 +229,7 @@ function Info(props) {
           },
         ]}
         column={2}
-          loding={getFileLoading}
+        loading={getFileLoading}
         labelStyle={{
           width: 200,
         }}
@@ -342,7 +344,6 @@ function Info(props) {
             </Form>
           </Modal>
         )}
-      </Page>
     </div>
   );
 }

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

@@ -2,13 +2,14 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Form, message } from "antd";
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import Map from "zy-react-library/components/Map";
-import Page from "zy-react-library/components/Page";
 import AreaSelect from "zy-react-library/components/SelectTree/Area";
 import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
 import IndustrySelect from "zy-react-library/components/SelectTree/Industry";
 import Upload from "zy-react-library/components/Upload";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
 import useGetFile from "zy-react-library/hooks/useGetFile";
@@ -255,9 +256,12 @@ function Update(props) {
   }
   return (
     <>
-
+      <HeaderBack title="编辑" />
-      <Page headerTitle="编辑" isShowFooter={false}>
+      <div
-        <div>
+        style={{
+          padding: 20,
+        }}
+      >
         <FormBuilder
           form={form}
           values={{
@@ -277,7 +281,7 @@ function Update(props) {
             whetherLiquidammoniaFlag: 0,
             whetherPipelineFlag: 0,
           }}
-            confirmLoading={
+          loading={
             deleteFileLoading
             || uploadFileLoading
             || getFileLoading
@@ -603,8 +607,6 @@ function Update(props) {
           onValuesChange={onValuesChange}
         />
       </div>
-
-      </Page>
     </>
   );
 }

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

@@ -1,11 +1,11 @@
-import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
+
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
-
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
 import { NS_USER } from "~/enumerate/namespace";
@@ -20,7 +20,7 @@ const ENTERPRISE_TYPE = [
     name: "集团单位",
   },
 ];
-function ChangeList(props) {
+function List(props) {
   const [form] = Form.useForm();
   const queryParams = useGetUrlQuery();
   const { tableProps, getData } = useTable(props["userEmploymentLogAll"], {
@@ -35,8 +35,12 @@ function ChangeList(props) {
   });
   return (
     <div>
-
+      <HeaderBack title="变更记录列表" />
-      <Page headerTitle="变更记录列表">
+      <div
+        style={{
+          padding: 20,
+        }}
+      >
         <Search
           form={form}
           options={[
@@ -87,7 +91,6 @@ function ChangeList(props) {
             {
               title: "操作",
               width: 200,
-              hidden: !(props.permission("qyyhzt-bgjl-info")),
               render: (_, record) => (
                 <Space>
 
@@ -105,8 +108,8 @@ function ChangeList(props) {
           ]}
           {...tableProps}
         />
-      </Page>
+      </div>
     </div>
   );
 }
-export default Connect([NS_USER], true)(Permission(ChangeList));
+export default Connect([NS_USER], true)(List);

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

@@ -1,9 +1,10 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Divider, message, Modal } from "antd";
 import { useEffect, useState } from "react";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
+
 import { NS_ENTERPRISE, NS_USER } from "~/enumerate/namespace";
 
 function ChangeView(props) {
@@ -63,30 +64,11 @@ function ChangeView(props) {
 
   return (
     <div>
-
+      <HeaderBack title="变更记录" />
-      <Page
+      <div
-        headerTitle="变更记录"
+        style={{
-        extraActionButtons={
+          padding: 20,
-
+        }}
-          queryParams["type"] === "disposal"
-          && (
-            <div>
-
-              <Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
-                驳回
-              </Button>
-
-              <Button
-                type="primary"
-
-                onClick={onSubmit}
-
-              >
-                通过
-              </Button>
-            </div>
-          )
-        }
       >
         <Divider orientation="left">变更前信息</Divider>
         <Descriptions
@@ -175,7 +157,33 @@ function ChangeView(props) {
           ]}
           dataSource={info.userJobHandoverCOList}
         />
-      </Page>
+      </div>
+
+      {
+        queryParams["type"] === "disposal"
+
+        && (
+          <div style={{ textAlign: "center", height: 50, marginTop: 20 }} className="no-print">
+
+            <Button style={{ marginRight: 20 }} onClick={onGoBack}>
+              取消
+            </Button>
+
+            <Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
+              驳回
+            </Button>
+
+            <Button
+              type="primary"
+
+              onClick={onSubmit}
+
+            >
+              通过
+            </Button>
+          </div>
+        )
+      }
 
     </div>
 

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

@@ -1,16 +1,15 @@
-import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Form, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
-
 import Search from "zy-react-library/components/Search";
+
 import Table from "zy-react-library/components/Table";
 import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useTable from "zy-react-library/hooks/useTable";
-
 import { getLabelName } from "zy-react-library/utils";
+
 import { NS_USER } from "~/enumerate/namespace";
 import { UseDecodeIdCard } from "~/utils";
 
@@ -106,10 +105,10 @@ function List(props) {
                   title: "手机号",
                   dataIndex: "phone",
                 },
-                // {
+                {
-                //   title: "中台是否存在",
+                  title: "中台是否存在",
-                //   dataIndex: "name",
+                  dataIndex: "name",
-                // },
+                },
                 {
                   title: "状态",
                   dataIndex: "name",
@@ -125,7 +124,7 @@ function List(props) {
                 },
                 {
                   title: "操作",
-                  width: 220,
+                  width: 180,
                   render: (_, record) => (
                     <Space>
                       <Button
@@ -138,10 +137,6 @@ function List(props) {
                       >
                         查看
                       </Button>
-                      {
-                        props.permission("qyd-qyyhzt-record")
-
-                        && (
                       <Button
                         type="link"
                         onClick={() =>
@@ -149,11 +144,6 @@ function List(props) {
                       >
                         变更记录
                       </Button>
-                        )
-                      }
-                      {
-                        props.permission("qyd-qyyhzt-disposal")
-                        && (
                       <Button
                         type="link"
                         danger
@@ -162,8 +152,6 @@ function List(props) {
                       >
                         变更处置
                       </Button>
-                        )
-                      }
                     </Space>
                   ),
                 },
@@ -315,4 +303,4 @@ function AddModalComponent(props) {
   );
 }
 const AddModal = AddModalComponent;
-export default Connect([NS_USER], true)(Permission(List));
+export default Connect([NS_USER], true)(List);

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

@@ -277,7 +277,6 @@ function AddModalComponent(props) {
       width={800}
       onOk={() => form.submit()}
       onCancel={onCancel}
-      confirmLoading={props.loding}
     >
       <FormBuilder
         form={form}

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

@@ -225,7 +225,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={props.loding}
+      loading={props.loding}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -5,13 +5,13 @@ import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
 import AddIcon from "zy-react-library/components/Icon/AddIcon";
 
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import DictionarySelect from "zy-react-library/components/Select/Dictionary";
 import AreaSelect from "zy-react-library/components/SelectTree/Area";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useTable from "zy-react-library/hooks/useTable";
+
 import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
 import { getLabelName } from "zy-react-library/utils";
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
@@ -103,8 +103,11 @@ function List(props) {
     form.setFieldValue("cityRecord", []);
   };
   return (
-    <div>
+    <div
-      <Page isShowAllAction={false}>
+      style={{
+        padding: 20,
+      }}
+    >
 
       <Search
         form={form}
@@ -283,7 +286,6 @@ function List(props) {
           }}
         />
       )}
-      </Page>
     </div>
   );
 }
@@ -420,7 +422,7 @@ function AddModalComponent(props) {
         form={form}
         span={24}
 
-        confirmLoading={props.loading}
+        loading={props.loading}
         options={[
           {
             name: "corpName",

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

@@ -1,14 +1,14 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Divider, Form, Input, Modal, QRCode } from "antd";
 import { useEffect, useState } from "react";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 
-import Page from "zy-react-library/components/Page";
 import PreviewImg from "zy-react-library/components/PreviewImg";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useGetFile from "zy-react-library/hooks/useGetFile";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
-
 import { getLabelName } from "zy-react-library/utils";
+
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
 import { getAreaNamePath, getCorpTypeNamePath } from "~/utils";
 
@@ -74,12 +74,12 @@ function View(props) {
   };
   return (
     <div>
-
+      <HeaderBack title="查看" />
-      <Page
+      <div
-        headerTitle="查看"
+        style={{
-        isShowFooter={false}
+          padding: 20,
+        }}
       >
-
         <Divider orientation="left">基本信息</Divider>
         <Descriptions
           bordered
@@ -241,7 +241,7 @@ function View(props) {
             },
           ]}
           column={2}
-          loding={getFileLoading}
+          loading={getFileLoading}
           labelStyle={{
             width: 200,
           }}
@@ -266,7 +266,7 @@ function View(props) {
           }}
           contentStyle={{ width: "40%" }}
         />
-      </Page>
+      </div>
       {corpInfoQrCodeOpen && (
         <CorpInfoQrCode
           row={info}

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

@@ -3,16 +3,16 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
 
 import { useState } from "react";
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import AreaSelect from "zy-react-library/components/SelectTree/Area";
-
 import Table from "zy-react-library/components/Table";
+
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
 import { getAreaNamePath } from "~/utils";
+
 // import { getLabelName } from "zy-react-library/utils";
 
 const ENTERPRISE_TYPE = [
@@ -61,8 +61,11 @@ function List(props) {
     form.setFieldValue("cityRecord", []);
   };
   return (
-    <div>
+    <div
-      <Page isShowAllAction={false}>
+      style={{
+        padding: 20,
+      }}
+    >
       <Search
         form={form}
         onFinish={() => onFinish()}
@@ -163,7 +166,6 @@ function List(props) {
         ]}
         {...tableProps}
       />
-      </Page>
     </div>
   );
 }

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

@@ -2,14 +2,15 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Form, Input, message, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
-
-import Page from "zy-react-library/components/Page";
 import PreviewImg from "zy-react-library/components/PreviewImg";
+
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
+
 import useGetFile from "zy-react-library/hooks/useGetFile";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
@@ -60,22 +61,6 @@ function List(props) {
       },
     });
   };
-
-  // 清除伪类
-  useEffect(() => {
-    const style = document.createElement("style");
-    style.innerHTML = `
-    .search-layout::after {
-      content: none !important;
-      display: none !important;
-    }
-  `;
-    document.head.appendChild(style);
-    // 清理函数，在组件卸载时移除样式
-    return () => {
-      document.head.removeChild(style);
-    };
-  }, []);
   const onTreeChange = (selectedKeys) => {
     const key = selectedKeys[0] || null;
     setSelectedNodeId(key);
@@ -83,21 +68,23 @@ function List(props) {
   };
   return (
     <div>
-
+      <HeaderBack title="相关方企业人员列表" />
-      <Page headerTitle="相关方企业人员列表" isShowFooter={false}>
+      <div
+        style={{
+          padding: 20,
+        }}
+      >
         <div
           style={{
             display: "flex",
             gap: 20,
           }}
-
         >
           <LeftTree onSelect={onTreeChange} params={{ eqCorpinfoId: queryParams["id"] }} />
           <div
             style={{
               flex: 1,
             }}
-
           >
             <Search
               form={form}
@@ -114,10 +101,8 @@ function List(props) {
                 },
               ]}
               onFinish={getData}
-
             />
             <Table
-
               columns={[
                 {
                   title: "用户名",
@@ -143,9 +128,9 @@ function List(props) {
                   title: "操作",
                   render: (_, record) => (
                     <Space>
-                      {
+                      {/* { */}
-                        props.permission("xgf-yhgl-userList-info")
+                      {/*  props.permission("qyd-xgf-yhgl-info") */}
-                        && (
+                      {/*  && ( */}
                       <Button
                         type="link"
                         onClick={() => {
@@ -155,18 +140,18 @@ function List(props) {
                       >
                         查看
                       </Button>
-
+                      {/* // */}
-                        )
+                      {/* //   ) */}
-                      }
+                      {/* // } */}
-                      {props.permission("xgf-yhgl-userList-resetPassword")
+                      {/* {props.permission("qyd-xgf-yhgl-resetPassword") */}
-                        && (
+                      {/*  && ( */}
                       <Button
                         type="link"
                         onClick={() => onResetPassword(record.id)}
                       >
                         重置密码
                       </Button>
-                        )}
+                      {/* )} */}
 
                     </Space>
                   ),
@@ -190,7 +175,7 @@ function List(props) {
             }}
           />
         )}
-      </Page>
+      </div>
     </div>
   );
 }

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

@@ -2,9 +2,10 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Form, message } from "antd";
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import Upload from "zy-react-library/components/Upload";
+
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@@ -262,9 +263,7 @@ function Add(props) {
   };
   return (
     <>
-
+      <HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
-      <Page headerTitle={queryParams["id"] ? "编辑" : "新增"} isShowFooter={false}>
-
       <div
         style={{
           paddingBottom: 10,
@@ -275,7 +274,7 @@ function Add(props) {
           values={{
             departmentLeaderFlag: 0,
           }}
-            confirmLoading={uploadFileLoading || props.user.userLoading}
+          loading={uploadFileLoading || props.user.userLoading}
           options={[
             {
               name: "roleId",
@@ -447,10 +446,7 @@ function Add(props) {
           onFinish={onSubmit}
           onValuesChange={onValuesChange}
         />
-
       </div>
-
-      </Page>
     </>
   );
 }

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

@@ -135,7 +135,7 @@ function List(props) {
         <div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
           <Search
             form={form}
-            labelCol={{ span: 3 }}
+            labelCol={{ span: 8 }}
             options={[
               {
                 name: "likeName",
@@ -180,7 +180,6 @@ function List(props) {
                     <Button
                       type="primary"
                       icon={<ImportIcon />}
-                      ghost
                       onClick={() => {
                         setImportOpen(true);
                       }}
@@ -195,7 +194,6 @@ function List(props) {
                     <Button
                       type="primary"
                       icon={<ExportIcon />}
-                      ghost
                       onClick={() => onExportExcel()}
                     >
                       导出Excel

src/pages/Container/PersonnelCertificate/index.js

@@ -187,7 +187,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={props.loding}
+      loading={props.loding}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -4,18 +4,17 @@ import { Button, Form, message, Modal, QRCode } from "antd";
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
 import Map from "zy-react-library/components/Map";
-import Page from "zy-react-library/components/Page";
 import AreaSelect from "zy-react-library/components/SelectTree/Area";
-
 import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
+
 import IndustrySelect from "zy-react-library/components/SelectTree/Industry";
 import Upload from "zy-react-library/components/Upload";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
 import useGetFile from "zy-react-library/hooks/useGetFile";
-
 import useUploadFile from "zy-react-library/hooks/useUploadFile";
+
 import {
   PHONE,
   UNIFIED_SOCIAL_CREDIT_CODE,
@@ -285,11 +284,15 @@ function CorpInfo(props) {
   };
   return (
     <>
-      <Page isShowAllAction={false}>
+      <div
+        style={{
+          paddingBottom: 10,
+        }}
+      >
         <FormBuilder
           showCancelButton={false}
           form={form}
-          confirmLoading={
+          loading={
             deleteFileLoading
             || uploadFileLoading
             || getFileLoading
@@ -495,7 +498,7 @@ function CorpInfo(props) {
           onValuesChange={onValuesChange}
 
         />
-      </Page>
+      </div>
       {corpInfoQrCodeOpen && (
         <CorpInfoQrCode
           row={info}

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

@@ -312,7 +312,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={props.loading}
+      loading={props.loading}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -83,7 +83,7 @@ function Department(props) {
             onFinish={getData}
           />
           <Table
-            loding={getFileLoading}
+            loading={getFileLoading}
             columns={[
               {
                 title: "姓名",

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

@@ -83,7 +83,7 @@ function Department(props) {
             onFinish={getData}
           />
           <Table
-            loding={getFileLoading}
+            loading={getFileLoading}
             columns={[
               {
                 title: "姓名",

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

@@ -2,21 +2,21 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Form, message } from "antd";
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
 import Upload from "zy-react-library/components/Upload";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
-
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
+
 import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
 import useGetFile from "zy-react-library/hooks/useGetFile";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useUploadFile from "zy-react-library/hooks/useUploadFile";
 import nation from "zy-react-library/json/nation.json";
 import { ID_NUMBER, PHONE } from "zy-react-library/regular";
-
 import { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils";
+
 import { NS_USER } from "~/enumerate/namespace";
 import { getAgeByIdCard, getBirthDateFromIdCard, useDebounce, UseDecodeIdCard } from "~/utils";
 
@@ -274,14 +274,15 @@ function Add(props) {
   };
   return (
     <>
-
+      <HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
-      <Page
+      <div
-        headerTitle={queryParams["id"] ? "编辑" : "新增"}
+        style={{
-        isShowFooter={false}
+          paddingBottom: 10,
+        }}
       >
         <FormBuilder
           form={form}
-          confirmLoading={
+          loading={
             deleteFileLoading
             || uploadFileLoading
             || getFileLoading
@@ -463,9 +464,6 @@ function Add(props) {
             {
               name: "flowFlag",
               label: "是否流动人员",
-              componentProps: {
-                disabled: queryParams["id"],
-              },
               render: FORM_ITEM_RENDER_ENUM.RADIO,
               items: WHETHER_ENUM,
 
@@ -630,7 +628,7 @@ function Add(props) {
           onFinish={onSubmit}
           onValuesChange={onValuesChange}
         />
-      </Page>
+      </div>
     </>
   );
 }

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

@@ -6,6 +6,7 @@ import AddIcon from "zy-react-library/components/Icon/AddIcon";
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
 import PreviewImg from "zy-react-library/components/PreviewImg";
 // import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
+
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
@@ -98,7 +99,7 @@ function List(props) {
         <div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
           <Search
             form={form}
-            labelCol={{ span: 3 }}
+            labelCol={{ span: 8 }}
             options={[
               {
                 name: "likeName",
@@ -399,7 +400,7 @@ function AddModalComponent(props) {
         }}
         onOk={form.submit}
         onCancel={onCancel}
-        confirmLoading={getFileLoading}
+        loading={getFileLoading}
         footer={[
           <Button key="return" onClick={onCancel}>
             关闭

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

@@ -1,7 +1,7 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Divider, message, Modal } from "antd";
 import { useEffect, useState } from "react";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import { NS_USER } from "~/enumerate/namespace";
@@ -61,24 +61,17 @@ function ResignationReview(props) {
     });
   };
 
+  const onGoBack = () => {
+    window.history.back();
+  };
+
   return (
     <div>
-
+      <HeaderBack title="信息确认" />
-      <Page
+      <div
-        headerTitle="信息确认"
+        style={{
-        extraActionButtons={(
+          padding: 20,
-          <div>
+        }}
-            <Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
-              驳回
-            </Button>
-            <Button
-              type="primary"
-              onClick={onSubmit}
-            >
-              通过
-            </Button>
-          </div>
-        )}
       >
         <Divider orientation="left">人员信息</Divider>
         <Descriptions
@@ -134,7 +127,27 @@ function ResignationReview(props) {
           ]}
           dataSource={info.userJobHandoverCOList}
         />
-      </Page>
+      </div>
+
+      <div style={{ textAlign: "center", height: 50, marginTop: 20 }} className="no-print">
+
+        <Button style={{ marginRight: 20 }} onClick={onGoBack}>
+          取消
+        </Button>
+
+        <Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
+          驳回
+        </Button>
+
+        <Button
+          type="primary"
+
+          onClick={onSubmit}
+
+        >
+          通过
+        </Button>
+      </div>
 
     </div>
 

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

@@ -116,7 +116,7 @@ function SecurityPersonnel(props) {
               onFinish={getData}
             />
             <Table
-              loding={getFileLoading}
+              loading={getFileLoading}
               toolBarRender={() => (
                 <>
                   {
@@ -316,7 +316,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={
+      loading={
         deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
       }
       onOk={form.submit}

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

@@ -118,7 +118,7 @@ function SpecialPersonnel(props) {
               onFinish={getData}
             />
             <Table
-              loding={getFileLoading}
+              loading={getFileLoading}
               toolBarRender={() => (
                 <>
                   {
@@ -350,7 +350,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={
+      loading={
         deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
       }
       onOk={form.submit}

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

@@ -4,14 +4,14 @@ import { Button, Form, message, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
 import AddIcon from "zy-react-library/components/Icon/AddIcon";
-// import { getLabelName } from "zy-react-library/utils";
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import DictionarySelect from "zy-react-library/components/Select/Dictionary";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useTable from "zy-react-library/hooks/useTable";
 import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
+// import { getLabelName } from "zy-react-library/utils";
+
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
 import { useDebounce } from "~/utils";
 
@@ -134,7 +134,11 @@ function List(props) {
     });
   };
   return (
-    <Page isShowAllAction={false}>
+    <div
+      style={{
+        padding: 20,
+      }}
+    >
       <Search
         form={form}
         options={[
@@ -162,7 +166,7 @@ function List(props) {
         onFinish={getData}
       />
       <Table
-        loding={props.enterprise.enterpriseLoading}
+        loading={props.enterprise.enterpriseLoading}
         toolBarRender={() => (
           <>
             {
@@ -346,7 +350,7 @@ function List(props) {
           }}
         />
       )}
-    </Page>
+    </div>
   );
 }
 function AddModalComponent(props) {
@@ -463,7 +467,7 @@ function AddModalComponent(props) {
       <FormBuilder
         form={form}
         span={24}
-        confirmLoading={props.loading}
+        loading={props.loading}
         options={[
           {
             name: "corpName",

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

@@ -1,7 +1,8 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Descriptions, Divider } from "antd";
+
 import { useEffect, useState } from "react";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import { getLabelName } from "zy-react-library/utils";
 
@@ -48,9 +49,11 @@ function View(props) {
   }, []);
   return (
     <div>
-      <Page
+      <HeaderBack title="查看" />
-        headerTitle="查看"
+      <div
-        isShowFooter={false}
+        style={{
+          padding: 20,
+        }}
       >
         <Divider orientation="left">企业信息</Divider>
         <Descriptions
@@ -94,7 +97,7 @@ function View(props) {
             width: 200,
           }}
         />
-      </Page>
+      </div>
     </div>
   );
 }

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

@@ -1,12 +1,11 @@
 import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
-
 import useTable from "zy-react-library/hooks/useTable";
+
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
 
 const ENTERPRISE_TYPE = [
@@ -63,9 +62,22 @@ function List(props) {
     },
   });
   return (
-    <Page isShowAllAction={false}>
+    <div
-      <div>
+      style={{
-        <div>
+        padding: 20,
+      }}
+    >
+      <div
+        style={{
+          display: "flex",
+          gap: 20,
+        }}
+      >
+        <div
+          style={{
+            flex: 1,
+          }}
+        >
           <Search
             form={form}
             options={[
@@ -142,7 +154,7 @@ function List(props) {
               },
               {
                 title: "操作",
-                width: 120,
+                width: 200,
                 hidden: !(props.permission("zgsbmgl-list")),
                 render: (_, record) => (
                   <Space>
@@ -161,7 +173,7 @@ function List(props) {
           />
         </div>
       </div>
-    </Page>
+    </div>
   );
 }
 export default Connect([NS_ENTERPRISE], true)(Permission(List));

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

@@ -2,8 +2,9 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Form, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
+import HeaderBack from "zy-react-library/components/HeaderBack";
+
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
-import Page from "zy-react-library/components/Page";
 import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 
@@ -35,7 +36,12 @@ function View(props) {
   };
   return (
     <div>
-      <Page headerTitle="查看" isShowFooter={false}>
+      <HeaderBack title="查看" />
+      <div
+        style={{
+          padding: 20,
+        }}
+      >
         <div
           style={{
             display: "flex",
@@ -72,7 +78,7 @@ function View(props) {
                 {
                   title: "操作",
                   width: 200,
-                  hidden: !(props.permission("jgd-bmgl-info-info")),
+                  hidden: !(props.permission("zgsbmgl-info")),
                   render: (_, record) => (
                     <Space>
                       <Button
@@ -102,7 +108,7 @@ function View(props) {
             setCurrentId("");
           }}
         />
-      </Page>
+      </div>
     </div>
   );
 }

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

@@ -4,7 +4,6 @@ import { Button, Form, message, Space } from "antd";
 import { useState } from "react";
 import MapSelector from "zy-react-library/components/Map/MapSelector";
 
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
@@ -84,7 +83,11 @@ function List(props) {
     // props.
   };
   return (
-    <Page isShowAllAction={false}>
+    <div
+      style={{
+        padding: 20,
+      }}
+    >
       <Search
         form={form}
         options={[
@@ -198,7 +201,7 @@ function List(props) {
         onClose={() => setVisible(false)}
         onConfirm={handleConfirm}
       />
-    </Page>
+    </div>
   );
 }
 export default Connect([NS_ENTERPRISE], true)(Permission(List));

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

@@ -1,8 +1,8 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Descriptions, Divider, Form, Input, Modal } from "antd";
 import { useEffect, useState } from "react";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 
-import Page from "zy-react-library/components/Page";
 import PreviewImg from "zy-react-library/components/PreviewImg";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useGetFile from "zy-react-library/hooks/useGetFile";
@@ -46,13 +46,17 @@ function View(props) {
 
   return (
     <div>
-
+      <HeaderBack title="查看" />
-      <Page headerTitle="查看" isShowFooter={false}>
+      <div
+        style={{
+          padding: 20,
+        }}
+      >
         <div>
           <Divider orientation="left">基本信息</Divider>
           <Descriptions
             bordered
-            loding={getFileLoading}
+            loading={getFileLoading}
             items={[
               {
                 label: "公司名称",
@@ -295,7 +299,7 @@ function View(props) {
           {/*  ]} */}
           {/* /> */}
         </div>
-      </Page>
+      </div>
       {isModalOpen
         && (
           <Modal

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

@@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Form, Input, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
-import Page from "zy-react-library/components/Page";
 import PreviewImg from "zy-react-library/components/PreviewImg";
+
 import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
@@ -11,7 +11,6 @@ import { getLabelName } from "zy-react-library/utils";
 
 import { NS_USER } from "~/enumerate/namespace";
 import { UseDecodeIdCard } from "~/utils";
-import {Permission} from "@cqsjjb/jjb-common-decorator/permission";
 
 function List(props) {
   const queryParams = useGetUrlQuery();
@@ -37,7 +36,11 @@ function List(props) {
     getData();
   };
   return (
-    <Page headerTitle="查看" isShowFooter={false}>
+    <div
+      style={{
+        padding: 20,
+      }}
+    >
       <div
         style={{
           display: "flex",
@@ -67,7 +70,6 @@ function List(props) {
               {
                 title: "操作",
                 width: 300,
-                hidden: !(props.permission("jgd-yhgl-info-info")),
                 render: (_, record) => (
                   <Space>
                     <Button
@@ -100,7 +102,7 @@ function List(props) {
           setCurrentId("");
         }}
       />
-    </Page>
+    </div>
   );
 }
 function AddModalComponent(props) {
@@ -333,4 +335,4 @@ function AddModalComponent(props) {
   );
 }
 const AddModal = AddModalComponent;
-export default Connect([NS_USER], true)(Permission(List));
+export default Connect([NS_USER], true)(List);

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

@@ -1,11 +1,11 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
-
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+
 import useTable from "zy-react-library/hooks/useTable";
 import { NS_USER } from "~/enumerate/namespace";
 
@@ -33,9 +33,11 @@ function List(props) {
   });
   return (
     <div>
-      <Page
+      <HeaderBack title="变更记录列表" />
-        headerTitle="变更记录列表"
+      <div
-        isShowFooter={false}
+        style={{
+          padding: 20,
+        }}
       >
         <Search
           form={form}
@@ -104,7 +106,7 @@ function List(props) {
           ]}
           {...tableProps}
         />
-      </Page>
+      </div>
     </div>
   );
 }

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

@@ -1,10 +1,10 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Divider, message, Modal } from "antd";
 import { useEffect, useState } from "react";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import Table from "zy-react-library/components/Table";
-
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
+
 import { NS_ENTERPRISE, NS_USER } from "~/enumerate/namespace";
 
 function ChangeView(props) {
@@ -64,9 +64,11 @@ function ChangeView(props) {
 
   return (
     <div>
-      <Page
+      <HeaderBack title="变更记录" />
-        headerTitle="变更记录"
+      <div
-        isShowFooter={false}
+        style={{
+          padding: 20,
+        }}
       >
         <Divider orientation="left">变更前信息</Divider>
         <Descriptions
@@ -155,7 +157,7 @@ function ChangeView(props) {
           ]}
           dataSource={info.userJobHandoverCOList}
         />
-      </Page>
+      </div>
 
       {
         queryParams["type"] === "disposal"

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

@@ -1,13 +1,12 @@
 import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Form, Space } from "antd";
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useTable from "zy-react-library/hooks/useTable";
-
 import { getLabelName } from "zy-react-library/utils";
+
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
 
 const ENTERPRISE_TYPE = [
@@ -33,7 +32,11 @@ function List(props) {
   });
   return (
 
-    <Page isShowAllAction={false}>
+    <div
+      style={{
+        padding: 20,
+      }}
+    >
       <Search
         form={form}
         options={[
@@ -108,7 +111,7 @@ function List(props) {
         ]}
         {...tableProps}
       />
-    </Page>
+    </div>
   );
 }
 export default Connect([NS_ENTERPRISE], true)(Permission(List));

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

@@ -1,18 +1,17 @@
-import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Form, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
-
-import Page from "zy-react-library/components/Page";
 import Search from "zy-react-library/components/Search";
+
 import Table from "zy-react-library/components/Table";
 import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
-
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
+
 import { NS_USER } from "~/enumerate/namespace";
 import { UseDecodeIdCard } from "~/utils";
 
@@ -45,21 +44,6 @@ function List(props) {
       };
     },
   });
-  // 清除伪类
-  useEffect(() => {
-    const style = document.createElement("style");
-    style.innerHTML = `
-    .search-layout::after {
-      content: none !important;
-      display: none !important;
-    }
-  `;
-    document.head.appendChild(style);
-    // 清理函数，在组件卸载时移除样式
-    return () => {
-      document.head.removeChild(style);
-    };
-  }, []);
   const onTreeChange = (selectedKeys) => {
     const key = selectedKeys[0] || null;
     setSelectedNodeId(key);
@@ -67,9 +51,12 @@ function List(props) {
   };
   return (
     <div>
-      <Page
+      <HeaderBack title="列表" />
-        headerTitle="列表"
+
-        isShowFooter={false}
+      <div
+        style={{
+          padding: 20,
+        }}
       >
         <div
           style={{
@@ -156,9 +143,6 @@ function List(props) {
                       >
                         查看
                       </Button>
-                      {
-                        props.permission("qyyuzt-info-record")
-                        && (
                       <Button
                         type="link"
                         onClick={() =>
@@ -166,11 +150,6 @@ function List(props) {
                       >
                         变更记录
                       </Button>
-                        )
-                      }
-                      {
-                        props.permission("qyyuzt-info-disposal")
-                        && (
                       <Button
                         type="link"
                         danger
@@ -179,8 +158,6 @@ function List(props) {
                       >
                         变更处置
                       </Button>
-                        )
-                      }
                     </Space>
                   ),
                 },
@@ -201,7 +178,7 @@ function List(props) {
             setCurrentId("");
           }}
         />
-      </Page>
+      </div>
     </div>
   );
 }
@@ -332,4 +309,4 @@ function AddModalComponent(props) {
   );
 }
 const AddModal = AddModalComponent;
-export default Connect([NS_USER], true)(Permission(List));
+export default Connect([NS_USER], true)(List);

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

@@ -241,7 +241,7 @@ function View(props) {
             },
           ]}
           column={2}
-          loding={getFileLoading}
+          loading={getFileLoading}
           labelStyle={{
             width: 200,
           }}

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

@@ -113,7 +113,7 @@ function Department(props) {
               onFinish={getData}
             />
             <Table
-              loding={getFileLoading}
+              loading={getFileLoading}
               // toolBarRender={() => (
               //   <>
               //     <Button
@@ -290,7 +290,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={
+      loading={
         deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
       }
       onOk={form.submit}

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

@@ -113,7 +113,7 @@ function Department(props) {
               onFinish={getData}
             />
             <Table
-              loding={getFileLoading}
+              loading={getFileLoading}
               // toolBarRender={() => (
               //   <>
               //     <Button
@@ -318,7 +318,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      loding={
+      loading={
         deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
       }
       onOk={form.submit}

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

@@ -2,15 +2,15 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Form, Input, message, Modal, Space } from "antd";
 import { useEffect, useState } from "react";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
-import Page from "zy-react-library/components/Page";
-
 import PreviewImg from "zy-react-library/components/PreviewImg";
+
 import Search from "zy-react-library/components/Search";
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
-
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
+
 import useGetFile from "zy-react-library/hooks/useGetFile";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
@@ -45,7 +45,6 @@ function List(props) {
       bianma: 0,
     },
   ];
-
   const onResetPassword = (id) => {
     Modal.confirm({
       title: "提示",
@@ -62,21 +61,6 @@ function List(props) {
       },
     });
   };
-  // 清除伪类
-  useEffect(() => {
-    const style = document.createElement("style");
-    style.innerHTML = `
-    .search-layout::after {
-      content: none !important;
-      display: none !important;
-    }
-  `;
-    document.head.appendChild(style);
-    // 清理函数，在组件卸载时移除样式
-    return () => {
-      document.head.removeChild(style);
-    };
-  }, []);
   const onTreeChange = (selectedKeys) => {
     const key = selectedKeys[0] || null;
     setSelectedNodeId(key);
@@ -84,10 +68,11 @@ function List(props) {
   };
   return (
     <div>
-
+      <HeaderBack title="相关方企业人员列表" />
-      <Page
+      <div
-        headerTitle="相关方企业人员列表"
+        style={{
-        isShowFooter={false}
+          padding: 20,
+        }}
       >
         <div
           style={{
@@ -140,20 +125,14 @@ function List(props) {
                   title: "操作",
                   render: (_, record) => (
                     <Space>
-                      {
+
-                        props.permission("jgd-yhgl-userList-resetPassword")
-                        && (
                       <Button
                         type="link"
                         onClick={() => onResetPassword(record.id)}
                       >
                         重置密码
                       </Button>
-                        )
+
-                      }
-                      {
-                        props.permission("jgd-yhgl-userList-info")
-                        && (
                       <Button
                         type="link"
                         onClick={() => {
@@ -163,8 +142,6 @@ function List(props) {
                       >
                         查看
                       </Button>
-                        )
-                      }
 
                     </Space>
                   ),
@@ -188,7 +165,7 @@ function List(props) {
             }}
           />
         )}
-      </Page>
+      </div>
     </div>
   );
 }

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

@@ -2,9 +2,10 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Form, message } from "antd";
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import AreaSelect from "zy-react-library/components/SelectTree/Area";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import {
   UNIFIED_SOCIAL_CREDIT_CODE,
@@ -125,14 +126,16 @@ function Update(props) {
 
   return (
     <>
-      <Page
+      <HeaderBack title="编辑" />
-        headerTitle="编辑"
+      <div
-        isShowFooter={false}
+        style={{
+          padding: 20,
+        }}
       >
         <FormBuilder
           form={form}
 
-          confirmLoading={
+          loading={
 
             props.enterprise.enterpriseLoading
           }
@@ -190,7 +193,7 @@ function Update(props) {
           onFinish={onSubmit}
           onValuesChange={onValuesChange}
         />
-      </Page>
+      </div>
     </>
   );
 }

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

@@ -330,7 +330,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={props.loading}
+      loading={props.loading}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -227,7 +227,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={props.loading}
+      loading={props.loading}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -2,21 +2,22 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Form, message } from "antd";
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
-import Page from "zy-react-library/components/Page";
+import HeaderBack from "zy-react-library/components/HeaderBack";
 import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
 import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary";
-
 import Upload from "zy-react-library/components/Upload";
+
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useUploadFile from "zy-react-library/hooks/useUploadFile";
 import nation from "zy-react-library/json/nation.json";
 import { ID_NUMBER, PHONE } from "zy-react-library/regular";
-
 import { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils";
+
 import { NS_USER } from "~/enumerate/namespace";
 import { useDebounce, UseDecodeIdCard } from "~/utils";
+
 // import useGetFile from "zy-react-library/hooks/useGetFile";
 
 const WHETHER_ENUM = [
@@ -261,16 +262,18 @@ function Add(props) {
   };
   return (
     <>
-      <Page
+      <HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
-        headerTitle={queryParams["id"] ? "编辑" : "新增"}
+      <div
-        isShowFooter={false}
+        style={{
+          paddingBottom: 10,
+        }}
       >
         <FormBuilder
           form={form}
           values={{
             departmentLeaderFlag: 0,
           }}
-          confirmLoading={uploadFileLoading || props.user.userLoading}
+          loading={uploadFileLoading || props.user.userLoading}
           options={[
             {
               name: "roleId",
@@ -459,7 +462,7 @@ function Add(props) {
           onFinish={onSubmit}
           onValuesChange={onValuesChange}
         />
-      </Page>
+      </div>
     </>
   );
 }

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

@@ -168,7 +168,7 @@ function List(props) {
           />
           <Table
 
-            loding={props.user.userLoading}
+            loading={props.user.userLoading}
             rowSelection={{
               selectedRowKeys,
               onChange: selectedRowKeys => setSelectedRowKeys(selectedRowKeys),
@@ -195,7 +195,6 @@ function List(props) {
                   && (
                     <Button
                       danger
-                      ghost
                       type="primary"
                       icon={<DeleteIcon />}
                       onClick={() => {
@@ -222,10 +221,9 @@ function List(props) {
                   )
                 }
                 {
-                  props.permission("zhgl-import")
+                  // props.permission("zhgl-import")
-                  && (
+                  // && (
                   <Button
-                      ghost
                     type="primary"
                     icon={<ImportIcon />}
                     onClick={() => {
@@ -234,14 +232,13 @@ function List(props) {
                   >
                     导入
                   </Button>
-                  )
+                  // )
                 }
                 {
                   props.permission("zhgl-export")
                   && (
                     <Button
                       type="primary"
-                      ghost
                       icon={<ExportIcon />}
                       onClick={() => onExportExcel()}
                     >