优化提交 等按钮

package.json

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

src/main.js

@@ -6,6 +6,7 @@ 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
-            loading={props.businessLicense.corpQualificationLoading}
+            loding={props.businessLicense.corpQualificationLoading}
             toolBarRender={() => (
               <>
                 <Button
@@ -184,7 +184,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      loading={props.loding}
+      confirmLoading={props.loding}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -1,8 +1,9 @@
 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 { 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";
 
@@ -47,11 +48,8 @@ function Info(props) {
     }
   };
   return (
-    <div
+    <div>
-      style={{
+      <Page isShowAllAction={false}>
-        padding: 20,
-      }}
-    >
         <Divider orientation="left">基本信息</Divider>
         <Descriptions
           bordered
@@ -229,7 +227,7 @@ function Info(props) {
             },
           ]}
           column={2}
-        loading={getFileLoading}
+          loding={getFileLoading}
           labelStyle={{
             width: 200,
           }}
@@ -344,6 +342,7 @@ function Info(props) {
               </Form>
             </Modal>
           )}
+      </Page>
     </div>
   );
 }

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

@@ -2,14 +2,13 @@ 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";
@@ -256,12 +255,9 @@ function Update(props) {
   }
   return (
     <>
-      <HeaderBack title="编辑" />
+
-      <div
+      <Page headerTitle="编辑" isShowFooter={false}>
-        style={{
+        <div>
-          padding: 20,
-        }}
-      >
           <FormBuilder
             form={form}
             values={{
@@ -281,7 +277,7 @@ function Update(props) {
               whetherLiquidammoniaFlag: 0,
               whetherPipelineFlag: 0,
             }}
-          loading={
+            confirmLoading={
               deleteFileLoading
               || uploadFileLoading
               || getFileLoading
@@ -607,6 +603,8 @@ 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 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 { 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 List(props) {
+function ChangeList(props) {
   const [form] = Form.useForm();
   const queryParams = useGetUrlQuery();
   const { tableProps, getData } = useTable(props["userEmploymentLogAll"], {
@@ -35,12 +35,8 @@ function List(props) {
   });
   return (
     <div>
-      <HeaderBack title="变更记录列表" />
+
-      <div
+      <Page headerTitle="变更记录列表">
-        style={{
-          padding: 20,
-        }}
-      >
         <Search
           form={form}
           options={[
@@ -91,6 +87,7 @@ function List(props) {
             {
               title: "操作",
               width: 200,
+              hidden: !(props.permission("qyyhzt-bgjl-info")),
               render: (_, record) => (
                 <Space>
 
@@ -108,8 +105,8 @@ function List(props) {
           ]}
           {...tableProps}
         />
-      </div>
+      </Page>
     </div>
   );
 }
-export default Connect([NS_USER], true)(List);
+export default Connect([NS_USER], true)(Permission(ChangeList));

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

@@ -1,10 +1,9 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Divider, message, 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 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,11 +63,30 @@ function ChangeView(props) {
 
   return (
     <div>
-      <HeaderBack title="变更记录" />
+
-      <div
+      <Page
-        style={{
+        headerTitle="变更记录"
-          padding: 20,
+        extraActionButtons={
-        }}
+
+          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
@@ -157,33 +175,7 @@ function ChangeView(props) {
           ]}
           dataSource={info.userJobHandoverCOList}
         />
-      </div>
+      </Page>
-
-      {
-        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,15 +1,16 @@
+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 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 { getLabelName } from "zy-react-library/utils";
 import { NS_USER } from "~/enumerate/namespace";
 import { UseDecodeIdCard } from "~/utils";
 
@@ -105,10 +106,10 @@ function List(props) {
                   title: "手机号",
                   dataIndex: "phone",
                 },
-                {
+                // {
-                  title: "中台是否存在",
+                //   title: "中台是否存在",
-                  dataIndex: "name",
+                //   dataIndex: "name",
-                },
+                // },
                 {
                   title: "状态",
                   dataIndex: "name",
@@ -124,7 +125,7 @@ function List(props) {
                 },
                 {
                   title: "操作",
-                  width: 180,
+                  width: 220,
                   render: (_, record) => (
                     <Space>
                       <Button
@@ -137,6 +138,10 @@ function List(props) {
                       >
                         查看
                       </Button>
+                      {
+                        props.permission("qyd-qyyhzt-record")
+
+                        && (
                           <Button
                             type="link"
                             onClick={() =>
@@ -144,6 +149,11 @@ function List(props) {
                           >
                             变更记录
                           </Button>
+                        )
+                      }
+                      {
+                        props.permission("qyd-qyyhzt-disposal")
+                        && (
                           <Button
                             type="link"
                             danger
@@ -152,6 +162,8 @@ function List(props) {
                           >
                             变更处置
                           </Button>
+                        )
+                      }
                     </Space>
                   ),
                 },
@@ -303,4 +315,4 @@ function AddModalComponent(props) {
   );
 }
 const AddModal = AddModalComponent;
-export default Connect([NS_USER], true)(List);
+export default Connect([NS_USER], true)(Permission(List));

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

@@ -277,6 +277,7 @@ 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}
-      loading={props.loding}
+      confirmLoading={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,11 +103,8 @@ function List(props) {
     form.setFieldValue("cityRecord", []);
   };
   return (
-    <div
+    <div>
-      style={{
+      <Page isShowAllAction={false}>
-        padding: 20,
-      }}
-    >
 
         <Search
           form={form}
@@ -286,6 +283,7 @@ function List(props) {
             }}
           />
         )}
+      </Page>
     </div>
   );
 }
@@ -422,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

@@ -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 { 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="查看" />
+
-      <div
+      <Page
-        style={{
+        headerTitle="查看"
-          padding: 20,
+        isShowFooter={false}
-        }}
       >
+
         <Divider orientation="left">基本信息</Divider>
         <Descriptions
           bordered
@@ -241,7 +241,7 @@ function View(props) {
             },
           ]}
           column={2}
-          loading={getFileLoading}
+          loding={getFileLoading}
           labelStyle={{
             width: 200,
           }}
@@ -266,7 +266,7 @@ function View(props) {
           }}
           contentStyle={{ width: "40%" }}
         />
-      </div>
+      </Page>
       {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 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,11 +61,8 @@ function List(props) {
     form.setFieldValue("cityRecord", []);
   };
   return (
-    <div
+    <div>
-      style={{
+      <Page isShowAllAction={false}>
-        padding: 20,
-      }}
-    >
         <Search
           form={form}
           onFinish={() => onFinish()}
@@ -166,6 +163,7 @@ function List(props) {
           ]}
           {...tableProps}
         />
+      </Page>
     </div>
   );
 }

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

@@ -2,15 +2,14 @@ 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 PreviewImg from "zy-react-library/components/PreviewImg";
 
+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";
@@ -61,6 +60,22 @@ 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);
@@ -68,23 +83,21 @@ function List(props) {
   };
   return (
     <div>
-      <HeaderBack title="相关方企业人员列表" />
+
-      <div
+      <Page headerTitle="相关方企业人员列表" isShowFooter={false}>
-        style={{
-          padding: 20,
-        }}
-      >
         <div
           style={{
             display: "flex",
             gap: 20,
           }}
+
         >
           <LeftTree onSelect={onTreeChange} params={{ eqCorpinfoId: queryParams["id"] }} />
           <div
             style={{
               flex: 1,
             }}
+
           >
             <Search
               form={form}
@@ -101,8 +114,10 @@ function List(props) {
                 },
               ]}
               onFinish={getData}
+
             />
             <Table
+
               columns={[
                 {
                   title: "用户名",
@@ -128,9 +143,9 @@ function List(props) {
                   title: "操作",
                   render: (_, record) => (
                     <Space>
-                      {/* { */}
+                      {
-                      {/*  props.permission("qyd-xgf-yhgl-info") */}
+                        props.permission("xgf-yhgl-userList-info")
-                      {/*  && ( */}
+                        && (
                           <Button
                             type="link"
                             onClick={() => {
@@ -140,18 +155,18 @@ function List(props) {
                           >
                             查看
                           </Button>
-                      {/* // */}
+
-                      {/* //   ) */}
+                        )
-                      {/* // } */}
+                      }
-                      {/* {props.permission("qyd-xgf-yhgl-resetPassword") */}
+                      {props.permission("xgf-yhgl-userList-resetPassword")
-                      {/*  && ( */}
+                        && (
                           <Button
                             type="link"
                             onClick={() => onResetPassword(record.id)}
                           >
                             重置密码
                           </Button>
-                      {/* )} */}
+                        )}
 
                     </Space>
                   ),
@@ -175,7 +190,7 @@ function List(props) {
             }}
           />
         )}
-      </div>
+      </Page>
     </div>
   );
 }

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

@@ -2,10 +2,9 @@ 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 Page from "zy-react-library/components/Page";
 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";
@@ -263,7 +262,9 @@ function Add(props) {
   };
   return (
     <>
-      <HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
+
+      <Page headerTitle={queryParams["id"] ? "编辑" : "新增"} isShowFooter={false}>
+
         <div
           style={{
             paddingBottom: 10,
@@ -274,7 +275,7 @@ function Add(props) {
             values={{
               departmentLeaderFlag: 0,
             }}
-          loading={uploadFileLoading || props.user.userLoading}
+            confirmLoading={uploadFileLoading || props.user.userLoading}
             options={[
               {
                 name: "roleId",
@@ -446,7 +447,10 @@ 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: 8 }}
+            labelCol={{ span: 3 }}
             options={[
               {
                 name: "likeName",
@@ -180,6 +180,7 @@ function List(props) {
                     <Button
                       type="primary"
                       icon={<ImportIcon />}
+                      ghost
                       onClick={() => {
                         setImportOpen(true);
                       }}
@@ -194,6 +195,7 @@ 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}
-      loading={props.loding}
+      confirmLoading={props.loding}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

@@ -4,17 +4,18 @@ 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 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 useUploadFile from "zy-react-library/hooks/useUploadFile";
 import {
   PHONE,
   UNIFIED_SOCIAL_CREDIT_CODE,
@@ -284,15 +285,11 @@ function CorpInfo(props) {
   };
   return (
     <>
-      <div
+      <Page isShowAllAction={false}>
-        style={{
-          paddingBottom: 10,
-        }}
-      >
         <FormBuilder
           showCancelButton={false}
           form={form}
-          loading={
+          confirmLoading={
             deleteFileLoading
             || uploadFileLoading
             || getFileLoading
@@ -498,7 +495,7 @@ function CorpInfo(props) {
           onValuesChange={onValuesChange}
 
         />
-      </div>
+      </Page>
       {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}
-      loading={props.loading}
+      confirmLoading={props.loading}
       onOk={form.submit}
       onCancel={onCancel}
     >

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

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

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

@@ -83,7 +83,7 @@ function Department(props) {
             onFinish={getData}
           />
           <Table
-            loading={getFileLoading}
+            loding={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 HeaderBack from "zy-react-library/components/HeaderBack";
+import Page from "zy-react-library/components/Page";
 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 { 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 { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils";
 import { NS_USER } from "~/enumerate/namespace";
 import { getAgeByIdCard, getBirthDateFromIdCard, useDebounce, UseDecodeIdCard } from "~/utils";
 
@@ -274,15 +274,14 @@ function Add(props) {
   };
   return (
     <>
-      <HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
+
-      <div
+      <Page
-        style={{
+        headerTitle={queryParams["id"] ? "编辑" : "新增"}
-          paddingBottom: 10,
+        isShowFooter={false}
-        }}
       >
         <FormBuilder
           form={form}
-          loading={
+          confirmLoading={
             deleteFileLoading
             || uploadFileLoading
             || getFileLoading
@@ -464,6 +463,9 @@ function Add(props) {
             {
               name: "flowFlag",
               label: "是否流动人员",
+              componentProps: {
+                disabled: queryParams["id"],
+              },
               render: FORM_ITEM_RENDER_ENUM.RADIO,
               items: WHETHER_ENUM,
 
@@ -628,7 +630,7 @@ function Add(props) {
           onFinish={onSubmit}
           onValuesChange={onValuesChange}
         />
-      </div>
+      </Page>
     </>
   );
 }

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

@@ -6,7 +6,6 @@ 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";
@@ -99,7 +98,7 @@ function List(props) {
         <div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
           <Search
             form={form}
-            labelCol={{ span: 8 }}
+            labelCol={{ span: 3 }}
             options={[
               {
                 name: "likeName",
@@ -400,7 +399,7 @@ function AddModalComponent(props) {
         }}
         onOk={form.submit}
         onCancel={onCancel}
-        loading={getFileLoading}
+        confirmLoading={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 HeaderBack from "zy-react-library/components/HeaderBack";
+import Page from "zy-react-library/components/Page";
 import Table from "zy-react-library/components/Table";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import { NS_USER } from "~/enumerate/namespace";
@@ -61,17 +61,24 @@ function ResignationReview(props) {
     });
   };
 
-  const onGoBack = () => {
-    window.history.back();
-  };
-
   return (
     <div>
-      <HeaderBack title="信息确认" />
+
-      <div
+      <Page
-        style={{
+        headerTitle="信息确认"
-          padding: 20,
+        extraActionButtons={(
-        }}
+          <div>
+            <Button key="reject" onClick={handleReject} style={{ marginRight: 20 }}>
+              驳回
+            </Button>
+            <Button
+              type="primary"
+              onClick={onSubmit}
+            >
+              通过
+            </Button>
+          </div>
+        )}
       >
         <Divider orientation="left">人员信息</Divider>
         <Descriptions
@@ -127,27 +134,7 @@ function ResignationReview(props) {
           ]}
           dataSource={info.userJobHandoverCOList}
         />
-      </div>
+      </Page>
-
-      <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
-              loading={getFileLoading}
+              loding={getFileLoading}
               toolBarRender={() => (
                 <>
                   {
@@ -316,7 +316,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      loading={
+      confirmLoading={
         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
-              loading={getFileLoading}
+              loding={getFileLoading}
               toolBarRender={() => (
                 <>
                   {
@@ -350,7 +350,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      loading={
+      confirmLoading={
         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,11 +134,7 @@ function List(props) {
     });
   };
   return (
-    <div
+    <Page isShowAllAction={false}>
-      style={{
-        padding: 20,
-      }}
-    >
       <Search
         form={form}
         options={[
@@ -166,7 +162,7 @@ function List(props) {
         onFinish={getData}
       />
       <Table
-        loading={props.enterprise.enterpriseLoading}
+        loding={props.enterprise.enterpriseLoading}
         toolBarRender={() => (
           <>
             {
@@ -350,7 +346,7 @@ function List(props) {
           }}
         />
       )}
-    </div>
+    </Page>
   );
 }
 function AddModalComponent(props) {
@@ -467,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

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

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

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

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

@@ -2,9 +2,8 @@ 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";
 
@@ -36,12 +35,7 @@ function View(props) {
   };
   return (
     <div>
-      <HeaderBack title="查看" />
+      <Page headerTitle="查看" isShowFooter={false}>
-      <div
-        style={{
-          padding: 20,
-        }}
-      >
         <div
           style={{
             display: "flex",
@@ -78,7 +72,7 @@ function View(props) {
                 {
                   title: "操作",
                   width: 200,
-                  hidden: !(props.permission("zgsbmgl-info")),
+                  hidden: !(props.permission("jgd-bmgl-info-info")),
                   render: (_, record) => (
                     <Space>
                       <Button
@@ -108,7 +102,7 @@ function View(props) {
             setCurrentId("");
           }}
         />
-      </div>
+      </Page>
     </div>
   );
 }

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

@@ -4,6 +4,7 @@ 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";
@@ -83,11 +84,7 @@ function List(props) {
     // props.
   };
   return (
-    <div
+    <Page isShowAllAction={false}>
-      style={{
-        padding: 20,
-      }}
-    >
       <Search
         form={form}
         options={[
@@ -201,7 +198,7 @@ function List(props) {
         onClose={() => setVisible(false)}
         onConfirm={handleConfirm}
       />
-    </div>
+    </Page>
   );
 }
 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,17 +46,13 @@ function View(props) {
 
   return (
     <div>
-      <HeaderBack title="查看" />
+
-      <div
+      <Page headerTitle="查看" isShowFooter={false}>
-        style={{
-          padding: 20,
-        }}
-      >
         <div>
           <Divider orientation="left">基本信息</Divider>
           <Descriptions
             bordered
-            loading={getFileLoading}
+            loding={getFileLoading}
             items={[
               {
                 label: "公司名称",
@@ -299,7 +295,7 @@ function View(props) {
           {/*  ]} */}
           {/* /> */}
         </div>
-      </div>
+      </Page>
       {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,6 +11,7 @@ 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();
@@ -36,11 +37,7 @@ function List(props) {
     getData();
   };
   return (
-    <div
+    <Page headerTitle="查看" isShowFooter={false}>
-      style={{
-        padding: 20,
-      }}
-    >
       <div
         style={{
           display: "flex",
@@ -70,6 +67,7 @@ function List(props) {
               {
                 title: "操作",
                 width: 300,
+                hidden: !(props.permission("jgd-yhgl-info-info")),
                 render: (_, record) => (
                   <Space>
                     <Button
@@ -102,7 +100,7 @@ function List(props) {
           setCurrentId("");
         }}
       />
-    </div>
+    </Page>
   );
 }
 function AddModalComponent(props) {
@@ -335,4 +333,4 @@ function AddModalComponent(props) {
   );
 }
 const AddModal = AddModalComponent;
-export default Connect([NS_USER], true)(List);
+export default Connect([NS_USER], true)(Permission(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 { 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,11 +33,9 @@ function List(props) {
   });
   return (
     <div>
-      <HeaderBack title="变更记录列表" />
+      <Page
-      <div
+        headerTitle="变更记录列表"
-        style={{
+        isShowFooter={false}
-          padding: 20,
-        }}
       >
         <Search
           form={form}
@@ -106,7 +104,7 @@ function List(props) {
           ]}
           {...tableProps}
         />
-      </div>
+      </Page>
     </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 HeaderBack from "zy-react-library/components/HeaderBack";
+import Page from "zy-react-library/components/Page";
 import Table from "zy-react-library/components/Table";
-import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 
+import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import { NS_ENTERPRISE, NS_USER } from "~/enumerate/namespace";
 
 function ChangeView(props) {
@@ -64,11 +64,9 @@ function ChangeView(props) {
 
   return (
     <div>
-      <HeaderBack title="变更记录" />
+      <Page
-      <div
+        headerTitle="变更记录"
-        style={{
+        isShowFooter={false}
-          padding: 20,
-        }}
       >
         <Divider orientation="left">变更前信息</Divider>
         <Descriptions
@@ -157,7 +155,7 @@ function ChangeView(props) {
           ]}
           dataSource={info.userJobHandoverCOList}
         />
-      </div>
+      </Page>
 
       {
         queryParams["type"] === "disposal"

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

@@ -1,12 +1,13 @@
 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 { getLabelName } from "zy-react-library/utils";
 import { NS_ENTERPRISE } from "~/enumerate/namespace";
 
 const ENTERPRISE_TYPE = [
@@ -32,11 +33,7 @@ function List(props) {
   });
   return (
 
-    <div
+    <Page isShowAllAction={false}>
-      style={{
-        padding: 20,
-      }}
-    >
       <Search
         form={form}
         options={[
@@ -111,7 +108,7 @@ function List(props) {
         ]}
         {...tableProps}
       />
-    </div>
+    </Page>
   );
 }
 export default Connect([NS_ENTERPRISE], true)(Permission(List));

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

@@ -1,17 +1,18 @@
+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 Search from "zy-react-library/components/Search";
 
+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";
 
@@ -44,6 +45,21 @@ 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);
@@ -51,12 +67,9 @@ function List(props) {
   };
   return (
     <div>
-      <HeaderBack title="列表" />
+      <Page
-
+        headerTitle="列表"
-      <div
+        isShowFooter={false}
-        style={{
-          padding: 20,
-        }}
       >
         <div
           style={{
@@ -143,6 +156,9 @@ function List(props) {
                       >
                         查看
                       </Button>
+                      {
+                        props.permission("qyyuzt-info-record")
+                        && (
                           <Button
                             type="link"
                             onClick={() =>
@@ -150,6 +166,11 @@ function List(props) {
                           >
                             变更记录
                           </Button>
+                        )
+                      }
+                      {
+                        props.permission("qyyuzt-info-disposal")
+                        && (
                           <Button
                             type="link"
                             danger
@@ -158,6 +179,8 @@ function List(props) {
                           >
                             变更处置
                           </Button>
+                        )
+                      }
                     </Space>
                   ),
                 },
@@ -178,7 +201,7 @@ function List(props) {
             setCurrentId("");
           }}
         />
-      </div>
+      </Page>
     </div>
   );
 }
@@ -309,4 +332,4 @@ function AddModalComponent(props) {
   );
 }
 const AddModal = AddModalComponent;
-export default Connect([NS_USER], true)(List);
+export default Connect([NS_USER], true)(Permission(List));

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

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

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

@@ -113,7 +113,7 @@ function Department(props) {
               onFinish={getData}
             />
             <Table
-              loading={getFileLoading}
+              loding={getFileLoading}
               // toolBarRender={() => (
               //   <>
               //     <Button
@@ -290,7 +290,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      loading={
+      confirmLoading={
         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
-              loading={getFileLoading}
+              loding={getFileLoading}
               // toolBarRender={() => (
               //   <>
               //     <Button
@@ -318,7 +318,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      loading={
+      loding={
         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 PreviewImg from "zy-react-library/components/PreviewImg";
+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 { 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,6 +45,7 @@ function List(props) {
       bianma: 0,
     },
   ];
+
   const onResetPassword = (id) => {
     Modal.confirm({
       title: "提示",
@@ -61,6 +62,21 @@ 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);
@@ -68,11 +84,10 @@ function List(props) {
   };
   return (
     <div>
-      <HeaderBack title="相关方企业人员列表" />
+
-      <div
+      <Page
-        style={{
+        headerTitle="相关方企业人员列表"
-          padding: 20,
+        isShowFooter={false}
-        }}
       >
         <div
           style={{
@@ -125,14 +140,20 @@ 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={() => {
@@ -142,6 +163,8 @@ function List(props) {
                           >
                             查看
                           </Button>
+                        )
+                      }
 
                     </Space>
                   ),
@@ -165,7 +188,7 @@ function List(props) {
             }}
           />
         )}
-      </div>
+      </Page>
     </div>
   );
 }

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

@@ -2,10 +2,9 @@ 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 Page from "zy-react-library/components/Page";
 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,
@@ -126,16 +125,14 @@ function Update(props) {
 
   return (
     <>
-      <HeaderBack title="编辑" />
+      <Page
-      <div
+        headerTitle="编辑"
-        style={{
+        isShowFooter={false}
-          padding: 20,
-        }}
       >
         <FormBuilder
           form={form}
 
-          loading={
+          confirmLoading={
 
             props.enterprise.enterpriseLoading
           }
@@ -193,7 +190,7 @@ function Update(props) {
           onFinish={onSubmit}
           onValuesChange={onValuesChange}
         />
-      </div>
+      </Page>
     </>
   );
 }

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

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

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

@@ -2,22 +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 HeaderBack from "zy-react-library/components/HeaderBack";
+import Page from "zy-react-library/components/Page";
 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 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 { 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 = [
@@ -262,18 +261,16 @@ function Add(props) {
   };
   return (
     <>
-      <HeaderBack title={queryParams["id"] ? "编辑" : "新增"} />
+      <Page
-      <div
+        headerTitle={queryParams["id"] ? "编辑" : "新增"}
-        style={{
+        isShowFooter={false}
-          paddingBottom: 10,
-        }}
       >
         <FormBuilder
           form={form}
           values={{
             departmentLeaderFlag: 0,
           }}
-          loading={uploadFileLoading || props.user.userLoading}
+          confirmLoading={uploadFileLoading || props.user.userLoading}
           options={[
             {
               name: "roleId",
@@ -462,7 +459,7 @@ function Add(props) {
           onFinish={onSubmit}
           onValuesChange={onValuesChange}
         />
-      </div>
+      </Page>
     </>
   );
 }

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

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