From bba4445adec4df7bf83664c795b8e9c1ce13666c Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 1 Apr 2026 08:51:04 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=9F=B9=E8=AE=AD=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enumerate/constant/index.js | 5 +++++ .../FirstLevelDoor/PersonnelApplication/Add/index.js | 5 +++-- .../FirstLevelDoor/PersonnelApplication/List/index.js | 4 ++-- .../FirstLevelDoor/PersonnelPermissionRecords/List/index.js | 6 ++++-- .../PersonnelApproval/RelatedPersonnel/index.js | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/enumerate/constant/index.js b/src/enumerate/constant/index.js index 1765475..1ae1ce0 100644 --- a/src/enumerate/constant/index.js +++ b/src/enumerate/constant/index.js @@ -71,3 +71,8 @@ export const ENCLOSED_AREA_BELONGING_END_ENUM = [ { bianma: "1", name: "监管端" }, { bianma: "2", name: "企业端" }, ]; +// 封闭区域车辆人员申请来源状态 +export const TRAINING_STATE_ENUM = [ + { bianma: "0", name: "否" }, + { bianma: "1", name: "是" }, +]; diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js index 2848e6f..6513155 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js @@ -16,6 +16,7 @@ import { NS_FIRST_LEVEL_DOOR_INFO, NS_PERSONNEL_APPLICATION, } from "~/enumerate/namespace"; +import {TRAINING_STATE_ENUM} from "~/enumerate/constant"; function Add(props) { const [form] = FormBuilder.useForm(); @@ -209,7 +210,7 @@ function Add(props) { columns={[ { title: "姓名", dataIndex: "name" }, { title: "部门", dataIndex: "deptName" }, - { title: "是否培训", dataIndex: "todo3" }, + { title: "是否培训", dataIndex: "trainingState",render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState }) }, // { title: "现口门权限范围", dataIndex: "todo4" }, { title: "操作", @@ -344,7 +345,7 @@ const AddPersonnelModalComponent = (props) => { columns={[ { title: "姓名", dataIndex: "userName" }, { title: "部门", dataIndex: "deptName" }, - { title: "是否培训", dataIndex: "todo3" }, + { title: "是否培训", dataIndex: "trainingState",render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState }) }, // { title: "现口门权限范围", dataIndex: "todo4" }, ]} dataSource={props.xgfProjectUser} diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js index 656ff0e..a96a393 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js @@ -12,7 +12,7 @@ import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useGetFile from "zy-react-library/hooks/useGetFile"; import useTable from "zy-react-library/hooks/useTable"; import { getLabelName } from "zy-react-library/utils"; -import { ENCLOSED_AREA_AUDIT_STATUS_ENUM } from "~/enumerate/constant"; +import {ENCLOSED_AREA_AUDIT_STATUS_ENUM, TRAINING_STATE_ENUM} from "~/enumerate/constant"; import { NS_PERSONNEL_APPLICATION } from "~/enumerate/namespace"; function List(props) { @@ -219,7 +219,7 @@ const ViewModalComponent = (props) => { columns={[ { title: "姓名", dataIndex: "employeePersonUserName" }, { title: "部门", dataIndex: "personDepartmentName" }, - { title: "是否培训", dataIndex: "todo3" }, + { title: "是否培训", dataIndex: "trainingState" ,render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState })}, // { title: "现口门权限范围", dataIndex: "todo4" }, ]} dataSource={info.personApplyList} diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelPermissionRecords/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelPermissionRecords/List/index.js index 4332fee..e4dc5dc 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelPermissionRecords/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelPermissionRecords/List/index.js @@ -8,6 +8,8 @@ import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; import { NS_PERSONNEL_PERMISSION_RECORDS } from "~/enumerate/namespace"; +import {getLabelName} from "zy-react-library/utils"; +import {TRAINING_STATE_ENUM} from "~/enumerate/constant"; function List(props) { const [infoModalVisible, setInfoModalVisible] = useState(false); @@ -33,9 +35,9 @@ function List(props) { columns={[ { title: "姓名", dataIndex: "employeePersonUserName" }, { title: "部门", dataIndex: "personDepartmentName" }, - { title: "是否培训", dataIndex: "todo3" }, + { title: "是否培训", dataIndex: "trainingState" ,render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState })}, { title: "涉及项目", dataIndex: "projectName" }, - { title: "口门权限范围", dataIndex: "todo5" }, + // { title: "口门权限范围", dataIndex: "todo5" }, { title: "操作", width: 100, diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js index 33aed55..205ad43 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/PersonnelApproval/RelatedPersonnel/index.js @@ -70,7 +70,7 @@ function RelatedPersonnel(props) { width: 150, render: (_, record) => ( - {(!props.isRecords && record.currentUserCanAudit === 1 && props.permission("jgd-entry-stk-personnel-approval-audit")) && ( + {(!props.isRecords && record.currentUserCanAudit === 1 && props.permission(props.auditBtn || "jgd-entry-stk-personnel-approval-audit")) && (