feat
parent
6f90fc66df
commit
87f597ff61
|
|
@ -3,7 +3,6 @@ import { useEffect, useRef, useState } from "react";
|
||||||
import { fetchOrgPersonnelDetail } from "~/utils/qualFiling/personnelHelper";
|
import { fetchOrgPersonnelDetail } from "~/utils/qualFiling/personnelHelper";
|
||||||
import {
|
import {
|
||||||
REGISTER_ENGINEER_CATEGORY_MAP,
|
REGISTER_ENGINEER_CATEGORY_MAP,
|
||||||
PERSONNEL_POST_TYPE_MAP,
|
|
||||||
ABILITY_SOURCE_MAP,
|
ABILITY_SOURCE_MAP,
|
||||||
TITLE_LEVEL_MAP,
|
TITLE_LEVEL_MAP,
|
||||||
} from "~/enumerate/enterpriseOptions";
|
} from "~/enumerate/enterpriseOptions";
|
||||||
|
|
@ -170,8 +169,19 @@ export default function StaffViewModal({
|
||||||
<Descriptions.Item label="基础学科专业">
|
<Descriptions.Item label="基础学科专业">
|
||||||
{info.basicDisciplineMajorName || "-"}
|
{info.basicDisciplineMajorName || "-"}
|
||||||
</Descriptions.Item>
|
</Descriptions.Item>
|
||||||
<Descriptions.Item label="人员岗位类型">
|
<Descriptions.Item label="是否技术负责人">
|
||||||
{PERSONNEL_POST_TYPE_MAP[info.personnelPositionType] || "-"}
|
{info.technicalDirectorFlag === true
|
||||||
|
? "是"
|
||||||
|
: info.technicalDirectorFlag === false
|
||||||
|
? "否"
|
||||||
|
: "-"}
|
||||||
|
</Descriptions.Item>
|
||||||
|
<Descriptions.Item label="是否过程控制负责人">
|
||||||
|
{info.processControlLeaderFlag === true
|
||||||
|
? "是"
|
||||||
|
: info.processControlLeaderFlag === false
|
||||||
|
? "否"
|
||||||
|
: "-"}
|
||||||
</Descriptions.Item>
|
</Descriptions.Item>
|
||||||
<Descriptions.Item label="主要学习工作经历" span={2}>
|
<Descriptions.Item label="主要学习工作经历" span={2}>
|
||||||
{info.workExperience || "-"}
|
{info.workExperience || "-"}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ import {
|
||||||
EDUCATION_TYPE_OPTIONS,
|
EDUCATION_TYPE_OPTIONS,
|
||||||
REGISTER_ENGINEER_OPTIONS,
|
REGISTER_ENGINEER_OPTIONS,
|
||||||
REGISTER_ENGINEER_CATEGORY_OPTIONS,
|
REGISTER_ENGINEER_CATEGORY_OPTIONS,
|
||||||
PERSONNEL_POST_TYPE_OPTIONS,
|
|
||||||
ABILITY_SOURCE_OPTIONS,
|
ABILITY_SOURCE_OPTIONS,
|
||||||
EVALUATOR_OPTIONS,
|
EVALUATOR_OPTIONS,
|
||||||
TITLE_LEVEL_OPTIONS,
|
TITLE_LEVEL_OPTIONS,
|
||||||
|
|
@ -831,11 +830,26 @@ function StaffFormModal({
|
||||||
/>
|
/>
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
<Form.Item name="personnelPositionType" label="人员岗位类型">
|
<Form.Item name="technicalDirectorFlag" label="是否技术负责人">
|
||||||
<Select
|
<Select
|
||||||
placeholder="请选择人员岗位类型"
|
placeholder="请选择"
|
||||||
allowClear
|
allowClear
|
||||||
options={PERSONNEL_POST_TYPE_OPTIONS}
|
options={[
|
||||||
|
{ label: "是", value: true },
|
||||||
|
{ label: "否", value: false },
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</Form.Item>
|
||||||
|
</Col>
|
||||||
|
<Col span={12}>
|
||||||
|
<Form.Item name="processControlLeaderFlag" label="是否过程控制负责人">
|
||||||
|
<Select
|
||||||
|
placeholder="请选择"
|
||||||
|
allowClear
|
||||||
|
options={[
|
||||||
|
{ label: "是", value: true },
|
||||||
|
{ label: "否", value: false },
|
||||||
|
]}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Col>
|
</Col>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ import { Button, Modal, Space, Table } from "antd";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { CAPABILITY_MAP, CERT_LEVEL_LABEL_BY_TYPE } from "~/enumerate/constant";
|
import { CAPABILITY_MAP, CERT_LEVEL_LABEL_BY_TYPE } from "~/enumerate/constant";
|
||||||
import {
|
import {
|
||||||
PERSONNEL_POST_TYPE_MAP,
|
|
||||||
TITLE_LEVEL_MAP,
|
TITLE_LEVEL_MAP,
|
||||||
} from "~/enumerate/enterpriseOptions";
|
} from "~/enumerate/enterpriseOptions";
|
||||||
import StaffViewModal from "~/components/StaffViewModal";
|
import StaffViewModal from "~/components/StaffViewModal";
|
||||||
|
|
@ -87,9 +86,13 @@ const PersonnelStep = ({ personnelList = [], disabled, onAdd, onRemove, manageme
|
||||||
{ title: "姓名", dataIndex: "personName" },
|
{ title: "姓名", dataIndex: "personName" },
|
||||||
{
|
{
|
||||||
title: "职务",
|
title: "职务",
|
||||||
dataIndex: "personnelPositionType",
|
|
||||||
width: 120,
|
width: 120,
|
||||||
render: (v) => PERSONNEL_POST_TYPE_MAP[v] || "-",
|
render: (_, record) => {
|
||||||
|
const roles = [];
|
||||||
|
if (record.technicalDirectorFlag === true) roles.push("技术负责人");
|
||||||
|
if (record.processControlLeaderFlag === true) roles.push("过程控制负责人");
|
||||||
|
return roles.length ? roles.join("、") : "-";
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "职称",
|
title: "职称",
|
||||||
|
|
|
||||||
|
|
@ -356,7 +356,7 @@ function FilingFormPage(props) {
|
||||||
label: "2. 管理人员基本情况汇总表",
|
label: "2. 管理人员基本情况汇总表",
|
||||||
children: (
|
children: (
|
||||||
<PersonnelStep
|
<PersonnelStep
|
||||||
personnelList={(detail?.personnelList || []).filter((item) => !!item.personnelPositionType)}
|
personnelList={(detail?.personnelList || []).filter((item) => item.technicalDirectorFlag || item.processControlLeaderFlag)}
|
||||||
disabled={readOnly}
|
disabled={readOnly}
|
||||||
onAdd={handlePersonnelAdd}
|
onAdd={handlePersonnelAdd}
|
||||||
onRemove={handlePersonnelRemove}
|
onRemove={handlePersonnelRemove}
|
||||||
|
|
@ -369,7 +369,7 @@ function FilingFormPage(props) {
|
||||||
label: "3. 专职安全评价师基本情况汇总表",
|
label: "3. 专职安全评价师基本情况汇总表",
|
||||||
children: (
|
children: (
|
||||||
<PersonnelStep
|
<PersonnelStep
|
||||||
personnelList={(detail?.personnelList || []).filter((item) => !item.personnelPositionType)}
|
personnelList={(detail?.personnelList || []).filter((item) => !item.technicalDirectorFlag && !item.processControlLeaderFlag)}
|
||||||
disabled={readOnly}
|
disabled={readOnly}
|
||||||
onAdd={handlePersonnelAdd}
|
onAdd={handlePersonnelAdd}
|
||||||
onRemove={handlePersonnelRemove}
|
onRemove={handlePersonnelRemove}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue