From 2c35e03824b79c6dd363d27e3fbd994a7adb62af Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Fri, 6 Feb 2026 13:35:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(accident):=20=E4=BF=AE=E5=A4=8D=E4=BA=8B?=
 =?UTF-8?q?=E6=95=85=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=92=8C=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复新增按钮权限控制逻辑错误
- 添加批量删除后选中行状态重置功能
- 修复列定义顺序导致的显示问题
- 添加弹窗遮罩点击关闭限制防止误操作
- 修复监管部门事故列表企业类型筛选条件
- 修复详情查看弹窗加载状态显示位置
---
 .../Accident/components/Accident/index.js         | 15 +++++++++------
 .../Container/SuperviseAccident/List/index.js     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/Container/Accident/components/Accident/index.js b/src/pages/Container/Accident/components/Accident/index.js
index 5b1fd9c..658441b 100644
--- a/src/pages/Container/Accident/components/Accident/index.js
+++ b/src/pages/Container/Accident/components/Accident/index.js
@@ -47,7 +47,7 @@ function Accident(props) {
   });
   const typeName = props.type === 1 ? "事件" : "事故";
   return (
-    <Page 
+    <Page
       isShowAllAction={!!props.isSupervise}
       headerTitle={`${typeName}管理`}
       >
@@ -70,6 +70,9 @@ function Accident(props) {
         }}
         toolBarRender={() => (
           <Space>
+            {!props.isSupervise && props.permission(props.addPermission) &&
+              <Button type="primary" icon={<AddIcon />} onClick={() => setAddModalVisible(true)}>新增</Button>
+            }
             {props.permission(props.exportPermission) &&
               <Button type="primary" loading={loading} icon={<ExportIcon />} ghost onClick={async () => {
                 const exportParams = getUrlCriteriaQuery("searchFormKeys", "searchFormValues");
@@ -77,9 +80,6 @@ function Accident(props) {
                 await downloadBlob("/accident/accident/export", { params: { ...exportParams, eqType: props.type } })
               }}>全部导出</Button>
             }
-            {!props.isSupervise && props.permission(props.addPermission) &&
-              <Button type="primary" icon={<AddIcon />} onClick={() => setAddModalVisible(true)}>新增</Button>
-            }
             {!props.isSupervise && props.permission(props.deleteBatchPermission) &&
               <Button icon={<DeleteIcon />}
                 ghost
@@ -93,6 +93,7 @@ function Accident(props) {
                     onOk: async () => {
                       await props["accidentBatchDelete"]({ ids: selectedRowKeys });
                       message.success("删除成功");
+                      setSelectedRowKeys([]);
                       getData();
                     },
                   });
@@ -104,8 +105,8 @@ function Accident(props) {
           </Space>
         )}
         columns={[
-          { dataIndex: "incidentName", title: `${typeName}名称` },
           { dataIndex: "corpinfoName", title: `所属公司` },
+          { dataIndex: "incidentName", title: `${typeName}名称` },
           { dataIndex: "incidentDate", title: `${typeName}发生时间` },
           { dataIndex: "location", title: `${typeName}发生地点` },
           { dataIndex: "incidentTypeName", title: `${typeName}类型` },
@@ -302,6 +303,7 @@ function AddModalComponent(props) {
       open
       onCancel={onCancel}
       onOk={form.submit}
+      maskClosable={false}
       title={props.currentId ? "编辑" : "新增"}
       confirmLoading={props.accident.accidentLoading || uploadLoading || deleteLoading}
       width={800}
@@ -398,12 +400,13 @@ function InfoModalComponent(props) {
       open
       onCancel={props.onCancel}
       footer={<Button onClick={props.onCancel}>关闭</Button>}
+      maskClosable={false}
       title={`查看${typeName}`}
-      loading={props.accident.accidentLoading}
       width={800}
     >
       <Descriptions
         labelStyle={{ width: 200 }}
+        loading={props.accident.accidentLoading}
         column={1}
         bordered
         items={[
diff --git a/src/pages/Container/SuperviseAccident/List/index.js b/src/pages/Container/SuperviseAccident/List/index.js
index 94bb3e9..91d5cf5 100644
--- a/src/pages/Container/SuperviseAccident/List/index.js
+++ b/src/pages/Container/SuperviseAccident/List/index.js
@@ -37,7 +37,7 @@ function SuperviseAccident(props) {
   const {tableProps, getData} = useTable(props["getCorpInfoList"], {
     form,
     params: {
-      enterpriseType: [2],
+      inType: [0,1,6],
     },
     onSuccess: ({data}) => {
       getAccidentCountByCorpinfoAndType(data.map(item => item.id),form.getFieldValue("eqAccidentType"))