diff --git a/primeport.zip b/primeport.zip deleted file mode 100644 index 95d4448..0000000 Binary files a/primeport.zip and /dev/null differ diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js index 3a7e545..4b04257 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js @@ -215,12 +215,17 @@ const ReviewModalComponent = (props) => { const getData = async () => { const { data } = await props["vehicleApplyInfo"]({ id: props.vehicleApplyId }); + console.log(data); 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 }); + let informSignFile = [] + if(data.informSignId){ + informSignFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[606], eqForeignKey: data.informSignId }); + } + setInfo({ ...data, drivingLicenseFile, diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/View/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/View/index.js index f0ce4d0..1f00c50 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/View/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/View/index.js @@ -17,6 +17,7 @@ function View(props) { const [info, setInfo] = useState({}); const getData = async () => { const { data } = await props["vehicleApplyInfo"]({ id: query.id }); + const drivingLicenseFile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[601], eqForeignKey: data.drivingLicenseId, @@ -50,7 +51,7 @@ function View(props) { items={[ { label: "访问人姓名", children: info.employeeVehicleUserName }, { label: "手机号", children: info.lsUserPhone }, - { label: "身份证号", children: info.lsUserIdcard }, + { label: "身份证号", children: info.lsUserIdcard ? atob(info.lsUserIdcard) : "" }, { label: "车牌号", children: info.licenceNo }, { label: "车牌类型", children: info.licenceTypeName }, { label: "车辆类型", children: info.vehicleTypeName },