diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PersonnelApplication/Add/index.js index 6182890..db08710 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/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/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 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/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/StakeholderPersonnelAndVehicles/Personnel/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/ImportAndExportPortInfo/StakeholderPersonnelAndVehicles/Personnel/List/index.js index 0a29315..bedf7db 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) { ) }, + { 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..2ccaf0c 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js @@ -50,7 +50,7 @@ function RelatedVehicles(props) { { dataIndex: "visitStartTime", title: "访问期限", - render: (_, record) => record.visitStartTime + record.visitEndTime, + render: (_, record) =>`${record.visitStartTime}至${record.visitEndTime}`, }, { dataIndex: "vehicleTypeName", title: "车辆类型" }, { dataIndex: "licenceTypeName", title: "车牌类型" }, @@ -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) {