修改bug
parent
2ba1b5b087
commit
ab9bd73f72
|
|
@ -34,7 +34,7 @@
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-signature-canvas": "^1.1.0-alpha.2",
|
"react-signature-canvas": "^1.1.0-alpha.2",
|
||||||
"zy-react-library": "^1.3.30"
|
"zy-react-library": "1.3.31"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@antfu/eslint-config": "^5.4.1",
|
"@antfu/eslint-config": "^5.4.1",
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ function List(props) {
|
||||||
viewBtn="zgdw-entry-temp-vehicle-show"
|
viewBtn="zgdw-entry-temp-vehicle-show"
|
||||||
auditInfoBtn="zgdw-entry-temp-vehicle-audit-info"
|
auditInfoBtn="zgdw-entry-temp-vehicle-audit-info"
|
||||||
auditBtn="zgdw-entry-temp-vehicle-audit"
|
auditBtn="zgdw-entry-temp-vehicle-audit"
|
||||||
|
vehicleBelongType={6}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ function Add(props) {
|
||||||
setApprovalUserListAll(data);
|
setApprovalUserListAll(data);
|
||||||
};
|
};
|
||||||
const getFirstLevelDoorInfoListAll = async () => {
|
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);
|
setFirstLevelDoorInfoListAll(data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ function Add(props) {
|
||||||
setApprovalUserListAll(data);
|
setApprovalUserListAll(data);
|
||||||
};
|
};
|
||||||
const getFirstLevelDoorInfoListAll = async () => {
|
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);
|
setFirstLevelDoorInfoListAll(data);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -68,6 +68,7 @@ function Add(props) {
|
||||||
attachmentId,
|
attachmentId,
|
||||||
lsUserIdcard: btoa(values.lsUserIdcard),
|
lsUserIdcard: btoa(values.lsUserIdcard),
|
||||||
gateLevelAuthArea: JSON.stringify({ area: values.area }),
|
gateLevelAuthArea: JSON.stringify({ area: values.area }),
|
||||||
|
vehicleBelongType:6
|
||||||
});
|
});
|
||||||
if (success) {
|
if (success) {
|
||||||
message.success("新增成功");
|
message.success("新增成功");
|
||||||
|
|
@ -142,12 +143,12 @@ function Add(props) {
|
||||||
render: FORM_ITEM_RENDER_ENUM.DATE,
|
render: FORM_ITEM_RENDER_ENUM.DATE,
|
||||||
rules: [validatorEndTime({ startTime: visitStartTime })],
|
rules: [validatorEndTime({ startTime: visitStartTime })],
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
name: "vehicleBelongType",
|
// name: "vehicleBelongType",
|
||||||
label: "车辆所属类型",
|
// label: "车辆所属类型",
|
||||||
render: FORM_ITEM_RENDER_ENUM.SELECT,
|
// render: FORM_ITEM_RENDER_ENUM.SELECT,
|
||||||
items:VEHICLE_TYPE_ENUM
|
// items:VEHICLE_TYPE_ENUM
|
||||||
},
|
// },
|
||||||
|
|
||||||
{
|
{
|
||||||
name: "gateLevelAuthArea",
|
name: "gateLevelAuthArea",
|
||||||
|
|
|
||||||
|
|
@ -29,13 +29,14 @@ function List(props) {
|
||||||
const [form] = Search.useForm();
|
const [form] = Search.useForm();
|
||||||
const { tableProps, getData } = useTable(props["vehicleAuditList"], {
|
const { tableProps, getData } = useTable(props["vehicleAuditList"], {
|
||||||
form,
|
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 getFirstLevelDoorInfoListAll = async () => {
|
||||||
const { data } = await props["firstLevelDoorInfoListAll"]({ mkmjLevel: 1 });
|
const { data } = await props["firstLevelDoorInfoListAll"]({ mkmjLevel: 1 });
|
||||||
setFirstLevelDoorInfoListAll(data);
|
setFirstLevelDoorInfoListAll(data);
|
||||||
};
|
};
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
||||||
getFirstLevelDoorInfoListAll();
|
getFirstLevelDoorInfoListAll();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
|
@ -270,7 +271,8 @@ const ReviewModalComponent = (props) => {
|
||||||
items={[
|
items={[
|
||||||
{ label: "访问人姓名", children: info.employeeVehicleUserName },
|
{ label: "访问人姓名", children: info.employeeVehicleUserName },
|
||||||
{ label: "手机号", children: info.lsUserPhone },
|
{ label: "手机号", children: info.lsUserPhone },
|
||||||
{ label: "身份证号", children: info.lsUserIdcard },
|
|
||||||
|
{ label: "身份证号", children: info.lsUserIdcard ? atob(info.lsUserIdcard) : "" },
|
||||||
{ label: "车牌号", children: info.licenceNo },
|
{ label: "车牌号", children: info.licenceNo },
|
||||||
{ label: "车牌类型", children: info.licenceTypeName },
|
{ label: "车牌类型", children: info.licenceTypeName },
|
||||||
{ label: "车辆类型", children: info.vehicleTypeName },
|
{ label: "车辆类型", children: info.vehicleTypeName },
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue