diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js index c4a3724..21b917e 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js @@ -11,7 +11,6 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import useTable from "zy-react-library/hooks/useTable"; import useUploadFile from "zy-react-library/hooks/useUploadFile"; -import { getLabelName } from "zy-react-library/utils"; import NeedToKnowModal from "~/components/NeedToKnowModal"; import { NS_APPROVER_USER, NS_ENCLOSED_AREA, NS_ENCLOSED_AREA_PERSONNEL_APPLY } from "~/enumerate/namespace"; @@ -95,12 +94,17 @@ function Add(props) { hidden: !(props.entrance === "stakeholder"), componentProps: { onChange: (value) => { - form.setFieldValue("projectName", getLabelName({ list: xgfProjectListAll, status: value, idKey: "id", nameKey: "projectName" })); + const item = xgfProjectListAll.find(i => i.id === value) || {}; + form.setFieldValue("projectName", item.projectName); + form.setFieldValue("projectCorpId", item.corpinfoId); + form.setFieldValue("projectCorpName", item.corpinfoName); setEntourageList([]); }, }, }, { name: "projectName", label: "项目名称", onlyForLabel: true }, + { name: "projectCorpId", label: "相关方名称ID", onlyForLabel: true }, + { name: "projectCorpName", label: "相关方名称", onlyForLabel: true }, { name: "jurisdictionalCorpId", label: "区域管辖单位", diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js index fb074bd..ffa0782 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/View/index.js @@ -42,7 +42,7 @@ function View(props) { ...( props.entrance === "stakeholder" ? [ - { label: "相关方名称", children: info.todo1 }, + { label: "相关方名称", children: info.projectCorpName }, { label: "所属项目", children: info.projectName }, ] : [] diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js index 85aa0b0..b3c57a9 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js @@ -18,6 +18,7 @@ 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 { LICENSE_PLATE_NUMBER } from "zy-react-library/regular"; +import { getLabelName } from "zy-react-library/utils"; import NeedToKnowModal from "~/components/NeedToKnowModal"; import { NS_APPROVER_USER, @@ -137,6 +138,10 @@ function Add(props) { onChange: (value) => { const item = xgfProjectListAll.find(i => i.id === value) || {}; form.setFieldValue("projectName", item.projectName); + form.setFieldValue("projectCorpId", item.corpinfoId); + form.setFieldValue("projectCorpName", item.corpinfoName); + form.setFieldValue("drivingUserId", ""); + form.setFieldValue("drivingUserName", ""); if (value) { getXgfProjectUserGetPeopleProject(value); form.setFieldValue("visitTime", [dayjs(item.startProjectTime).format("YYYY-MM-DD"), dayjs(item.endProjectTime).format("YYYY-MM-DD")]); @@ -149,6 +154,8 @@ function Add(props) { }, }, { name: "projectName", label: "项目名称", onlyForLabel: true }, + { name: "projectCorpId", label: "相关方名称ID", onlyForLabel: true }, + { name: "projectCorpName", label: "相关方名称", onlyForLabel: true }, { name: "isApplyCompanyArea", label: "是否申请本公司区域", @@ -306,7 +313,24 @@ function Add(props) { : []), ...(props.entrance === "stakeholder" ? [ - { name: "todo92", label: "驾驶人员", render: FORM_ITEM_RENDER_ENUM.SELECT, items: xgfProjectUser, itemsField: { labelKey: "userName", valueKey: "userId" } }, + { + name: "drivingUserId", + label: "驾驶人员", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: xgfProjectUser, + itemsField: { labelKey: "userName", valueKey: "userId" }, + componentProps: { + onChange: (value) => { + form.setFieldValue("drivingUserName", getLabelName({ + list: xgfProjectUser, + status: value, + idKey: "userId", + nameKey: "userName", + })); + }, + }, + }, + { name: "drivingUserName", label: "驾驶人员名称", onlyForLabel: true }, ] : []), ...(isSelectVehicle === 2 || props.entrance === "stakeholder" @@ -460,7 +484,12 @@ const SelectVehicleModalComponent = (props) => { return { vehicleBelongType }; }, onSuccess: async (data) => { - const list = await getFile({ single: false, dataSource: data.list, eqType: UPLOAD_FILE_TYPE_ENUM[602], foreignKey: "attachmentId" }); + const list = await getFile({ + single: false, + dataSource: data.list, + eqType: UPLOAD_FILE_TYPE_ENUM[602], + foreignKey: "attachmentId", + }); setList(list); }, }); diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js index 5e39c83..16c16ad 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js @@ -63,7 +63,7 @@ function List(props) { )} columns={[ { title: "车辆类型", dataIndex: "vehicleTypeName" }, - { title: "驾驶人", dataIndex: "applyPersonUserName" }, + { title: "申请人", dataIndex: "applyPersonUserName" }, { title: "部门", dataIndex: "applyPersonDepartmentName" }, { title: "手机号", dataIndex: "userPhone" }, { title: "申请区域", dataIndex: "closedAreaName" }, diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js index 6462ff5..e7a21d9 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/View/index.js @@ -44,7 +44,7 @@ function View(props) { ...( props.entrance === "stakeholder" ? [ - { label: "相关方名称", children: info.todo1 }, + { label: "相关方名称", children: info.projectCorpName }, { label: "所属项目", children: info.projectName }, ] : []