From ac8d75adf5e13a14636c198b35a69b8b63262704 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 27 May 2026 11:05:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fixed=EF=BC=9A=E8=BF=87=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=A6=81=E6=AD=A2=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=85=A5=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FirstLevelDoor/PersonnelApplication/Add/index.js | 2 +- .../Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js | 2 +- .../FirstLevelDoor/VehicleApplication/List/index.js | 2 +- .../Supervision/EnclosedArea/Apply/Personnel/Add/index.js | 2 +- .../Supervision/EnclosedArea/Apply/Vehicle/Add/index.js | 2 +- .../VehiclesViolation/VehicleBlacklist/List/index.js | 3 ++- .../LongTermVehicleApproval/RelatedVehicles/index.js | 1 + 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js index 6c64fbf..4371abc 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js @@ -35,7 +35,7 @@ function Add(props) { const signatureUrl = useRef(""); const getXgfProjectListAll = async () => { - const { data } = await props["xgfProjectListAll"](); + const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 }); setXgfProjectListAll(data); }; diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js index 3fcb25b..8b7786c 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/Add/index.js @@ -33,7 +33,7 @@ function Add(props) { const signatureUrl = useRef(""); const getXgfProjectListAll = async () => { - const { data } = await props["xgfProjectListAll"](); + const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 }); setXgfProjectListAll(data); }; diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js index 1cea0a8..70da9cd 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js @@ -171,7 +171,7 @@ const ViewModalComponent = (props) => { const { loading: getFileLoading, getFile } = useGetFile(); const getData = async () => { - const { data } = await props["vehicleApplyInfo"]({ vehicleApplyId: props.id }); + const { data } = await props["vehicleApplyInfo"]({ id: props.id }); const drivingLicenseFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[601], eqForeignKey: data.drivingLicenseId, 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 dab4a3f..9e8ee7f 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Personnel/Add/index.js @@ -39,7 +39,7 @@ function Add(props) { }; const getXgfProjectListAll = async () => { - const { data } = await props["xgfProjectListAll"](); + const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 }); setXgfProjectListAll(data); }; 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 1fbc8f4..9607284 100644 --- a/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js +++ b/src/pages/Container/Supervision/EnclosedArea/Apply/Vehicle/Add/index.js @@ -55,7 +55,7 @@ function Add(props) { }; const getXgfProjectListAll = async () => { - const { data } = await props["xgfProjectListAll"](); + const { data } = await props["xgfProjectListAll"]({betweenProjectTime :1 }); setXgfProjectListAll(data); }; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js index b83c74d..47b7c18 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/VehiclesViolation/VehicleBlacklist/List/index.js @@ -51,7 +51,8 @@ function List(props) { // }, // { name: "employeeVehicleUserName", label: "车辆所属人" }, { name: "licenceNo", label: "车牌号" }, - // { name: "vehicleType", label: "车辆类型", render: () }, + { name: "licenceType", label: "车牌类型", render: () }, + { name: "vehicleType", label: "车辆类型", render: () }, ]} form={form} onFinish={getData} 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 1b59ca1..d31f2e0 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js @@ -154,6 +154,7 @@ const ReviewModalComponent = (props) => { const onSubmit = async (values) => { const { success } = await props["vehicleAuditApproval"]({ id: props.id, + vehicleApplyId: props.vehicleApplyId, ...values, }); if (success) { From a493d21cf686135c3fd83550996d95892f444285 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 27 May 2026 15:22:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fixed=EF=BC=9A=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FirstLevelDoor/PersonnelApplication/List/index.js | 2 +- .../Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js | 2 +- .../StakeholderPersonnelAndVehicles/Personnel/List/index.js | 2 +- .../LongTermVehicleApproval/RelatedVehicles/index.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js index 05ad410..19b438c 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/List/index.js @@ -205,7 +205,7 @@ const ViewModalComponent = (props) => { label: "区域范围", children: info.gateLevelAuthArea && JSON.parse(info.gateLevelAuthArea).area.map(item => item.value).join("、"), }, - { label: "访问期限", children: `${info.visitStartTime}-${info.visitEndTime}` }, + { label: "访问期限", children: `${info.visitStartTime}至${info.visitEndTime}` }, { label: "项目人员数", children: info.personApplyList?.length }, { label: "申请时间", children: info.applyTime }, { label: "申请状态", children: getLabelName({ list: ENCLOSED_AREA_AUDIT_STATUS_ENUM, status: info.auditFlag }) }, diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js index 9e608e7..63b6f97 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/VehicleApplication/List/index.js @@ -71,7 +71,7 @@ function List(props) { { title: "访问期限", dataIndex: "visitStartTime", - render: (_, record) => `${record.visitStartTime}-${record.visitEndTime}`, + render: (_, record) =>`${record.visitStartTime}至${record.visitEndTime}`, }, { title: "车辆类型", dataIndex: "vehicleTypeName" }, { title: "车牌类型", dataIndex: "licenceTypeName" }, diff --git a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/Personnel/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/Personnel/List/index.js index 61dd472..b46414f 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/Personnel/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/Personnel/List/index.js @@ -62,7 +62,7 @@ function List(props) { record.visitStartTime + record.visitEndTime, + render: (_, record) =>`${record.visitStartTime}至${record.visitEndTime}`, }, { dataIndex: "vehicleTypeName", title: "车辆类型" }, { dataIndex: "licenceTypeName", title: "车牌类型" },