zcloud_gbs
/
zcloud-gbs-primeport-react
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcloud_gbs:734a3076321db1597e71ff3093e72cedf0939285
Branches Tags
zcloud_gbs:master
..
compare: zcloud_gbs:5f8bfe29b853bb6769d09e47be2d012d4b49f839
Branches Tags
zcloud_gbs:master

No commits in common. "734a3076321db1597e71ff3093e72cedf0939285" and "5f8bfe29b853bb6769d09e47be2d012d4b49f839" have entirely different histories.
734a307632 ... 5f8bfe29b8

3 changed files with 6 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
src/api/vehicleAudit/index.js
View File

@ -4,10 +4,6 @@ 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}`,

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

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

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

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