diff --git a/router.md b/router.md index 7e295cd..7ce72c2 100644 --- a/router.md +++ b/router.md @@ -4,9 +4,9 @@ `/primeport/container/supervision/firstLevelDoor/approverUser` - 基本信息管理/一级口门信息管理 ## `/primeport/container/supervision/firstLevelDoor/basicInfo/firstLevelDoorInfo/list` -- 进港审批管理/人员审批管理/相关方人员进港审批 +- 进港审批管理/人员审批管理/相关方人员进港审批 # `/primeport/container/supervision/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel` -- 进港审批管理/人员审批管理/相关方人员进港审批记录 +- 进港审批管理/人员审批管理/相关方人员进港审批记录 # `/primeport/container/supervision/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnelRecords` - 进港审批管理/长期车辆审批管理/股份车辆审批 ## `/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles` @@ -24,7 +24,7 @@ `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list` - 进港审批管理/临时访客管理/临时车辆管理记录 # `/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list` -- 进出港信息管理/股份人员及车辆管理 +- 进出港信息管理/股份人员及车辆管理 # `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list` - 进出港信息管理/个人车辆管理 ## `/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/personalVehicle/list` diff --git a/src/api/relatedPersonnel/index.js b/src/api/relatedPersonnel/index.js index ee95d8a..249ab49 100644 --- a/src/api/relatedPersonnel/index.js +++ b/src/api/relatedPersonnel/index.js @@ -1,21 +1,9 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; -export const relatedPersonnelList = declareRequest( - "relatedPersonnelLoading", - `Post > @/primeport/`, -); -export const relatedPersonnelInfo = declareRequest( - "relatedPersonnelLoading", - `Post > @/primeport/`, -); export const relatedPersonnelPersonnelList = declareRequest( "relatedPersonnelLoading", `Post > @/primeport/`, ); -export const relatedPersonnelRejectReason = declareRequest( - "relatedPersonnelLoading", - `Post > @/primeport/`, -); export const relatedPersonnelApproval = declareRequest( "relatedPersonnelLoading", `Post > @/primeport/`, diff --git a/src/api/stockPersonnelAndVehicles/index.js b/src/api/stockPersonnelAndVehicles/index.js index afaf013..fce2886 100644 --- a/src/api/stockPersonnelAndVehicles/index.js +++ b/src/api/stockPersonnelAndVehicles/index.js @@ -2,7 +2,7 @@ import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; export const stockPersonnelAndVehiclesList = declareRequest( "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, + `Post > @/primeport/personApply/personnelVehicleManagementList`, ); export const stockPersonnelAndVehiclesPersonnelRecordsList = declareRequest( "stockPersonnelAndVehiclesLoading", @@ -10,31 +10,7 @@ export const stockPersonnelAndVehiclesPersonnelRecordsList = declareRequest( ); export const stockPersonnelAndVehiclesAuthorization = declareRequest( "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stockPersonnelAndVehiclesVehicleManagementList = declareRequest( - "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stockPersonnelAndVehiclesVehicleManagementDelete = declareRequest( - "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stockPersonnelAndVehiclesVehicleManagementUpdateStatus = declareRequest( - "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stockPersonnelAndVehiclesVehicleManagementInfo = declareRequest( - "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stockPersonnelAndVehiclesVehicleManagementAdd = declareRequest( - "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, -); -export const stockPersonnelAndVehiclesVehicleManagementUpdate = declareRequest( - "stockPersonnelAndVehiclesLoading", - `Post > @/primeport/`, + `Post > @/primeport/personApply/authorization`, ); export const stockPersonnelAndVehiclesVehicleManagementVehicleRecordsList = declareRequest( "stockPersonnelAndVehiclesLoading", diff --git a/src/api/vehicleAudit/index.js b/src/api/vehicleAudit/index.js index fb01dd2..fb2837d 100644 --- a/src/api/vehicleAudit/index.js +++ b/src/api/vehicleAudit/index.js @@ -16,7 +16,3 @@ export const vehicleAuditApproval = declareRequest( "vehicleAuditLoading", `Post > @/primeport/vehicleAudit/audit`, ); -export const vehicleAuditRejectReason = declareRequest( - "vehicleAuditLoading", - `Post > @/primeport/`, -); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js index 0474a8c..0211f22 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/Add/index.js @@ -104,8 +104,8 @@ function Add(props) { if (!props.vehicleBelongType) { return [ { name: "vehicleBelongType", label: "车辆所属类型", onlyForLabel: true }, - { name: "employeeVehicleUserName", label: "车辆归属人", span: 24, componentProps: { disabled: true } }, - { name: "employeeVehicleUserId", label: "车辆归属人ID", onlyForLabel: true }, + { name: "employeeVehicleUserName", label: "车辆所属人", span: 24, componentProps: { disabled: true } }, + { name: "employeeVehicleUserId", label: "车辆所属人ID", onlyForLabel: true }, { name: "vehicleDepartmentName", label: "车辆所属部门", onlyForLabel: true }, { name: "vehicleDepartmentId", label: "车辆所属部门ID", onlyForLabel: true }, { name: "vehicleCorpId", label: "车辆所属企业ID", onlyForLabel: true }, @@ -127,6 +127,25 @@ function Add(props) { { name: "vehicleCorpName", label: "车辆所属企业名称", onlyForLabel: true }, ]; } + else if (props.vehicleBelongType === 1) { + return [ + { + name: "vehicleBelongType", + label: "车辆所属类型", + span: 24, + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: VEHICLE_TYPE_ENUM, + componentProps: { disabled: true }, + }, + { name: "vehicleDepartmentName", label: "车辆所属部门", componentProps: { disabled: true } }, + { name: "vehicleDepartmentId", label: "车辆所属部门ID", onlyForLabel: true }, + { name: "employeeVehicleUserName", label: "车辆所属人", componentProps: { disabled: true } }, + { name: "employeeVehicleUserId", label: "车辆所属人ID", onlyForLabel: true }, + { name: "vehicleCorpId", label: "车辆所属企业ID", onlyForLabel: true }, + { name: "vehicleCorpName", label: "车辆所属企业名称", onlyForLabel: true }, + ]; + } + return []; }; return ( diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/View/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/View/index.js index 637ae18..8388c27 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/View/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/PersonalVehicle/View/index.js @@ -36,7 +36,7 @@ function View(props) { const getVehicleBelongFields = (info) => { if (!props.vehicleBelongType) { - return [{ label: "车辆归属人", children: info.employeeVehicleUserName, span: 24 }]; + return [{ label: "车辆所属人", children: info.employeeVehicleUserName, span: 24 }]; } else if (props.vehicleBelongType === 2) { return [ @@ -44,6 +44,13 @@ function View(props) { { label: "车辆所属部门", children: info.vehicleDepartmentName }, ]; } + else if (props.vehicleBelongType === 1) { + return [ + { label: "车辆所属类型", children: getLabelName({ list: VEHICLE_TYPE_ENUM, status: info.vehicleBelongType }) }, + { label: "车辆所属部门", children: info.vehicleDepartmentName }, + { label: "车辆所属人", children: info.employeeVehicleUserName, span: 24 }, + ]; + } }; return ( diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js index 102deb9..bccd190 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StockPersonnelAndVehicles/List/index.js @@ -15,7 +15,7 @@ import { NS_STOCK_PERSONNEL_AND_VEHICLES } from "~/enumerate/namespace"; function List(props) { const [authorizationModalVisible, setAuthorizationModalVisible] = useState(false); - const [currentId, setCurrentId] = useState(""); + const [currentInfo, setCurrentInfo] = useState(""); const [form] = Form.useForm(); const [urlState, setUrlState] = useUrlState({ departmentId: "", @@ -64,7 +64,7 @@ function List(props) { >
- + ( <> @@ -86,13 +86,13 @@ function List(props) { )} columns={[ - { title: "部门", dataIndex: "todo1" }, - { title: "姓名", dataIndex: "todo2" }, - { title: "岗位", dataIndex: "todo3" }, - { title: "手机号", dataIndex: "todo4" }, - { title: "车辆数", dataIndex: "todo5" }, - { title: "门禁权限", dataIndex: "todo6", render: (_, record) => record.todo6 === 1 ? "开启" : "关闭" }, - { title: "是否录入人脸", dataIndex: "todo7", render: (_, record) => record.todo7 === 1 ? "是" : "否" }, + { title: "部门", dataIndex: "departmentName" }, + { title: "姓名", dataIndex: "userName" }, + { title: "岗位", dataIndex: "postName" }, + { title: "手机号", dataIndex: "userPhone" }, + { title: "车辆数", dataIndex: "vehicleCount" }, + { title: "门禁权限", dataIndex: "mkmjPermission", render: (_, record) => record.mkmjPermission === 1 ? "开启" : "关闭" }, + { title: "是否录入人脸", dataIndex: "userFaceUrl", render: (_, record) => record.userFaceUrl ? "是" : "否" }, { title: "操作", width: 200, @@ -102,7 +102,7 @@ function List(props) { + {record.auditFlag === 3 && ( + + )} - -
record.gateLevelAuthArea && JSON.parse(record.gateLevelAuthArea).area.map(item => item.value).join("、"), + }, + { + title: "访问期限", + dataIndex: "visitStartTime", + render: (_, record) => `${record.visitStartTime}至${record.visitEndTime}`, + }, { title: "项目人员数", dataIndex: "todo5" }, { title: "申请时间", dataIndex: "todo6" }, - { title: "审核状态", dataIndex: "todo7" }, + { + title: "审批状态", + dataIndex: "auditFlag", + render: (_, record) => getLabelName({ list: STATUS_ENUM, status: record.auditFlag }), + }, { title: "操作", width: 150, render: (_, record) => ( - {!props.isRecords && ( + {(!props.isRecords && record.currentUserCanAudit === 1) && ( - + {record.auditFlag === 3 && ( + + )} ), }, @@ -106,10 +131,10 @@ function RelatedPersonnel(props) { { viewRejectReasonModalVisible && ( { setViewRejectReasonModalVisible(false); - setCurrentId(""); + setReasonsRefusal(""); }} /> ) @@ -122,9 +147,9 @@ const ReviewModalComponent = (props) => { const [form] = Form.useForm(); const onSubmit = async (values) => { - const { success } = await props["relatedPersonnelApproval"]({ - id: props.id, + const { success } = await props["temporaryPersonnelReview"]({ ...values, + id: props.id, }); if (success) { message.success("操作成功"); @@ -141,7 +166,7 @@ const ReviewModalComponent = (props) => { onCancel={props.onCancel} onOk={form.submit} width={800} - confirmLoading={props.relatedPersonnel.relatedPersonnelLoading} + confirmLoading={props.temporaryPersonnel.temporaryPersonnelLoading} > { labelCol={{ span: 8 }} span={24} values={{ - todo1: "1", + auditFlag: "1", }} showActionButtons={false} options={[ { - name: "todo1", + name: "auditFlag", label: "是否通过审核", render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: "1", name: "通过" }, { bianma: "0", name: "打回" }], + items: [{ bianma: "2", name: "通过" }, { bianma: "3", name: "不通过" }], }, { name: "todo2", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, - dependencies: ["todo1"], - hidden: formValues => !(formValues.todo1 === "0"), + dependencies: ["auditFlag"], + hidden: formValues => !(formValues.auditFlag === "3"), }, ]} /> @@ -176,6 +201,8 @@ const ReviewModalComponent = (props) => { const InfoModalComponent = (props) => { const [info, setInfo] = useState({}); + const { getFile } = useGetFile(); + const { tableProps } = useTable(props["relatedPersonnelPersonnelList"], { params: { id: props.id, @@ -184,8 +211,12 @@ const InfoModalComponent = (props) => { }); const getData = async () => { - const { data } = await props["relatedPersonnelInfo"]({ id: props.id }); - setInfo(data); + const { data } = await props["temporaryPersonnelInfo"]({ id: props.id }); + const informSignFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[606], eqForeignKey: data.informSignId }); + setInfo({ + ...data, + informSignFile, + }); }; useEffect(() => { @@ -201,13 +232,16 @@ const InfoModalComponent = (props) => { styles={{ label: { width: 200 } }} items={[ { label: "相关方名称", children: info.todo1 }, - { label: "项目名称", children: info.todo2 }, - { label: "区域范围", children: info.todo3 }, - { label: "访问期限", children: info.todo4 }, + { label: "项目名称", children: info.projectName }, + { + label: "区域范围", + children: info.gateLevelAuthArea && JSON.parse(info.gateLevelAuthArea).area.map(item => item.value).join("、"), + }, + { label: "访问期限", children: `${info.visitStartTime}至${info.visitEndTime}` }, { label: "项目人员数", children: info.todo5 }, { label: "申请时间", children: info.todo6 }, { label: "申请状态", children: info.todo7 }, - { label: "申请人签字", children: () }, + { label: "申请人签字", children: () }, ]} /> 人员信息 @@ -226,16 +260,6 @@ const InfoModalComponent = (props) => { }; const ViewRejectReasonModalComponent = (props) => { - const [info, setInfo] = useState({}); - const getData = async () => { - const { data } = await props["relatedPersonnelRejectReason"]({ id: props.id }); - setInfo(data); - }; - - useEffect(() => { - getData(); - }, []); - return ( { footer={[ , ]} - loading={props.relatedPersonnel.relatedPersonnelLoading} > @@ -277,7 +300,7 @@ function InfoModal(props) { ); } -const ReviewModal = Connect([NS_RELATED_PERSONNEL], true)(ReviewModalComponent); -const PublicInfoModal = Connect([NS_RELATED_PERSONNEL], true)(InfoModalComponent); -const ViewRejectReasonModal = Connect([NS_RELATED_PERSONNEL], true)(ViewRejectReasonModalComponent); -export default Connect([NS_RELATED_PERSONNEL], true)(RelatedPersonnel); +const ReviewModal = Connect([NS_TEMPORARY_PERSONNEL], true)(ReviewModalComponent); +const PublicInfoModal = Connect([NS_RELATED_PERSONNEL, NS_TEMPORARY_PERSONNEL], true)(InfoModalComponent); +const ViewRejectReasonModal = Connect([NS_TEMPORARY_PERSONNEL], true)(ViewRejectReasonModalComponent); +export default Connect([NS_TEMPORARY_PERSONNEL], true)(RelatedPersonnel);