feat:培训字段对接
parent
734a307632
commit
bba4445ade
|
|
@ -71,3 +71,8 @@ export const ENCLOSED_AREA_BELONGING_END_ENUM = [
|
||||||
{ bianma: "1", name: "监管端" },
|
{ bianma: "1", name: "监管端" },
|
||||||
{ bianma: "2", name: "企业端" },
|
{ bianma: "2", name: "企业端" },
|
||||||
];
|
];
|
||||||
|
// 封闭区域车辆人员申请来源状态
|
||||||
|
export const TRAINING_STATE_ENUM = [
|
||||||
|
{ bianma: "0", name: "否" },
|
||||||
|
{ bianma: "1", name: "是" },
|
||||||
|
];
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ import {
|
||||||
NS_FIRST_LEVEL_DOOR_INFO,
|
NS_FIRST_LEVEL_DOOR_INFO,
|
||||||
NS_PERSONNEL_APPLICATION,
|
NS_PERSONNEL_APPLICATION,
|
||||||
} from "~/enumerate/namespace";
|
} from "~/enumerate/namespace";
|
||||||
|
import {TRAINING_STATE_ENUM} from "~/enumerate/constant";
|
||||||
|
|
||||||
function Add(props) {
|
function Add(props) {
|
||||||
const [form] = FormBuilder.useForm();
|
const [form] = FormBuilder.useForm();
|
||||||
|
|
@ -209,7 +210,7 @@ function Add(props) {
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "姓名", dataIndex: "name" },
|
{ title: "姓名", dataIndex: "name" },
|
||||||
{ title: "部门", dataIndex: "deptName" },
|
{ title: "部门", dataIndex: "deptName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
{ title: "是否培训", dataIndex: "trainingState",render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState }) },
|
||||||
// { title: "现口门权限范围", dataIndex: "todo4" },
|
// { title: "现口门权限范围", dataIndex: "todo4" },
|
||||||
{
|
{
|
||||||
title: "操作",
|
title: "操作",
|
||||||
|
|
@ -344,7 +345,7 @@ const AddPersonnelModalComponent = (props) => {
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "姓名", dataIndex: "userName" },
|
{ title: "姓名", dataIndex: "userName" },
|
||||||
{ title: "部门", dataIndex: "deptName" },
|
{ title: "部门", dataIndex: "deptName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
{ title: "是否培训", dataIndex: "trainingState",render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState }) },
|
||||||
// { title: "现口门权限范围", dataIndex: "todo4" },
|
// { title: "现口门权限范围", dataIndex: "todo4" },
|
||||||
]}
|
]}
|
||||||
dataSource={props.xgfProjectUser}
|
dataSource={props.xgfProjectUser}
|
||||||
|
|
|
||||||
|
|
@ -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 useGetFile from "zy-react-library/hooks/useGetFile";
|
||||||
import useTable from "zy-react-library/hooks/useTable";
|
import useTable from "zy-react-library/hooks/useTable";
|
||||||
import { getLabelName } from "zy-react-library/utils";
|
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";
|
import { NS_PERSONNEL_APPLICATION } from "~/enumerate/namespace";
|
||||||
|
|
||||||
function List(props) {
|
function List(props) {
|
||||||
|
|
@ -219,7 +219,7 @@ const ViewModalComponent = (props) => {
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "姓名", dataIndex: "employeePersonUserName" },
|
{ title: "姓名", dataIndex: "employeePersonUserName" },
|
||||||
{ title: "部门", dataIndex: "personDepartmentName" },
|
{ title: "部门", dataIndex: "personDepartmentName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
{ title: "是否培训", dataIndex: "trainingState" ,render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState })},
|
||||||
// { title: "现口门权限范围", dataIndex: "todo4" },
|
// { title: "现口门权限范围", dataIndex: "todo4" },
|
||||||
]}
|
]}
|
||||||
dataSource={info.personApplyList}
|
dataSource={info.personApplyList}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,8 @@ import Search from "zy-react-library/components/Search";
|
||||||
import Table from "zy-react-library/components/Table";
|
import Table from "zy-react-library/components/Table";
|
||||||
import useTable from "zy-react-library/hooks/useTable";
|
import useTable from "zy-react-library/hooks/useTable";
|
||||||
import { NS_PERSONNEL_PERMISSION_RECORDS } from "~/enumerate/namespace";
|
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) {
|
function List(props) {
|
||||||
const [infoModalVisible, setInfoModalVisible] = useState(false);
|
const [infoModalVisible, setInfoModalVisible] = useState(false);
|
||||||
|
|
@ -33,9 +35,9 @@ function List(props) {
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "姓名", dataIndex: "employeePersonUserName" },
|
{ title: "姓名", dataIndex: "employeePersonUserName" },
|
||||||
{ title: "部门", dataIndex: "personDepartmentName" },
|
{ title: "部门", dataIndex: "personDepartmentName" },
|
||||||
{ title: "是否培训", dataIndex: "todo3" },
|
{ title: "是否培训", dataIndex: "trainingState" ,render: (_, record) => getLabelName({ list: TRAINING_STATE_ENUM, status: record.trainingState })},
|
||||||
{ title: "涉及项目", dataIndex: "projectName" },
|
{ title: "涉及项目", dataIndex: "projectName" },
|
||||||
{ title: "口门权限范围", dataIndex: "todo5" },
|
// { title: "口门权限范围", dataIndex: "todo5" },
|
||||||
{
|
{
|
||||||
title: "操作",
|
title: "操作",
|
||||||
width: 100,
|
width: 100,
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ function RelatedPersonnel(props) {
|
||||||
width: 150,
|
width: 150,
|
||||||
render: (_, record) => (
|
render: (_, record) => (
|
||||||
<Space>
|
<Space>
|
||||||
{(!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")) && (
|
||||||
<Button
|
<Button
|
||||||
type="link"
|
type="link"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue