From 63c936d8af9cd3ecb62d4d6919f7eb49e1ce2a48 Mon Sep 17 00:00:00 2001
From: "853931625@qq.com" <wang85393>
Date: Wed, 31 Dec 2025 14:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E7=AD=89=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Container/BusinessLicense/index.js  |  2 +-
 .../Enterprise/CorpInfo/Info/index.js         |  2 +-
 .../ChangeView/index.js                       | 51 +++++++++----------
 .../AccountManage/View/index.js               |  2 +-
 .../SecurityPersonnelInfo/index.js            |  2 +-
 .../SpecialOperationPersonnel/index.js        |  2 +-
 .../Container/Stakeholder/User/Add/index.js   |  3 ++
 .../Container/Stakeholder/User/List/index.js  |  1 -
 .../User/ResignationReview/index.js           | 49 +++++++-----------
 .../User/SecurityPersonnel/index.js           |  2 +-
 .../User/SpecialPersonnel/index.js            |  2 +-
 .../BranchCompany/AccountManage/List/index.js |  2 +-
 .../EnterpriseInfo/View/index.js              |  2 +-
 .../AccountManage/View/index.js               |  2 +-
 .../CertificateList/index.js                  |  2 +-
 .../SpecialPersonnel/CertificateList/index.js |  4 +-
 .../Supervision/User/List/index.js            |  2 +-
 17 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/src/pages/Container/BusinessLicense/index.js b/src/pages/Container/BusinessLicense/index.js
index 0680744..3a14edc 100644
--- a/src/pages/Container/BusinessLicense/index.js
+++ b/src/pages/Container/BusinessLicense/index.js
@@ -67,7 +67,7 @@ function Department(props) {
             onFinish={getData}
           />
           <Table
-            confirmLoadingconfirmLoading={props.businessLicense.corpQualificationLoading}
+            loding={props.businessLicense.corpQualificationLoading}
             toolBarRender={() => (
               <>
                 <Button
diff --git a/src/pages/Container/Enterprise/CorpInfo/Info/index.js b/src/pages/Container/Enterprise/CorpInfo/Info/index.js
index 4436d5c..5334e86 100644
--- a/src/pages/Container/Enterprise/CorpInfo/Info/index.js
+++ b/src/pages/Container/Enterprise/CorpInfo/Info/index.js
@@ -227,7 +227,7 @@ function Info(props) {
             },
           ]}
           column={2}
-          confirmLoading={getFileLoading}
+          loding={getFileLoading}
           labelStyle={{
             width: 200,
           }}
diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js
index 0326793..bb22a6e 100644
--- a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js
+++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js
@@ -64,7 +64,30 @@ function ChangeView(props) {
   return (
     <div>
 
-      <Page headerTitle="变更记录" isShowFooter={false}>
+      <Page
+        headerTitle="变更记录"
+        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
           bordered
@@ -154,32 +177,6 @@ function ChangeView(props) {
         />
       </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>
 
   );
diff --git a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
index 5884d41..e8160b6 100644
--- a/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
+++ b/src/pages/Container/Enterprise/StakeholderUnit/AccountManage/View/index.js
@@ -241,7 +241,7 @@ function View(props) {
             },
           ]}
           column={2}
-          confirmLoading={getFileLoading}
+          loding={getFileLoading}
           labelStyle={{
             width: 200,
           }}
diff --git a/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js b/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js
index f2dd48a..3ef3b6e 100644
--- a/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js
+++ b/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js
@@ -83,7 +83,7 @@ function Department(props) {
             onFinish={getData}
           />
           <Table
-            confirmLoading={getFileLoading}
+            loding={getFileLoading}
             columns={[
               {
                 title: "姓名",
diff --git a/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js b/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js
index 37ea822..09a0306 100644
--- a/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js
+++ b/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js
@@ -83,7 +83,7 @@ function Department(props) {
             onFinish={getData}
           />
           <Table
-            confirmLoading={getFileLoading}
+            loding={getFileLoading}
             columns={[
               {
                 title: "姓名",
diff --git a/src/pages/Container/Stakeholder/User/Add/index.js b/src/pages/Container/Stakeholder/User/Add/index.js
index e3bdbba..a7b6407 100644
--- a/src/pages/Container/Stakeholder/User/Add/index.js
+++ b/src/pages/Container/Stakeholder/User/Add/index.js
@@ -463,6 +463,9 @@ function Add(props) {
             {
               name: "flowFlag",
               label: "是否流动人员",
+              componentProps: {
+                disabled: queryParams["id"],
+              },
               render: FORM_ITEM_RENDER_ENUM.RADIO,
               items: WHETHER_ENUM,
 
diff --git a/src/pages/Container/Stakeholder/User/List/index.js b/src/pages/Container/Stakeholder/User/List/index.js
index 0e217ef..c65204a 100644
--- a/src/pages/Container/Stakeholder/User/List/index.js
+++ b/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";
diff --git a/src/pages/Container/Stakeholder/User/ResignationReview/index.js b/src/pages/Container/Stakeholder/User/ResignationReview/index.js
index 71d1b6e..2613e08 100644
--- a/src/pages/Container/Stakeholder/User/ResignationReview/index.js
+++ b/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
-        style={{
-          padding: 20,
-        }}
+
+      <Page
+        headerTitle="信息确认"
+        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>
-
-      <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>
+      </Page>
 
     </div>
 
diff --git a/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js b/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js
index 3f840cc..3dc5279 100644
--- a/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js
+++ b/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js
@@ -116,7 +116,7 @@ function SecurityPersonnel(props) {
               onFinish={getData}
             />
             <Table
-              confirmLoading={getFileLoading}
+              loding={getFileLoading}
               toolBarRender={() => (
                 <>
                   {
diff --git a/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js b/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js
index a521550..9a3bf39 100644
--- a/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js
+++ b/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js
@@ -118,7 +118,7 @@ function SpecialPersonnel(props) {
               onFinish={getData}
             />
             <Table
-              confirmLoading={getFileLoading}
+              loding={getFileLoading}
               toolBarRender={() => (
                 <>
                   {
diff --git a/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js b/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js
index 9a670db..1d91bb1 100644
--- a/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js
+++ b/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js
@@ -162,7 +162,7 @@ function List(props) {
         onFinish={getData}
       />
       <Table
-        confirmLoading={props.enterprise.enterpriseLoading}
+        loding={props.enterprise.enterpriseLoading}
         toolBarRender={() => (
           <>
             {
diff --git a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js
index 1648830..0ecf733 100644
--- a/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js
+++ b/src/pages/Container/Supervision/BranchCompany/EnterpriseInfo/View/index.js
@@ -52,7 +52,7 @@ function View(props) {
           <Divider orientation="left">基本信息</Divider>
           <Descriptions
             bordered
-            confirmLoading={getFileLoading}
+            loding={getFileLoading}
             items={[
               {
                 label: "公司名称",
diff --git a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
index c7d7cec..12d662e 100644
--- a/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
+++ b/src/pages/Container/Supervision/StakeholderUnit/AccountManage/View/index.js
@@ -241,7 +241,7 @@ function View(props) {
             },
           ]}
           column={2}
-          confirmLoading={getFileLoading}
+          loding={getFileLoading}
           labelStyle={{
             width: 200,
           }}
diff --git a/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js b/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js
index 2c3ea73..4fce387 100644
--- a/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js
+++ b/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js
@@ -113,7 +113,7 @@ function Department(props) {
               onFinish={getData}
             />
             <Table
-              confirmLoading={getFileLoading}
+              loding={getFileLoading}
               // toolBarRender={() => (
               //   <>
               //     <Button
diff --git a/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js b/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js
index 7538a4b..6806eb4 100644
--- a/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js
+++ b/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js
@@ -113,7 +113,7 @@ function Department(props) {
               onFinish={getData}
             />
             <Table
-              confirmLoading={getFileLoading}
+              loding={getFileLoading}
               // toolBarRender={() => (
               //   <>
               //     <Button
@@ -318,7 +318,7 @@ function AddModalComponent(props) {
       open={props.open}
       title={props.currentId ? "编辑" : "新增"}
       width={800}
-      confirmLoading={
+      loding={
         deleteFileLoading || uploadFileLoading || getFileLoading || props.loding
       }
       onOk={form.submit}
diff --git a/src/pages/Container/Supervision/Supervision/User/List/index.js b/src/pages/Container/Supervision/Supervision/User/List/index.js
index 0969754..1b923b1 100644
--- a/src/pages/Container/Supervision/Supervision/User/List/index.js
+++ b/src/pages/Container/Supervision/Supervision/User/List/index.js
@@ -168,7 +168,7 @@ function List(props) {
           />
           <Table
 
-            confirmLoading={props.user.userLoading}
+            loding={props.user.userLoading}
             rowSelection={{
               selectedRowKeys,
               onChange: selectedRowKeys => setSelectedRowKeys(selectedRowKeys),