From 3b00108330cb6bd1ced4333e33913ce105aa773c Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Wed, 25 Mar 2026 10:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E9=97=AD=E5=8C=BA=E5=9F=9F=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=EF=BC=9A=E4=B8=B4=E6=97=B6=E4=BA=BA=E5=91=98=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=81=E4=B8=B4=E6=97=B6=E8=AE=BF=E5=AE=A2=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=AE=B0=E5=BD=95=E3=80=81=E4=B8=B4=E6=97=B6=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=AE=A1=E6=A0=B8=E3=80=81=E4=B8=B4=E6=97=B6=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=AE=A1=E6=A0=B8=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- router.md | 8 +- .../enclosedTemporaryPersonnelReview/index.js | 22 ----- .../enclosedTemporaryVehicleReview/index.js | 22 ----- src/enumerate/namespace/index.js | 2 - .../LongTermPersonnelReview/List/index.js | 2 +- .../List/index.js | 6 +- .../TemporaryPersonnelReview/List/index.js | 55 +++++++----- .../TemporaryPersonnelReview/Review/index.js | 55 +++++++----- .../List/index.js | 78 ++++++++-------- .../LongTermVehicleReview/List/index.js | 2 +- .../List/index.js | 6 +- .../TemporaryVehicleReview/List/index.js | 61 ++++++++----- .../TemporaryVehicleReview/Review/index.js | 62 +++++++------ .../List/index.js | 90 +++++++++---------- .../PersonnelApplication/Apply/index.js | 2 + .../Apply/Personnel/List/index.js | 2 +- .../Apply/PersonnelRecords/List/index.js | 6 +- .../EnclosedArea/Apply/Vehicle/List/index.js | 4 +- .../Apply/VehicleRecords/List/index.js | 8 +- .../RelatedVehicles/index.js | 4 +- .../RelatedPersonnel/index.js | 3 +- 21 files changed, 249 insertions(+), 251 deletions(-) delete mode 100644 src/api/enclosedTemporaryPersonnelReview/index.js delete mode 100644 src/api/enclosedTemporaryVehicleReview/index.js diff --git a/router.md b/router.md index c3cd03f..b1cca54 100644 --- a/router.md +++ b/router.md @@ -106,19 +106,19 @@ `/primeport/container/enterprise/enclosedArea/enterprisePersonnelPermissions/list` - 人员审核/长期人员审核 ## `/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReview/list` -- 人员审核/临时人员审核 +- 人员审核/临时人员审核 ### `/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReview/list` - 人员审核/长期人员审核记录 ## `/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReviewRecords/list` -- 人员审核/临时访客人员记录 +- 人员审核/临时访客人员记录 ## `/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReviewRecords/list` - 车辆审核/长期车辆审核 ## `/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReview/list` -- 车辆审核/临时车辆审核 +- 车辆审核/临时车辆审核 ## `/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReview/list` - 车辆审核/长期车辆审核记录 ## `/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReviewRecords/list` -- 车辆审核/临时车辆审核记录 +- 车辆审核/临时车辆审核记录 ## `/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReviewRecords/list` diff --git a/src/api/enclosedTemporaryPersonnelReview/index.js b/src/api/enclosedTemporaryPersonnelReview/index.js deleted file mode 100644 index 264cee4..0000000 --- a/src/api/enclosedTemporaryPersonnelReview/index.js +++ /dev/null @@ -1,22 +0,0 @@ -import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; - -export const enclosedTemporaryPersonnelReviewList = declareRequest( - "enclosedTemporaryPersonnelReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryPersonnelReviewInfo = declareRequest( - "enclosedTemporaryPersonnelReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryPersonnelReviewSubmit = declareRequest( - "enclosedTemporaryPersonnelReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryPersonnelReviewRecordsList = declareRequest( - "enclosedTemporaryPersonnelReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryPersonnelReviewRecordsRejectReason = declareRequest( - "enclosedTemporaryPersonnelReviewLoading", - `Post > @/primeport/`, -); diff --git a/src/api/enclosedTemporaryVehicleReview/index.js b/src/api/enclosedTemporaryVehicleReview/index.js deleted file mode 100644 index d0fe0cf..0000000 --- a/src/api/enclosedTemporaryVehicleReview/index.js +++ /dev/null @@ -1,22 +0,0 @@ -import { declareRequest } from "@cqsjjb/jjb-dva-runtime"; - -export const enclosedTemporaryVehicleReviewList = declareRequest( - "enclosedTemporaryVehicleReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryVehicleReviewInfo = declareRequest( - "enclosedTemporaryVehicleReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryVehicleReviewSubmit = declareRequest( - "enclosedTemporaryVehicleReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryVehicleReviewRecordsList = declareRequest( - "enclosedTemporaryVehicleReviewLoading", - `Post > @/primeport/`, -); -export const enclosedTemporaryVehicleReviewRecordsRejectReason = declareRequest( - "enclosedTemporaryVehicleReviewLoading", - `Post > @/primeport/`, -); diff --git a/src/enumerate/namespace/index.js b/src/enumerate/namespace/index.js index db1fca1..201b40e 100644 --- a/src/enumerate/namespace/index.js +++ b/src/enumerate/namespace/index.js @@ -27,6 +27,4 @@ export const NS_ENCLOSED_AREA_PERSONNEL_APPLY = defineNamespace("enclosedAreaPer export const NS_ENCLOSED_AREA_VEHICLE_APPLY = defineNamespace("enclosedAreaVehicleApply"); export const NS_ENCLOSED_PERSONNEL_AND_VEHICLE_STATISTICS = defineNamespace("enclosedPersonnelAndVehicleStatistics"); export const NS_ENCLOSED_ENTERPRISE_PERSONNEL_PERMISSIONS = defineNamespace("enclosedEnterprisePersonnelPermissions"); -export const NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW = defineNamespace("enclosedTemporaryPersonnelReview"); -export const NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW = defineNamespace("enclosedTemporaryVehicleReview"); export const NS_MOBILE = defineNamespace("mobile"); diff --git a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js index cef6a4d..00d5f1a 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/LongTermPersonnelReview/List/index.js @@ -20,7 +20,7 @@ function List(props) { { +const ViewRejectReasonModal = (props) => { return ( { ); }; -const ViewRejectReasonModal = Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(ViewRejectReasonModalComponent); - export default Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(List); diff --git a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/List/index.js index 29d5496..e9a5b3a 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/List/index.js @@ -1,49 +1,64 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button } from "antd"; +import { Button, Space } from "antd"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; -import { NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW } from "~/enumerate/namespace"; +import { getLabelName } from "zy-react-library/utils"; +import { ENCLOSED_AREA_AUDIT_STATUS_ENUM } from "~/enumerate/constant"; +import { NS_ENCLOSED_AREA_PERSONNEL_APPLY } from "~/enumerate/namespace"; function List(props) { const [form] = Search.useForm(); - const { tableProps, getData } = useTable(props["enclosedTemporaryPersonnelReviewList"], { + const { tableProps, getData } = useTable(props["enclosedAreaPersonnelApplyList"], { form, + params: { processOrRecord: 1, personBelongType: 4 }, }); return ( `${record.todo6}-${record.todo7}` }, - { title: "审核状态", dataIndex: "todo8" }, + { title: "姓名", dataIndex: "applyPersonUserName" }, + { title: "手机号", dataIndex: "userPhone" }, + { title: "身份证号", dataIndex: "userCard" }, + { title: "申请区域", dataIndex: "closedAreaName" }, + { title: "申请口门名称", dataIndex: "levelTwoMkmjName" }, + { + title: "申请时间范围", + dataIndex: "visitStartTime", + render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`, + }, + { + title: "审核状态", + dataIndex: "auditFlag", + render: (_, record) => getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: record.auditFlag }), + }, { title: "操作", width: 100, fixed: "right", render: (_, record) => ( - + + {record.currentUserCanAudit === 1 && ( + + )} + ), }, ]} @@ -53,4 +68,4 @@ function List(props) { ); } -export default Connect([NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW], true)(List); +export default Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(List); diff --git a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/Review/index.js b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/Review/index.js index 6de9129..df1c07f 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/Review/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReview/Review/index.js @@ -5,18 +5,25 @@ import FormBuilder from "zy-react-library/components/FormBuilder"; import Page from "zy-react-library/components/Page"; import PreviewImg from "zy-react-library/components/PreviewImg"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; +import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; +import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; -import { NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW } from "~/enumerate/namespace"; +import { NS_ENCLOSED_AREA_PERSONNEL_APPLY } from "~/enumerate/namespace"; function Review(props) { const [info, setInfo] = useState({}); const query = useGetUrlQuery(); const [form] = FormBuilder.useForm(); + const { loading: getFileLoading, getFile } = useGetFile(); const getData = async () => { - const { data } = await props["enclosedTemporaryPersonnelReviewInfo"]({ id: query.id }); - setInfo(data); + const { data } = await props["enclosedAreaPersonnelApplyInfo"]({ id: query.id }); + const informSign = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[609], eqForeignKey: data.informSignId }); + setInfo({ + ...data, + informSign, + }); }; useEffect(() => { @@ -24,7 +31,7 @@ function Review(props) { }, []); const onSubmit = async (values) => { - const { success } = await props["enclosedTemporaryPersonnelReviewSubmit"]({ + const { success } = await props["enclosedAreaPersonnelApplyReviewSubmit"]({ ...values, id: query.id, }); @@ -35,22 +42,28 @@ function Review(props) { }; return ( - - + + 人员信息 ) }, - { label: "申请原因", children: info.todo9 }, - { label: "申请人员签字", children: () }, + { label: "姓名", children: info.applyPersonUserName }, + { label: "手机号", children: info.userPhone }, + { label: "身份证号", children: info.userCard }, + { label: "申请区域", children: info.closedAreaName }, + { label: "一级口门", children: info.levelOneMkmjName }, + { label: "二级口门", children: info.levelTwoMkmjName }, + { label: "申请时间范围", children: `${info.visitStartTime} - ${info.visitEndTime}` }, + { label: "个人照片", children: () }, + { label: "申请原因", children: info.applyReason }, + { label: "申请人员签字", children: () }, ]} /> {!props.headerTitle && ( @@ -59,21 +72,21 @@ function Review(props) { span={24} onFinish={onSubmit} values={{ - todo1: "1", + auditFlag: "2", }} 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", + name: "refusalReason", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, - dependencies: ["todo1"], - hidden: formValues => !(formValues.todo1 === "0"), + dependencies: ["auditFlag"], + hidden: formValues => !(formValues.auditFlag === "3"), }, ]} form={form} @@ -84,4 +97,4 @@ function Review(props) { ); } -export default Connect([NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW], true)(Review); +export default Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(Review); diff --git a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReviewRecords/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReviewRecords/List/index.js index 53653e9..6086047 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReviewRecords/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/PersonnelReview/TemporaryPersonnelReviewRecords/List/index.js @@ -1,40 +1,51 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Modal, Space } from "antd"; -import { useEffect, useState } from "react"; +import { useState } from "react"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; -import { NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW } from "~/enumerate/namespace"; +import { getLabelName } from "zy-react-library/utils"; +import { ENCLOSED_AREA_AUDIT_STATUS_ENUM } from "~/enumerate/constant"; +import { NS_ENCLOSED_AREA_PERSONNEL_APPLY } from "~/enumerate/namespace"; function List(props) { const [viewRejectReasonModalVisible, setViewRejectReasonModalVisible] = useState(false); - const [currentId, setCurrentId] = useState(""); + const [currentRefusalReason, setCurrentRefusalReason] = useState(""); const [form] = Search.useForm(); - const { tableProps, getData } = useTable(props["enclosedTemporaryPersonnelReviewRecordsList"], { + const { tableProps, getData } = useTable(props["enclosedAreaPersonnelApplyList"], { form, + params: { processOrRecord: 2, personBelongType: 4 }, }); return (
`${record.todo6}-${record.todo7}` }, - { title: "审核状态", dataIndex: "todo8" }, + { title: "姓名", dataIndex: "applyPersonUserName" }, + { title: "手机号", dataIndex: "userPhone" }, + { title: "身份证号", dataIndex: "userCard" }, + { title: "申请区域", dataIndex: "closedAreaName" }, + { title: "申请口门名称", dataIndex: "levelTwoMkmjName" }, + { + title: "申请时间范围", + dataIndex: "visitStartTime", + render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`, + }, + { + title: "审核状态", + dataIndex: "auditFlag", + render: (_, record) => getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: record.auditFlag }), + }, { title: "操作", width: 150, @@ -49,15 +60,17 @@ function List(props) { > 查看 - + {record.auditFlag === 3 && ( + + )} ), }, @@ -67,10 +80,10 @@ function List(props) { { viewRejectReasonModalVisible && ( { setViewRejectReasonModalVisible(false); - setCurrentId(""); + setCurrentRefusalReason(""); }} /> ) @@ -79,17 +92,7 @@ function List(props) { ); } -const ViewRejectReasonModalComponent = (props) => { - const [info, setInfo] = useState({}); - const getData = async () => { - const { data } = await props["enclosedTemporaryPersonnelReviewRecordsRejectReason"]({ id: props.id }); - setInfo(data); - }; - - useEffect(() => { - getData(); - }, []); - +const ViewRejectReasonModal = (props) => { return ( { footer={[ , ]} - loading={props.enclosedTemporaryPersonnelReview.enclosedTemporaryPersonnelReviewLoading} > ); }; -const ViewRejectReasonModal = Connect([NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW], true)(ViewRejectReasonModalComponent); - -export default Connect([NS_ENCLOSED_TEMPORARY_PERSONNEL_REVIEW], true)(List); +export default Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(List); diff --git a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/LongTermVehicleReview/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/LongTermVehicleReview/List/index.js index 642d6cf..d50a0d2 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/LongTermVehicleReview/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/LongTermVehicleReview/List/index.js @@ -20,7 +20,7 @@ function List(props) { { +const ViewRejectReasonModal = (props) => { return ( { ); }; -const ViewRejectReasonModal = Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(ViewRejectReasonModalComponent); - export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(List); diff --git a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/List/index.js index 9fd7b2f..32ce86a 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/List/index.js @@ -1,51 +1,66 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button } from "antd"; +import { Button, Space } from "antd"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; -import { NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW } from "~/enumerate/namespace"; +import { getLabelName } from "zy-react-library/utils"; +import { ENCLOSED_AREA_AUDIT_STATUS_ENUM } from "~/enumerate/constant"; +import { NS_ENCLOSED_AREA_VEHICLE_APPLY } from "~/enumerate/namespace"; function List(props) { const [form] = Search.useForm(); - const { tableProps, getData } = useTable(props["enclosedTemporaryVehicleReviewList"], { + const { tableProps, getData } = useTable(props["enclosedAreaVehicleApplyList"], { form, + params: { processOrRecord: 1, carBelongType: 4 }, }); return (
`${record.todo8} - ${record.todo9}` }, - { title: "审核状态", dataIndex: "todo10" }, + { title: "车辆类型", dataIndex: "vehicleTypeName" }, + { title: "车牌号", dataIndex: "licenceNo" }, + { title: "姓名", dataIndex: "applyPersonUserName" }, + { title: "身份证号", dataIndex: "userCard" }, + { title: "手机号", dataIndex: "userPhone" }, + { title: "申请区域", dataIndex: "closedAreaName" }, + { title: "口门名称", dataIndex: "levelTwoMkmjName" }, + { + title: "申请时间范围", + dataIndex: "visitStartTime", + render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`, + }, + { + title: "审核状态", + dataIndex: "auditFlag", + render: (_, record) => getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: record.auditFlag }), + }, { title: "操作", width: 80, fixed: "right", render: (_, record) => ( - + + {record.currentUserCanAudit === 1 && ( + + )} + ), }, ]} @@ -55,4 +70,4 @@ function List(props) { ); } -export default Connect([NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW], true)(List); +export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(List); diff --git a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/Review/index.js b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/Review/index.js index 471ff25..e1a4ae4 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/Review/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReview/Review/index.js @@ -5,18 +5,29 @@ import FormBuilder from "zy-react-library/components/FormBuilder"; import Page from "zy-react-library/components/Page"; import PreviewImg from "zy-react-library/components/PreviewImg"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; +import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; +import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; -import { NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW } from "~/enumerate/namespace"; +import { NS_ENCLOSED_AREA_VEHICLE_APPLY } from "~/enumerate/namespace"; function Review(props) { const [info, setInfo] = useState({}); const query = useGetUrlQuery(); const [form] = FormBuilder.useForm(); + const { loading: getFileLoading, getFile } = useGetFile(); const getData = async () => { - const { data } = await props["enclosedTemporaryVehicleReviewInfo"]({ id: query.id }); - setInfo(data); + const { data } = await props["enclosedAreaVehicleApplyInfo"]({ id: query.id }); + const vehicleLicenseFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[601], eqForeignKey: data.drivingLicenseId }); + const vehicleFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[602], eqForeignKey: data.attachmentId }); + const informSignFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[610], eqForeignKey: data.informSignId }); + setInfo({ + ...data, + vehicleLicenseFiles, + vehicleFiles, + informSignFiles, + }); }; useEffect(() => { @@ -24,7 +35,7 @@ function Review(props) { }, []); const onSubmit = async (values) => { - const { success } = await props["enclosedTemporaryVehicleReviewSubmit"]({ + const { success } = await props["enclosedAreaVehicleApplyReviewSubmit"]({ ...values, id: query.id, }); @@ -36,26 +47,27 @@ function Review(props) { return ( - + 车辆信息 ) }, - { label: "行驶证照片", children: () }, - { label: "申请原因", children: info.todo13 }, - { label: "申请人员签字", children: () }, + { label: "车辆类型", children: info.vehicleTypeName }, + { label: "车牌类型", children: info.licenceTypeName }, + { label: "车牌号", children: info.licenceNo }, + { label: "驾驶人姓名", children: info.drivingUserName }, + { label: "手机号", children: info.userPhone }, + { label: "身份证号", children: info.userCard }, + { label: "申请区域", children: info.closedAreaName }, + { label: "一级口门名称", children: info.levelOneMkmjName }, + { label: "二级口门名称", children: info.levelTwoMkmjName }, + { label: "申请时间范围", children: `${info.visitStartTime} - ${info.visitEndTime}` }, + { label: "车辆照片", children: () }, + { label: "行驶证照片", children: () }, + { label: "申请原因", children: info.applyReason }, + { label: "申请人员签字", children: () }, ]} /> {!props.headerTitle && ( @@ -64,21 +76,21 @@ function Review(props) { span={24} onFinish={onSubmit} values={{ - todo1: "1", + auditFlag: "2", }} 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", + name: "refusalReason", label: "驳回原因", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, - dependencies: ["todo1"], - hidden: formValues => !(formValues.todo1 === "0"), + dependencies: ["auditFlag"], + hidden: formValues => !(formValues.auditFlag === "3"), }, ]} form={form} @@ -89,4 +101,4 @@ function Review(props) { ); } -export default Connect([NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW], true)(Review); +export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(Review); diff --git a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReviewRecords/List/index.js b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReviewRecords/List/index.js index fb79a91..1dabc20 100644 --- a/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReviewRecords/List/index.js +++ b/src/pages/Container/Enterprise/EnclosedArea/VehicleReview/TemporaryVehicleReviewRecords/List/index.js @@ -1,67 +1,78 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Modal, Space } from "antd"; -import { useEffect, useState } from "react"; +import { useState } from "react"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; -import { ENCLOSED_AREA_BELONGING_END_ENUM } from "~/enumerate/constant"; -import { NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW } from "~/enumerate/namespace"; +import { getLabelName } from "zy-react-library/utils"; +import { ENCLOSED_AREA_AUDIT_STATUS_ENUM } from "~/enumerate/constant"; +import { NS_ENCLOSED_AREA_VEHICLE_APPLY } from "~/enumerate/namespace"; function List(props) { const [viewRejectReasonModalVisible, setViewRejectReasonModalVisible] = useState(false); - const [currentId, setCurrentId] = useState(""); + const [currentRefusalReason, setCurrentRefusalReason] = useState(""); const [form] = Search.useForm(); - const { tableProps, getData } = useTable(props["enclosedTemporaryVehicleReviewRecordsList"], { + const { tableProps, getData } = useTable(props["enclosedAreaVehicleApplyList"], { form, + params: { processOrRecord: 2, carBelongType: 4 }, }); return (
`${record.todo8} - ${record.todo9}` }, - { title: "审核状态", dataIndex: "todo10" }, + { title: "车辆类型", dataIndex: "vehicleTypeName" }, + { title: "车牌号", dataIndex: "licenceNo" }, + { title: "姓名", dataIndex: "applyPersonUserName" }, + { title: "身份证号", dataIndex: "userCard" }, + { title: "手机号", dataIndex: "userPhone" }, + { title: "申请区域", dataIndex: "closedAreaName" }, + { title: "口门名称", dataIndex: "levelTwoMkmjName" }, + { + title: "申请时间范围", + dataIndex: "visitStartTime", + render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`, + }, + { + title: "审核状态", + dataIndex: "auditFlag", + render: (_, record) => getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: record.auditFlag }), + }, { title: "操作", - width: 80, + width: 150, fixed: "right", render: (_, record) => ( - + {record.auditFlag === 3 && ( + + )} ), }, @@ -71,10 +82,10 @@ function List(props) { { viewRejectReasonModalVisible && ( { setViewRejectReasonModalVisible(false); - setCurrentId(""); + setCurrentRefusalReason(""); }} /> ) @@ -83,17 +94,7 @@ function List(props) { ); } -const ViewRejectReasonModalComponent = (props) => { - const [info, setInfo] = useState({}); - const getData = async () => { - const { data } = await props["enclosedTemporaryVehicleReviewRecordsRejectReason"]({ id: props.id }); - setInfo(data); - }; - - useEffect(() => { - getData(); - }, []); - +const ViewRejectReasonModal = (props) => { return ( { footer={[ , ]} - loading={props.enclosedTemporaryVehicleReview.enclosedTemporaryVehicleReviewLoading} > ); }; -const ViewRejectReasonModal = Connect([NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW], true)(ViewRejectReasonModalComponent); - -export default Connect([NS_ENCLOSED_TEMPORARY_VEHICLE_REVIEW], true)(List); +export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(List); diff --git a/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js b/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js index c790410..d15bdea 100644 --- a/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js +++ b/src/pages/Container/Mobile/firstLevelDoor/PersonnelApplication/Apply/index.js @@ -181,6 +181,8 @@ function Apply(props) { attachmentId, userFaceUrl, informSignId, + jurisdictionalCorpId: values.jurisdictionalCorpId?.at(-1), + closedAreaId: values.closedAreaId?.at(-1), }); if (success) { props.history.push(`./success?id=${data.id}&tmpApplyType=${values.tmpApplyType}&tmpMkmjType=${values.tmpMkmjType}`); diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js index 436be70..b59e85a 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/List/index.js @@ -28,7 +28,7 @@ function List(props) { { +const ViewRejectReasonModal = (props) => { return ( { ); }; -const ViewRejectReasonModal = Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(ViewRejectReasonModalComponent); - export default Connect([NS_ENCLOSED_AREA_PERSONNEL_APPLY], true)(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 8ef6f1e..18f50e3 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/List/index.js @@ -39,7 +39,7 @@ function List(props) { `${record.visitStartTime} - ${record.visitEndTime}`, }, { title: "申请原因", dataIndex: "applyReason" }, - { title: "车牌号", dataIndex: "licenceLo" }, + { title: "车牌号", dataIndex: "licenceNo" }, { title: "车辆照片", dataIndex: "files", render: (_, record) => }, { title: "所属项目", dataIndex: "projectName", hidden: !(props.entrance === "stakeholder") }, { diff --git a/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js b/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js index 151d7d3..67d708e 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/VehicleRecords/List/index.js @@ -40,7 +40,7 @@ function List(props) { `${record.visitStartTime} - ${record.visitEndTime}`, }, { title: "申请原因", dataIndex: "applyReason" }, - { title: "车牌号", dataIndex: "licenceLo" }, + { title: "车牌号", dataIndex: "licenceNo" }, { title: "车辆照片", dataIndex: "files", render: (_, record) => }, { title: "所属项目", dataIndex: "projectName", hidden: !(props.entrance === "stakeholder") }, { @@ -112,7 +112,7 @@ function List(props) { ); } -const ViewRejectReasonModalComponent = (props) => { +const ViewRejectReasonModal = (props) => { return ( { ); }; -const ViewRejectReasonModal = Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(ViewRejectReasonModalComponent); - export default Connect([NS_ENCLOSED_AREA_VEHICLE_APPLY], true)(List); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js index 93ec1ee..0add463 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js @@ -195,7 +195,7 @@ const ReviewModalComponent = (props) => { ); }; -const ViewRejectReasonModalComponent = (props) => { +const ViewRejectReasonModal = (props) => { return ( { footer={[ , ]} - loading={props.vehicleAudit.vehicleAuditLoading} > { ); }; -const ViewRejectReasonModalComponent = (props) => { +const ViewRejectReasonModal = (props) => { return (