diff --git a/package.json b/package.json index d55beff3..73dba8f 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-signature-canvas": "^1.1.0-alpha.2", - "zy-react-library": "^1.3.30" + "zy-react-library": "1.3.31" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/Stakeholder/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js b/src/pages/Container/Stakeholder/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js index 9e01775..2e8366b 100644 --- a/src/pages/Container/Stakeholder/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js +++ b/src/pages/Container/Stakeholder/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/List/index.js @@ -7,6 +7,7 @@ function List(props) { viewBtn="zgdw-entry-temp-vehicle-show" auditInfoBtn="zgdw-entry-temp-vehicle-audit-info" auditBtn="zgdw-entry-temp-vehicle-audit" + vehicleBelongType={6} {...props} /> ); diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/Add/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/Add/index.js index b74059c..5bc5563 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/Add/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryPersonnel/Add/index.js @@ -27,7 +27,7 @@ function Add(props) { setApprovalUserListAll(data); }; const getFirstLevelDoorInfoListAll = async () => { - const { data } = await props["firstLevelDoorInfoListAll"]({ mkmjLevel: 1, hgAuthArea: gateLevelAuthArea }); + const { data } = await props["firstLevelDoorInfoListAll"]({ mkmjLevel: 1, hgAuthArea: gateLevelAuthArea,mkmjType :"HGKM_MKMJ_CKM_R" }); setFirstLevelDoorInfoListAll(data); }; diff --git a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/Add/index.js b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/Add/index.js index 104363f..91f34fc 100644 --- a/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/Add/index.js +++ b/src/pages/Container/Supervision/FirstLevelDoor/PortEntryApproval/TemporaryVisitor/TemporaryVehicle/Add/index.js @@ -32,7 +32,7 @@ function Add(props) { setApprovalUserListAll(data); }; const getFirstLevelDoorInfoListAll = async () => { - const { data } = await props["firstLevelDoorInfoListAll"]({ mkmjLevel: 1, hgAuthArea: gateLevelAuthArea }); + const { data } = await props["firstLevelDoorInfoListAll"]({ mkmjLevel: 1, hgAuthArea: gateLevelAuthArea,mkmjType :"HGKM_MKMJ_CKM" }); setFirstLevelDoorInfoListAll(data); }; @@ -68,6 +68,7 @@ function Add(props) { attachmentId, lsUserIdcard: btoa(values.lsUserIdcard), gateLevelAuthArea: JSON.stringify({ area: values.area }), + vehicleBelongType:6 }); if (success) { message.success("新增成功"); @@ -142,12 +143,12 @@ function Add(props) { render: FORM_ITEM_RENDER_ENUM.DATE, rules: [validatorEndTime({ startTime: visitStartTime })], }, - { - name: "vehicleBelongType", - label: "车辆所属类型", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items:VEHICLE_TYPE_ENUM - }, + // { + // name: "vehicleBelongType", + // label: "车辆所属类型", + // render: FORM_ITEM_RENDER_ENUM.SELECT, + // items:VEHICLE_TYPE_ENUM + // }, { name: "gateLevelAuthArea", 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 f136a83..14df9e2 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 @@ -29,13 +29,14 @@ function List(props) { const [form] = Search.useForm(); const { tableProps, getData } = useTable(props["vehicleAuditList"], { form, - params: { processOrRecord: !props.isRecords ? 1 : 2,vehicleBelongType: props.vehicleBelongType ? props.vehicleBelongType :""}, + params: { processOrRecord: !props.isRecords ? 1 : 2,vehicleBelongType: props.vehicleBelongType ? props.vehicleBelongType :6}, }); const getFirstLevelDoorInfoListAll = async () => { const { data } = await props["firstLevelDoorInfoListAll"]({ mkmjLevel: 1 }); setFirstLevelDoorInfoListAll(data); }; useEffect(() => { + getFirstLevelDoorInfoListAll(); }, []); @@ -270,7 +271,8 @@ const ReviewModalComponent = (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 },