feat:拉黑与违规完善

master
dearLin 2026-03-26 16:33:22 +08:00
parent a688ec6251
commit 2abaf62c04
3 changed files with 62 additions and 62 deletions

View File

@ -45,14 +45,14 @@ function List(props) {
<Page isShowAllAction={false}>
<Search
options={[
{
name: "vehicleDepartmentId",
label: "车辆所属部门",
render: (<DepartmentSelectTree searchType="inType" params={{ enterpriseType: [1, 2, 3] }} />),
},
{ name: "employeeVehicleUserName", label: "车辆所属人" },
// {
// name: "vehicleDepartmentId",
// label: "车辆所属部门",
// render: (<DepartmentSelectTree searchType="inType" params={{ enterpriseType: [1, 2, 3] }} />),
// },
// { name: "employeeVehicleUserName", label: "车辆所属人" },
{ name: "licenceNo", label: "车牌号" },
{ name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
// { name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
]}
form={form}
onFinish={getData}
@ -74,29 +74,29 @@ function List(props) {
</Space>
)}
columns={[
{ title: "车辆所属单位", dataIndex: "vehicleCorpName" },
{ title: "车辆所属部门", dataIndex: "vehicleDepartmentName" },
{ title: "车辆归属人", dataIndex: "employeeVehicleUserName" },
// { title: "车辆所属单位", dataIndex: "vehicleCorpName" },
// { title: "车辆所属部门", dataIndex: "vehicleDepartmentName" },
// { title: "车辆归属人", dataIndex: "employeeVehicleUserName" },
{ title: "车牌号", dataIndex: "licenceNo" },
{ title: "车牌类型", dataIndex: "licenceTypeName" },
{ title: "车辆类型", dataIndex: "vehicleTypeName" },
// { title: "车牌类型", dataIndex: "licenceTypeName" },
// { title: "车辆类型", dataIndex: "vehicleTypeName" },
{
title: "操作",
width: 150,
fixed: "right",
render: (_, record) => (
<Space>
{props.permission("jgd-io-blacklist-show") && (
<Button
type="link"
onClick={() => {
setViewModalVisible(true);
setCurrentId(record.id);
}}
>
查看
</Button>
)}
{/*{props.permission("jgd-io-blacklist-show") && (*/}
{/* <Button*/}
{/* type="link"*/}
{/* onClick={() => {*/}
{/* setViewModalVisible(true);*/}
{/* setCurrentId(record.id);*/}
{/* }}*/}
{/* >*/}
{/* 查看*/}
{/* </Button>*/}
{/*)}*/}
{props.permission("jgd-io-blacklist-del") && (
<Button
type="link"

View File

@ -30,14 +30,14 @@ function List(props) {
<Page isShowAllAction={false}>
<Search
options={[
{
name: "vehicleDepartmentId",
label: "车辆所属部门",
render: (<DepartmentSelectTree searchType="inType" params={{ enterpriseType: [1, 2, 3] }} />),
},
{ name: "employeeVehicleUserName", label: "车辆所属人" },
// {
// name: "vehicleDepartmentId",
// label: "车辆所属部门",
// render: (<DepartmentSelectTree searchType="inType" params={{ enterpriseType: [1, 2, 3] }} />),
// },
// { name: "employeeVehicleUserName", label: "车辆所属人" },
{ name: "licenceNo", label: "车牌号" },
{ name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
// { name: "vehicleType", label: "车辆类型", render: (<DictionarySelect dictValue="VEHICLE_TYPE" />) },
]}
form={form}
onFinish={getData}
@ -59,12 +59,12 @@ function List(props) {
</Space>
)}
columns={[
{ title: "车辆所属单位", dataIndex: "vehicleCorpName" },
{ title: "车辆所属部门", dataIndex: "vehicleDepartmentName" },
{ title: "车辆归属人", dataIndex: "employeeVehicleUserName" },
// { title: "车辆所属单位", dataIndex: "vehicleCorpName" },
// { title: "车辆所属部门", dataIndex: "vehicleDepartmentName" },
// { title: "车辆归属人", dataIndex: "employeeVehicleUserName" },
{ title: "车牌号", dataIndex: "licenceNo" },
{ title: "车牌类型", dataIndex: "licenceTypeName" },
{ title: "车辆类型", dataIndex: "vehicleTypeName" },
// { title: "车牌类型", dataIndex: "licenceTypeName" },
// { title: "车辆类型", dataIndex: "vehicleTypeName" },
{ title: "违规次数", dataIndex: "violationCount" },
{
title: "操作",
@ -76,7 +76,7 @@ function List(props) {
<Button
type="link"
onClick={() => {
props.history.push(`./violationRecords?id=${record.id}`);
props.history.push(`./violationRecords?licenceNo=${record.licenceNo}`);
}}
>
查看违规记录
@ -139,28 +139,28 @@ const AddModalComponent = (props) => {
onFinish={onSubmit}
options={[
{ name: "licenceNo", label: "车牌号", rules: [{ pattern: LICENSE_PLATE_NUMBER, message: "请输入正确的车牌号" }] },
{
name: "licenceType",
label: "车牌类型",
render: (
<DictionarySelect
dictValue="LICENSE_PLATE_TYPE"
onGetLabel={label => form.setFieldValue("licenceTypeName", label)}
/>
),
},
{ name: "licenceTypeName", label: "车牌类型名称", onlyForLabel: true },
{
name: "vehicleType",
label: "车辆类型",
render: (
<DictionarySelect
dictValue="VEHICLE_TYPE"
onGetLabel={label => form.setFieldValue("vehicleTypeName", label)}
/>
),
},
{ name: "vehicleTypeName", label: "车辆类型名称", onlyForLabel: true },
// {
// name: "licenceType",
// label: "车牌类型",
// render: (
// <DictionarySelect
// dictValue="LICENSE_PLATE_TYPE"
// onGetLabel={label => form.setFieldValue("licenceTypeName", label)}
// />
// ),
// },
// { name: "licenceTypeName", label: "车牌类型名称", onlyForLabel: true },
// {
// name: "vehicleType",
// label: "车辆类型",
// render: (
// <DictionarySelect
// dictValue="VEHICLE_TYPE"
// onGetLabel={label => form.setFieldValue("vehicleTypeName", label)}
// />
// ),
// },
// { name: "vehicleTypeName", label: "车辆类型名称", onlyForLabel: true },
{ name: "violationtime", label: "违规时间", render: FORM_ITEM_RENDER_ENUM.DATETIME },
{
name: "violationType",

View File

@ -20,7 +20,7 @@ function ViolationRecords(props) {
const [form] = Search.useForm();
const { tableProps, getData } = useTable(props["vehiclesViolationViolationRecordsList"], {
form,
params: { vehicleId: query.id },
params: { licenceNo: query.licenceNo },
});
const onDelete = (id) => {
@ -133,9 +133,9 @@ const InfoModalComponent = (props) => {
column={1}
styles={{ label: { width: 200 } }}
items={[
{ label: "车辆所属单位", children: info.vehicleCorpName },
{ label: "车辆所属部门", children: info.vehicleDepartmentName },
{ label: "车辆归属人", children: info.employeeVehicleUserName },
// { label: "车辆所属单位", children: info.vehicleCorpName },
// { label: "车辆所属部门", children: info.vehicleDepartmentName },
// { label: "车辆归属人", children: info.employeeVehicleUserName },
{ label: "车牌号", children: info.licenceNo },
{ label: "违规类型", children: info.violationTypeName },
{ label: "违规时间", children: info.violationtime },