From b01b15e5b2a6225069aa8b74a3b355aea1f9308d Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Thu, 8 Jan 2026 14:29:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/files/edit/FM034.js | 104 ++++++++++++++++++++++------------------
 1 file changed, 58 insertions(+), 46 deletions(-)

diff --git a/src/files/edit/FM034.js b/src/files/edit/FM034.js
index 76e6627..ec0e67c 100644
--- a/src/files/edit/FM034.js
+++ b/src/files/edit/FM034.js
@@ -1,11 +1,19 @@
-import React from 'react'
-import { message } from "antd/lib/index";
-import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import React from 'react';
+import { message } from 'antd/lib/index';
+import {
+  getPropertyData,
+  extendInclude,
+  extendRule,
+  getDataFieldValue,
+  setDataFieldValue,
+  initFilter,
+  guid,
+} from '../../utils/common';
 import moment from 'moment';
-import storage from '../../utils/storage'
-import config from "../../config.js"
-import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
-import { T } from "antd/lib/upload/utils";
+import storage from '../../utils/storage';
+import config from '../../config.js';
+import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin, Table } from 'antd';
+import { T } from 'antd/lib/upload/utils';
 /**
  * @return {string}
  */
@@ -13,11 +21,13 @@ import { T } from "antd/lib/upload/utils";
 
 export default {
   onBeforeEdit(params) {
-    const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
+    const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible, stateData } = params
+      ? params
+      : {};
   },
-    handleRenderHeadControl(params) {
+  handleRenderHeadControl(params) {
     if (params.colConfig.field === 'Nav_DepartmentUser') {
-        const columns =[
+      const columns = [
         //     { title: '序号', dataIndex: 'ROW_NO',
         //     render: (value, row, index) => {
         //         if(!value)
@@ -26,41 +36,43 @@ export default {
         //         }
         //       }
         // },
-            { title: '员工编号', dataIndex: 'Nav_User.CODE' , width: 200,align:"left"},
-            { title: '员工名称', dataIndex: 'Nav_User.NAME' , width: 200,align:"left"},
-            { title: '岗位', dataIndex: 'Nav_User.Nav_Person.Nav_Post.NAME' , width: 200,align:"left"},
-            { title: '角色', dataIndex: 'Nav_User.Nav_ApproveRole.NAME' , width: 200,align:"left"},
-            {
-                title: '启用标志', dataIndex: 'Nav_User.ENABLE_STATUS', render: (value, row, index) => {
-                    if(value === 0)
-                    {
-                        return "启用"
-                    }
-                    if(value === 1)
-                   {
-                    return "禁用"
-                   }
-                  }
-            }
-          ]
-          const style = { width: '62%', height: '150px', position: 'fixed', top: '400px'}
-          const data = params.record.Nav_DepartmentUser;
-          const paginationConfig = {
-            pageSizeOptions: ['5', '10', '20', '50', '100'],
-            // current: this.state.loadParamJson.PageIndex,
-            pageSize: 5,
-            total: params.record.Nav_DepartmentUser?.length,
-            showSizeChanger: true,
-            size: 'small',
-            position:'top',
-            showTotal: () => `共 ${params.record.Nav_DepartmentUser?.length} 条`
-          };
-          return <>
-          <div style={{margin:"360px 0 100px 0", height: '600px', position: 'fixed',width: '62%',}}>
-          {/* pagination={paginationConfig} scroll={{y:150}} */}
-            <Table size='small' columns={columns} dataSource={data} pagination={false} scroll={{ y: 250 }} />
-            </div>
+        { title: '员工编号', dataIndex: 'Nav_User.CODE', width: 200, align: 'left' },
+        { title: '员工名称', dataIndex: 'Nav_User.NAME', width: 200, align: 'left' },
+        { title: '岗位', dataIndex: 'Nav_User.Nav_Person.Nav_Post.NAME', width: 200, align: 'left' },
+        { title: '角色', dataIndex: 'Nav_User.Nav_ApproveRole.NAME', width: 200, align: 'left' },
+        // {
+        //     title: '启用标志', dataIndex: 'Nav_User.ENABLE_STATUS', render: (value, row, index) => {
+        //         if(value === 0)
+        //         {
+        //             return "启用"
+        //         }
+        //         if(value === 1)
+        //        {
+        //         return "禁用"
+        //        }
+        //       }
+        // }
+      ];
+      const style = { width: '62%', height: '150px', position: 'fixed', top: '400px' };
+      const data = params.record.Nav_DepartmentUser;
+      const paginationConfig = {
+        pageSizeOptions: ['5', '10', '20', '50', '100'],
+        // current: this.state.loadParamJson.PageIndex,
+        pageSize: 5,
+        total: params.record.Nav_DepartmentUser?.length,
+        showSizeChanger: true,
+        size: 'small',
+        position: 'top',
+        showTotal: () => `共 ${params.record.Nav_DepartmentUser?.length} 条`,
+      };
+      return (
+        <>
+          <div style={{}}>
+            {/* pagination={paginationConfig} scroll={{y:150}} */}
+            <Table size="small" columns={columns} dataSource={data} pagination={false} scroll={{ x: 900, y: 250 }} />
+          </div>
         </>
+      );
     }
-  }
-}
+  },
+};

From 99e14d9f6fa1cdcdd66b0b248bc4a435ba7bf66c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Tue, 13 Jan 2026 14:18:52 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/GroupHome.js | 20 ++++++++++----------
 src/routes/Home.js      | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/routes/GroupHome.js b/src/routes/GroupHome.js
index ca57598..ee22eb5 100644
--- a/src/routes/GroupHome.js
+++ b/src/routes/GroupHome.js
@@ -1444,16 +1444,16 @@ class GroupHome extends React.Component {
 
   //显示详情弹窗
   showDetailModal = (formCode) => {
-    var titleTemp =
-      this.state.mineType == 20
-        ? '尾矿库'
-        : this.state.mineType == 10
-        ? '选矿厂'
-        : this.state.mineType == 31
-        ? '职能口'
-        : this.state.mineType == 32
-        ? '非金属'
-        : '露天矿';
+    var titleTemp =""
+      // this.state.mineType == 20
+      //   ? '尾矿库'
+      //   : this.state.mineType == 10
+      //   ? '选矿厂'
+      //   : this.state.mineType == 31
+      //   ? '职能口'
+      //   : this.state.mineType == 32
+      //   ? '非金属'
+      //   : '露天矿';
     if (formCode == 'BI054_HOMEDETAIL') {
       titleTemp += '安全检查次数统计（近12月）';
     } else if (formCode == 'BI055_HOMEDETAIL') {
diff --git a/src/routes/Home.js b/src/routes/Home.js
index 8e27bb0..f1f8f9e 100644
--- a/src/routes/Home.js
+++ b/src/routes/Home.js
@@ -1315,16 +1315,16 @@ class Home extends React.Component {
 
   //显示详情弹窗
   showDetailModal = (formCode) => {
-    var titleTemp =
-      this.state.mineType == 20
-        ? '尾矿库'
-        : this.state.mineType == 10
-        ? '选矿厂'
-        : this.state.mineType == 31
-        ? '职能口'
-        : this.state.mineType == 32
-        ? '非金属'
-        : '露天矿';
+    var titleTemp =""
+      // this.state.mineType == 20
+      //   ? '尾矿库'
+      //   : this.state.mineType == 10
+      //   ? '选矿厂'
+      //   : this.state.mineType == 31
+      //   ? '职能口'
+      //   : this.state.mineType == 32
+      //   ? '非金属'
+      //   : '露天矿';
     if (formCode == 'BI054_HOMEDETAIL') {
       titleTemp += '安全检查次数统计（近12月）';
     } else if (formCode == 'BI055_HOMEDETAIL') {

From 827ce856f7c59f031daa2a6a5e63f0e5718098f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Wed, 14 Jan 2026 16:11:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/files/edit/FM034.js | 104 ++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 58 deletions(-)

diff --git a/src/files/edit/FM034.js b/src/files/edit/FM034.js
index ec0e67c..76e6627 100644
--- a/src/files/edit/FM034.js
+++ b/src/files/edit/FM034.js
@@ -1,19 +1,11 @@
-import React from 'react';
-import { message } from 'antd/lib/index';
-import {
-  getPropertyData,
-  extendInclude,
-  extendRule,
-  getDataFieldValue,
-  setDataFieldValue,
-  initFilter,
-  guid,
-} from '../../utils/common';
+import React from 'react'
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
 import moment from 'moment';
-import storage from '../../utils/storage';
-import config from '../../config.js';
-import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin, Table } from 'antd';
-import { T } from 'antd/lib/upload/utils';
+import storage from '../../utils/storage'
+import config from "../../config.js"
+import { Button, Row, Col, Form, Input, Select, Upload, Icon, Modal, Spin,Table } from 'antd';
+import { T } from "antd/lib/upload/utils";
 /**
  * @return {string}
  */
@@ -21,13 +13,11 @@ import { T } from 'antd/lib/upload/utils';
 
 export default {
   onBeforeEdit(params) {
-    const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible, stateData } = params
-      ? params
-      : {};
+    const { isNew, dispatch, login, setFieldValueByBatch, setFieldEditable, setFieldVisible,stateData } = params ? params : {};
   },
-  handleRenderHeadControl(params) {
+    handleRenderHeadControl(params) {
     if (params.colConfig.field === 'Nav_DepartmentUser') {
-      const columns = [
+        const columns =[
         //     { title: '序号', dataIndex: 'ROW_NO',
         //     render: (value, row, index) => {
         //         if(!value)
@@ -36,43 +26,41 @@ export default {
         //         }
         //       }
         // },
-        { title: '员工编号', dataIndex: 'Nav_User.CODE', width: 200, align: 'left' },
-        { title: '员工名称', dataIndex: 'Nav_User.NAME', width: 200, align: 'left' },
-        { title: '岗位', dataIndex: 'Nav_User.Nav_Person.Nav_Post.NAME', width: 200, align: 'left' },
-        { title: '角色', dataIndex: 'Nav_User.Nav_ApproveRole.NAME', width: 200, align: 'left' },
-        // {
-        //     title: '启用标志', dataIndex: 'Nav_User.ENABLE_STATUS', render: (value, row, index) => {
-        //         if(value === 0)
-        //         {
-        //             return "启用"
-        //         }
-        //         if(value === 1)
-        //        {
-        //         return "禁用"
-        //        }
-        //       }
-        // }
-      ];
-      const style = { width: '62%', height: '150px', position: 'fixed', top: '400px' };
-      const data = params.record.Nav_DepartmentUser;
-      const paginationConfig = {
-        pageSizeOptions: ['5', '10', '20', '50', '100'],
-        // current: this.state.loadParamJson.PageIndex,
-        pageSize: 5,
-        total: params.record.Nav_DepartmentUser?.length,
-        showSizeChanger: true,
-        size: 'small',
-        position: 'top',
-        showTotal: () => `共 ${params.record.Nav_DepartmentUser?.length} 条`,
-      };
-      return (
-        <>
-          <div style={{}}>
-            {/* pagination={paginationConfig} scroll={{y:150}} */}
-            <Table size="small" columns={columns} dataSource={data} pagination={false} scroll={{ x: 900, y: 250 }} />
-          </div>
+            { title: '员工编号', dataIndex: 'Nav_User.CODE' , width: 200,align:"left"},
+            { title: '员工名称', dataIndex: 'Nav_User.NAME' , width: 200,align:"left"},
+            { title: '岗位', dataIndex: 'Nav_User.Nav_Person.Nav_Post.NAME' , width: 200,align:"left"},
+            { title: '角色', dataIndex: 'Nav_User.Nav_ApproveRole.NAME' , width: 200,align:"left"},
+            {
+                title: '启用标志', dataIndex: 'Nav_User.ENABLE_STATUS', render: (value, row, index) => {
+                    if(value === 0)
+                    {
+                        return "启用"
+                    }
+                    if(value === 1)
+                   {
+                    return "禁用"
+                   }
+                  }
+            }
+          ]
+          const style = { width: '62%', height: '150px', position: 'fixed', top: '400px'}
+          const data = params.record.Nav_DepartmentUser;
+          const paginationConfig = {
+            pageSizeOptions: ['5', '10', '20', '50', '100'],
+            // current: this.state.loadParamJson.PageIndex,
+            pageSize: 5,
+            total: params.record.Nav_DepartmentUser?.length,
+            showSizeChanger: true,
+            size: 'small',
+            position:'top',
+            showTotal: () => `共 ${params.record.Nav_DepartmentUser?.length} 条`
+          };
+          return <>
+          <div style={{margin:"360px 0 100px 0", height: '600px', position: 'fixed',width: '62%',}}>
+          {/* pagination={paginationConfig} scroll={{y:150}} */}
+            <Table size='small' columns={columns} dataSource={data} pagination={false} scroll={{ y: 250 }} />
+            </div>
         </>
-      );
     }
-  },
-};
+  }
+}