Merge remote-tracking branch 'origin/master'

src/api/vehicleAudit/index.js

@@ -4,6 +4,10 @@ export const vehicleAuditList = declareRequest(
   "vehicleAuditLoading",
   `Post > @/primeport/vehicleAudit/pendingApprovalList`,
 );
+export const vehicleApplyInfo = declareRequest(
+  "vehicleAuditLoading",
+  `Get > /primeport/vehicleApply/{id}`,
+);
 export const vehicleAuditInfo = declareRequest(
   "vehicleAuditLoading",
   `Get > /primeport/vehicleAudit/{id}`,

src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/RelatedVehicles/index.js

@@ -235,7 +235,7 @@ const InfoModalComponent = (props) => {
   const { getFile } = useGetFile();
 
   const getData = async () => {
-    const { data } = await props["vehicleAuditInfo"]({ vehicleApplyId: props.vehicleApplyId });
+    const { data } = await props["vehicleApplyInfo"]({ id: props.vehicleApplyId });
     const drivingLicenseFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[601], eqForeignKey: data.drivingLicenseId });
     const attachmentFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[602], eqForeignKey: data.attachmentId });
     const informSignFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[606], eqForeignKey: data.informSignId });
@@ -259,16 +259,16 @@ const InfoModalComponent = (props) => {
         bordered
         styles={{ label: { width: 200 } }}
         items={[
-          { label: "相关方名称", children: info.todo1 },
+          { label: "相关方名称", children: info.vehicleCorpName },
           { label: "项目名称", children: info.projectName },
-          { label: "审核人员", children: info.auditUserName },
+          { label: "审核人员", children: info.currentAuditUserName },
           { label: "时间范围", children: info.visitStartTime + info.visitEndTime },
           { label: "地域范围", children: info.gateLevelAuthArea && JSON.parse(info.gateLevelAuthArea).area.map(item => item.value).join("、") },
-          { label: "驾驶人员", children: info.employeeVehicleUserName },
+          { label: "驾驶人员", children: info.drivingUserName },
           { label: "车辆类型", children: info.vehicleTypeName },
           { label: "车牌类型", children: info.licenceTypeName },
           { label: "车牌号", children: info.licenceNo },
-          { label: "审核状态", children: getLabelName({ list: VEHICLE_AUDIT_STATUS_ENUM, status: info.auditStatus }) },
+          { label: "审核状态", children: getLabelName({ list: VEHICLE_AUDIT_STATUS_ENUM, status: info.auditFlag }) },
           { label: "车辆照片", children: (<PreviewImg files={info.attachmentFile} />) },
           { label: "车辆行驶证照片", children: (<PreviewImg files={info.drivingLicenseFile} />) },
           { label: "申请人签字", children: (<PreviewImg files={info.informSignFile} />) },

src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/LongTermVehicleApproval/ShareVehicles/index.js

@@ -198,7 +198,7 @@ function InfoModalComponent(props) {
   const [recordsList, setRecordsList] = useState([]);
 
   const getData = async () => {
-    const { data } = await props["vehicleAuditInfo"]({ vehicleApplyId: props.vehicleApplyId });
+    const { data } = await props["vehicleAuditInfo"]({ id: props.id });
     const changeAfter = data.changeAfter ? JSON.parse(data.changeAfter) : {};
     const changeBefore = data.changeBefore ? JSON.parse(data.changeBefore) : {};
     const changeAfterDrivingLicenseFile = await getFile({