diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index f7bbceb..2061117 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -966,8 +966,6 @@ const UserSelectComponent = (props) => { const { tableProps, getData } = useTable(props["userList"], { form, params: { - likeName: "", - likeUserIdCard: "", inDepartmentId, eqEmploymentFlag: 1, // 在职 }, diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js index 2614563..0ff5a80 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js @@ -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 useDeleteFile from "zy-react-library/hooks/useDeleteFile"; 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 useGetUserInfo from "zy-react-library/hooks/useGetUserInfo"; import useTable from "zy-react-library/hooks/useTable"; 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 { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace"; @@ -214,7 +214,9 @@ const StepOneComponent = (props) => { { label: "项目基础信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, { name: "projectName", label: "项目名称" }, { - name: "userId", label: "项目负责人", render: ( + name: "userId", + label: "项目负责人", + render: ( { } }} /> - ), componentProps: { + ), + componentProps: { onChange: (userId) => { if (!userId) { // 如果清空了项目负责人,从项目人员列表中移除 @@ -255,7 +258,7 @@ const StepOneComponent = (props) => { props.setUsercontentAddCmdList(newUserList); } }, - } + }, }, { name: "userName", label: "项目负责人", onlyForLabel: true }, { 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: "否" }] }, { 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, render: FORM_ITEM_RENDER_ENUM.SELECT, itemsField: { valueKey: "qualificationsTypeId", labelKey: "qualificationsTypeName" }, @@ -281,7 +287,7 @@ const StepOneComponent = (props) => { status: event, idKey: "qualificationsTypeId", nameKey: "qualificationsTypeName", - })) + })); }, }, }, @@ -340,7 +346,10 @@ const StepOneComponent = (props) => { }, { name: "approvalUserNames", label: "集团公司人员审核名称", onlyForLabel: true }, { - name: "projectFiles", label: "安全管理协议", span: 24, render: ( + name: "projectFiles", + label: "安全管理协议", + span: 24, + render: ( { form.setFieldValue("deleteProjectFileAddCmdList", [...(form.getFieldValue("deleteProjectFileAddCmdList") || []), file]); }} /> - ) + ), }, { name: "deleteProjectFileAddCmdList", label: "删除的安全管理协议", onlyForLabel: true }, { name: "agreementFileUuid", label: "安全协议uuid", onlyForLabel: true }, @@ -768,8 +777,6 @@ const UsercontentComponent = (props) => { const { tableProps, getData } = useTable(props["userList"], { form, params: { - likeName: "", - likeUserIdCard: "", inDepartmentId, eqEmploymentFlag: 1, // 在职 }, diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js index c9b8f0f..aee3863 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js @@ -157,8 +157,6 @@ const UserSelectComponent = (props) => { const { tableProps, getData } = useTable(props["userList"], { form, params: { - likeName: "", - likeUserIdCard: "", inDepartmentId, noMain: 1, eqEmploymentFlag: 1, // 在职