修复bug:14464

master
LiuJiaNan 2026-02-03 17:14:10 +08:00
parent 1ebc8cdeec
commit 55240c89b4
3 changed files with 18 additions and 15 deletions

View File

@ -966,8 +966,6 @@ const UserSelectComponent = (props) => {
const { tableProps, getData } = useTable(props["userList"], { const { tableProps, getData } = useTable(props["userList"], {
form, form,
params: { params: {
likeName: "",
likeUserIdCard: "",
inDepartmentId, inDepartmentId,
eqEmploymentFlag: 1, // 在职 eqEmploymentFlag: 1, // 在职
}, },

View File

@ -16,11 +16,11 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useDeleteFile from "zy-react-library/hooks/useDeleteFile"; import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetFile from "zy-react-library/hooks/useGetFile";
import useGetUserInfo from "zy-react-library/hooks/useGetUserInfo";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useGetUserInfo from "zy-react-library/hooks/useGetUserInfo";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import useUploadFile from "zy-react-library/hooks/useUploadFile"; import useUploadFile from "zy-react-library/hooks/useUploadFile";
import { getLabelName,validatorEndTime } from "zy-react-library/utils"; import { getLabelName, validatorEndTime } from "zy-react-library/utils";
import ViewProjectReviewUserModal from "~/components/ViewProjectReviewUserModal"; import ViewProjectReviewUserModal from "~/components/ViewProjectReviewUserModal";
import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace"; import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace";
@ -214,7 +214,9 @@ const StepOneComponent = (props) => {
{ label: "项目基础信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, { label: "项目基础信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
{ name: "projectName", label: "项目名称" }, { name: "projectName", label: "项目名称" },
{ {
name: "userId", label: "项目负责人", render: ( name: "userId",
label: "项目负责人",
render: (
<PersonnelSelect <PersonnelSelect
isNeedCorpInfoId={true} isNeedCorpInfoId={true}
params={{ corpinfoId: props.userInfo?.corpinfoId || "" }} params={{ corpinfoId: props.userInfo?.corpinfoId || "" }}
@ -245,7 +247,8 @@ const StepOneComponent = (props) => {
} }
}} }}
/> />
), componentProps: { ),
componentProps: {
onChange: (userId) => { onChange: (userId) => {
if (!userId) { if (!userId) {
// 如果清空了项目负责人,从项目人员列表中移除 // 如果清空了项目负责人,从项目人员列表中移除
@ -255,7 +258,7 @@ const StepOneComponent = (props) => {
props.setUsercontentAddCmdList(newUserList); props.setUsercontentAddCmdList(newUserList);
} }
}, },
} },
}, },
{ name: "userName", label: "项目负责人", onlyForLabel: true }, { name: "userName", label: "项目负责人", onlyForLabel: true },
{ name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE }, { name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE },
@ -269,7 +272,10 @@ const StepOneComponent = (props) => {
{ name: "specialFlag", label: "是否包含特殊作业", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] }, { name: "specialFlag", label: "是否包含特殊作业", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
{ label: "项目审核信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, { label: "项目审核信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
{ {
name: "qualificationsTypeId", label: "项目类别", span: 24, wrapperCol: { span: 5 }, name: "qualificationsTypeId",
label: "项目类别",
span: 24,
wrapperCol: { span: 5 },
items: qualificationsTypeList, items: qualificationsTypeList,
render: FORM_ITEM_RENDER_ENUM.SELECT, render: FORM_ITEM_RENDER_ENUM.SELECT,
itemsField: { valueKey: "qualificationsTypeId", labelKey: "qualificationsTypeName" }, itemsField: { valueKey: "qualificationsTypeId", labelKey: "qualificationsTypeName" },
@ -281,7 +287,7 @@ const StepOneComponent = (props) => {
status: event, status: event,
idKey: "qualificationsTypeId", idKey: "qualificationsTypeId",
nameKey: "qualificationsTypeName", nameKey: "qualificationsTypeName",
})) }));
}, },
}, },
}, },
@ -340,7 +346,10 @@ const StepOneComponent = (props) => {
}, },
{ name: "approvalUserNames", label: "集团公司人员审核名称", onlyForLabel: true }, { name: "approvalUserNames", label: "集团公司人员审核名称", onlyForLabel: true },
{ {
name: "projectFiles", label: "安全管理协议", span: 24, render: ( name: "projectFiles",
label: "安全管理协议",
span: 24,
render: (
<Upload <Upload
fileType="image" fileType="image"
maxCount={5} maxCount={5}
@ -350,7 +359,7 @@ const StepOneComponent = (props) => {
form.setFieldValue("deleteProjectFileAddCmdList", [...(form.getFieldValue("deleteProjectFileAddCmdList") || []), file]); form.setFieldValue("deleteProjectFileAddCmdList", [...(form.getFieldValue("deleteProjectFileAddCmdList") || []), file]);
}} }}
/> />
) ),
}, },
{ name: "deleteProjectFileAddCmdList", label: "删除的安全管理协议", onlyForLabel: true }, { name: "deleteProjectFileAddCmdList", label: "删除的安全管理协议", onlyForLabel: true },
{ name: "agreementFileUuid", label: "安全协议uuid", onlyForLabel: true }, { name: "agreementFileUuid", label: "安全协议uuid", onlyForLabel: true },
@ -768,8 +777,6 @@ const UsercontentComponent = (props) => {
const { tableProps, getData } = useTable(props["userList"], { const { tableProps, getData } = useTable(props["userList"], {
form, form,
params: { params: {
likeName: "",
likeUserIdCard: "",
inDepartmentId, inDepartmentId,
eqEmploymentFlag: 1, // 在职 eqEmploymentFlag: 1, // 在职
}, },

View File

@ -157,8 +157,6 @@ const UserSelectComponent = (props) => {
const { tableProps, getData } = useTable(props["userList"], { const { tableProps, getData } = useTable(props["userList"], {
form, form,
params: { params: {
likeName: "",
likeUserIdCard: "",
inDepartmentId, inDepartmentId,
noMain: 1, noMain: 1,
eqEmploymentFlag: 1, // 在职 eqEmploymentFlag: 1, // 在职