访客模块待完成

2026-04-11 17:55:11 +08:00
parent 67a292b252
commit d957d1a039
35 changed files with 4564 additions and 95 deletions
--- a/src/api/system/MonthCard/index.ts
+++ b/src/api/system/MonthCard/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MonthCardVO, MonthCardForm, MonthCardQuery } from '@/api/system/MonthCard/type';
+
+/**
+ * 查询月卡管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMonthCard = (query?: MonthCardQuery): AxiosPromise<MonthCardVO[]> => {
+  return request({
+    url: '/monthCard/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询月卡管理详细
+ * @param id
+ */
+export const getMonthCard = (id: string | number): AxiosPromise<MonthCardVO> => {
+  return request({
+    url: '/monthCard/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增月卡管理
+ * @param data
+ */
+export const addMonthCard = (data: MonthCardForm) => {
+  return request({
+    url: '/monthCard',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改月卡管理
+ * @param data
+ */
+export const updateMonthCard = (data: MonthCardForm) => {
+  return request({
+    url: '/monthCard',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除月卡管理
+ * @param id
+ */
+export const delMonthCard = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/monthCard/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/system/MonthCard/type.ts
+++ b/src/api/system/MonthCard/type.ts
@@ -0,0 +1,180 @@
+export interface MonthCardVO {
+  /**
+   * 月卡管理表id
+   */
+  id: string | number;
+
+  /**
+   * 办理时间
+   */
+  handleTime: string;
+
+  /**
+   * 持卡人姓名
+   */
+  cardName: string;
+
+  /**
+   * 手机号码
+   */
+  phone: string;
+
+  /**
+   * 绑定车牌号
+   */
+  carNum: string;
+
+  /**
+   * 办理人姓名
+   */
+  handleName: string;
+
+  /**
+   * 月卡编号
+   */
+  cardCode: string;
+
+  /**
+   * 费用/元
+   */
+  cost: number;
+
+  /**
+   * 支付方式 0微信 1支付宝 2线下缴费
+   */
+  payMethod: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 开始日期
+   */
+  startTime: string;
+
+  /**
+   * 结束日期
+   */
+  endTime: string;
+}
+
+export interface MonthCardForm extends BaseEntity {
+  /**
+   * 月卡管理表id
+   */
+  id?: string | number;
+
+  /**
+   * 办理时间
+   */
+  handleTime?: string;
+
+  /**
+   * 持卡人姓名
+   */
+  cardName?: string;
+
+  /**
+   * 手机号码
+   */
+  phone?: string;
+
+  /**
+   * 绑定车牌号
+   */
+  carNum?: string;
+
+  /**
+   * 办理人姓名
+   */
+  handleName?: string;
+
+  /**
+   * 月卡编号
+   */
+  cardCode?: string;
+
+  /**
+   * 费用/元
+   */
+  cost?: number;
+
+  /**
+   * 支付方式 0微信 1支付宝 2线下缴费
+   */
+  payMethod?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 开始日期
+   */
+  startTime?: string;
+
+  /**
+   * 结束日期
+   */
+  endTime?: string;
+}
+
+export interface MonthCardQuery extends PageQuery {
+  /**
+   * 办理时间
+   */
+  handleTime?: string;
+
+  /**
+   * 持卡人姓名
+   */
+  cardName?: string;
+
+  /**
+   * 手机号码
+   */
+  phone?: string;
+
+  /**
+   * 绑定车牌号
+   */
+  carNum?: string;
+
+  /**
+   * 办理人姓名
+   */
+  handleName?: string;
+
+  /**
+   * 月卡编号
+   */
+  cardCode?: string;
+
+  /**
+   * 费用/元
+   */
+  cost?: number;
+
+  /**
+   * 支付方式 0微信 1支付宝 2线下缴费
+   */
+  payMethod?: string;
+
+  /**
+   * 开始日期
+   */
+  startTime?: string;
+
+  /**
+   * 结束日期
+   */
+  endTime?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/ParkingCost/index.ts
+++ b/src/api/system/ParkingCost/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ParkingCostVO, ParkingCostForm, ParkingCostQuery } from '@/api/system/type';
+
+/**
+ * 查询停车缴费管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listParkingCost = (query?: ParkingCostQuery): AxiosPromise<ParkingCostVO[]> => {
+  return request({
+    url: '/parkingCost/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询停车缴费管理详细
+ * @param id
+ */
+export const getParkingCost = (id: string | number): AxiosPromise<ParkingCostVO> => {
+  return request({
+    url: '/parkingCost/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增停车缴费管理
+ * @param data
+ */
+export const addParkingCost = (data: ParkingCostForm) => {
+  return request({
+    url: '/parkingCost',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改停车缴费管理
+ * @param data
+ */
+export const updateParkingCost = (data: ParkingCostForm) => {
+  return request({
+    url: '/parkingCost',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除停车缴费管理
+ * @param id
+ */
+export const delParkingCost = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/parkingCost/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/system/ParkingCost/type.ts
+++ b/src/api/system/ParkingCost/type.ts
@@ -0,0 +1,195 @@
+export interface ParkingCostVO {
+  /**
+   * 停车缴费表id
+   */
+  id: string | number;
+
+  /**
+   * 区域id
+   */
+  areaId: string | number;
+
+  /**
+   * 车位id
+   */
+  parkingId: string | number;
+
+  /**
+   * 收费项目 0临时停车
+   */
+  chargeItem: string;
+
+  /**
+   * 缴纳人姓名
+   */
+  payerName: string;
+
+  /**
+   * 车牌号
+   */
+  carNum: string;
+
+  /**
+   * 开始时间
+   */
+  startTime: string;
+
+  /**
+   * 结束时间
+   */
+  endTime: string;
+
+  /**
+   * 费用/元
+   */
+  cost: number;
+
+  /**
+   * 缴纳状态 0待缴纳 1已缴纳
+   */
+  payerStatus: string;
+
+  /**
+   * 支付方式 0微信 1支付宝 2线下缴费
+   */
+  payMethod: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 所属小区id
+   */
+  villageId: string | number;
+}
+
+export interface ParkingCostForm extends BaseEntity {
+  /**
+   * 停车缴费表id
+   */
+  id?: string | number;
+
+  /**
+   * 区域id
+   */
+  areaId?: string | number;
+
+  /**
+   * 车位id
+   */
+  parkingId?: string | number;
+
+  /**
+   * 收费项目 0临时停车
+   */
+  chargeItem?: string;
+
+  /**
+   * 缴纳人姓名
+   */
+  payerName?: string;
+
+  /**
+   * 车牌号
+   */
+  carNum?: string;
+
+  /**
+   * 开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 费用/元
+   */
+  cost?: number;
+
+  /**
+   * 缴纳状态 0待缴纳 1已缴纳
+   */
+  payerStatus?: string;
+
+  /**
+   * 支付方式 0微信 1支付宝 2线下缴费
+   */
+  payMethod?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 所属小区id
+   */
+  villageId?: string | number;
+}
+
+export interface ParkingCostQuery extends PageQuery {
+  /**
+   * 区域id
+   */
+  areaId?: string | number;
+
+  /**
+   * 车位id
+   */
+  parkingId?: string | number;
+
+  /**
+   * 收费项目 0临时停车
+   */
+  chargeItem?: string;
+
+  /**
+   * 缴纳人姓名
+   */
+  payerName?: string;
+
+  /**
+   * 车牌号
+   */
+  carNum?: string;
+
+  /**
+   * 开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 费用/元
+   */
+  cost?: number;
+
+  /**
+   * 缴纳状态 0待缴纳 1已缴纳
+   */
+  payerStatus?: string;
+
+  /**
+   * 支付方式 0微信 1支付宝 2线下缴费
+   */
+  payMethod?: string;
+
+  /**
+   * 所属小区id
+   */
+  villageId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/Repair/index.ts
+++ b/src/api/system/Repair/index.ts
@@ -0,0 +1,74 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RepairVO, RepairForm, RepairQuery } from '@/api/system/Repair/type';
+
+/**
+ * 查询报修管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRepair = (query?: RepairQuery): AxiosPromise<RepairVO[]> => {
+  return request({
+    url: '/repair/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询报修管理详细
+ * @param id
+ */
+export const getRepair = (id: string | number): AxiosPromise<RepairVO> => {
+  return request({
+    url: '/repair/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增报修管理
+ * @param data
+ */
+export const addRepair = (data: RepairForm) => {
+  return request({
+    url: '/repair',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改报修管理
+ * @param data
+ */
+export const updateRepair = (data: RepairForm) => {
+  return request({
+    url: '/repair',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除报修管理
+ * @param id
+ */
+export const delRepair = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/repair/' + id,
+    method: 'delete'
+  });
+};
+/**
+ * 上传报修图片
+ * @param { formdata } formdata
+ */
+export const uploadRepairImages = (formdata: FormData) => {
+  return request({
+    url: '/repair/uploadImages',
+    method: 'POST',
+    data: formdata
+  });
+};
--- a/src/api/system/Repair/type.ts
+++ b/src/api/system/Repair/type.ts
@@ -0,0 +1,205 @@
+export interface RepairVO {
+  /**
+   * 报修管理表id
+   */
+  id: string | number;
+
+  /**
+   * 关联房屋id
+   */
+  houseId: string | number;
+
+  /**
+   * 维修项目id
+   */
+  maintenanceItemId: string | number;
+
+  /**
+   * 问题描述
+   */
+  problem: string;
+
+  /**
+   * 报修人id(住户表id)
+   */
+  residentId: string | number;
+
+  /**
+   * 手机号码
+   */
+  phone: number;
+
+  /**
+   * 预约日期
+   */
+  orderDate: string;
+
+  /**
+   * 问题图片地址
+   */
+  problemImageUrl: string;
+
+  /**
+   * 0 已提交 1已分配  2维修中 3维修完成
+   */
+  problemStatus: string;
+
+  /**
+   * 维修描述
+   */
+  repairDes: string;
+
+  /**
+   * 维修图片url
+   */
+  repairImageUrl: string;
+
+  /**
+   * 维修人员id
+   */
+  repairId: string | number;
+}
+
+export interface RepairForm extends BaseEntity {
+  /**
+   * 报修管理表id
+   */
+  id?: string | number;
+
+  /**
+   * 关联房屋id
+   */
+  houseId?: string | number;
+
+  /**
+   * 维修项目id
+   */
+  maintenanceItemId?: string | number;
+
+  /**
+   * 问题描述
+   */
+  problem?: string;
+
+  /**
+   * 报修人id(住户表id)
+   */
+  residentId?: string | number;
+
+  /**
+   * 手机号码
+   */
+  phone?: number;
+
+  /**
+   * 预约日期
+   */
+  orderDate?: string;
+
+  /**
+   * 问题图片地址
+   */
+  problemImageUrl?: string;
+
+  /**
+   * 创建者
+   */
+  createBy?: number;
+
+  /**
+   * 创建时间
+   */
+  createTime?: string;
+
+  /**
+   * 更新者
+   */
+  updateBy?: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime?: string;
+
+  /**
+   * 0 已提交 1已分配  2维修中 3维修完成
+   */
+  problemStatus?: string;
+
+  /**
+   * 维修描述
+   */
+  repairDes?: string;
+
+  /**
+   * 维修图片url
+   */
+  repairImageUrl?: string;
+
+  /**
+   * 维修人员id
+   */
+  repairId?: string | number;
+}
+
+export interface RepairQuery extends PageQuery {
+  /**
+   * 关联房屋id
+   */
+  houseId?: string | number;
+
+  /**
+   * 维修项目id
+   */
+  maintenanceItemId?: string | number;
+
+  /**
+   * 问题描述
+   */
+  problem?: string;
+
+  /**
+   * 报修人id(住户表id)
+   */
+  residentId?: string | number;
+
+  /**
+   * 手机号码
+   */
+  phone?: number;
+
+  /**
+   * 预约日期
+   */
+  orderDate?: string;
+
+  /**
+   * 问题图片地址
+   */
+  problemImageUrl?: string;
+
+  /**
+   * 0 已提交 1已分配  2维修中 3维修完成
+   */
+  problemStatus?: string;
+
+  /**
+   * 维修描述
+   */
+  repairDes?: string;
+
+  /**
+   * 维修图片url
+   */
+  repairImageUrl?: string;
+
+  /**
+   * 维修人员id
+   */
+  repairId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/RepairProject/index.ts
+++ b/src/api/system/RepairProject/index.ts
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RepairProjectVO, RepairProjectForm, RepairProjectQuery } from '@/api/repairProject/types';
+
+/**
+ * 查询报修维修项目管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRepairProject = (query?: RepairProjectQuery): AxiosPromise<RepairProjectVO[]> => {
+  return request({
+    url: '/repairProject/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询报修维修项目管理详细
+ * @param id
+ */
+export const getRepairProject = (id: string | number): AxiosPromise<RepairProjectVO> => {
+  return request({
+    url: '/repairProject/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增报修维修项目管理
+ * @param data
+ */
+export const addRepairProject = (data: RepairProjectForm) => {
+  return request({
+    url: '/repairProject',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改报修维修项目管理
+ * @param data
+ */
+export const updateRepairProject = (data: RepairProjectForm) => {
+  return request({
+    url: '/repairProject',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除报修维修项目管理
+ * @param id
+ */
+export const delRepairProject = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/repairProject/' + id,
+    method: 'delete'
+  });
+};
+/**
+ * 查询报修维修项目tree管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const gettreelistRepairProject = (query?: RepairProjectQuery): AxiosPromise<RepairProjectVO[]> => {
+  return request({
+    url: '/repairProject/treeList',
+    method: 'get',
+    params: query
+  });
+};
--- a/src/api/system/RepairProject/type.ts
+++ b/src/api/system/RepairProject/type.ts
@@ -0,0 +1,130 @@
+export interface RepairProjectVO {
+  /**
+   * 维修项目表id
+   */
+  id: string | number;
+
+  /**
+   * 维修项目名
+   */
+  projectName: string;
+
+  /**
+   * 父级项目id
+   */
+  parentId: string | number;
+
+  /**
+   * 项目类型 0公共报修 1个人报修
+   */
+  projectType: string;
+
+  /**
+   * 项目层级 0，1
+   */
+  projectLevel: number;
+
+  /**
+   * 排序 （数越小越靠前）
+   */
+  sortOrder: number;
+
+  /**
+   * 状态 0启用 1停用
+   */
+  status: string;
+}
+
+export interface RepairProjectForm extends BaseEntity {
+  /**
+   * 维修项目表id
+   */
+  id?: string | number;
+
+  /**
+   * 维修项目名
+   */
+  projectName?: string;
+
+  /**
+   * 父级项目id
+   */
+  parentId?: string | number;
+
+  /**
+   * 项目类型 0公共报修 1个人报修
+   */
+  projectType?: string;
+
+  /**
+   * 项目层级 0，1
+   */
+  projectLevel?: number;
+
+  /**
+   * 排序 （数越小越靠前）
+   */
+  sortOrder?: number;
+
+  /**
+   * 状态 0启用 1停用
+   */
+  status?: string;
+
+  /**
+   * 创建时间
+   */
+  cretaeTime?: string;
+
+  /**
+   * 创建者
+   */
+  createBy?: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime?: string;
+
+  /**
+   * 更新者
+   */
+  updateBy?: number;
+}
+
+export interface RepairProjectQuery extends PageQuery {
+  /**
+   * 维修项目名
+   */
+  projectName?: string;
+
+  /**
+   * 父级项目id
+   */
+  parentId?: string | number;
+
+  /**
+   * 项目类型 0公共报修 1个人报修
+   */
+  projectType?: string;
+
+  /**
+   * 项目层级 0，1
+   */
+  projectLevel?: number;
+
+  /**
+   * 排序 （数越小越靠前）
+   */
+  sortOrder?: number;
+
+  /**
+   * 状态 0启用 1停用
+   */
+  status?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/Visitor/index.ts
+++ b/src/api/system/Visitor/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { VisitorVO, VisitorForm, VisitorQuery } from '@/api/system/Visitor/type';
+
+/**
+ * 查询访客管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listVisitor = (query?: VisitorQuery): AxiosPromise<VisitorVO[]> => {
+  return request({
+    url: '/visitor/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询访客管理详细
+ * @param id
+ */
+export const getVisitor = (id: string | number): AxiosPromise<VisitorVO> => {
+  return request({
+    url: '/visitor/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增访客管理
+ * @param data
+ */
+export const addVisitor = (data: VisitorForm) => {
+  return request({
+    url: '/visitor',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改访客管理
+ * @param data
+ */
+export const updateVisitor = (data: VisitorForm) => {
+  return request({
+    url: '/visitor',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除访客管理
+ * @param id
+ */
+export const delVisitor = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/visitor/' + id,
+    method: 'delete'
+  });
+};
--- a/src/api/system/Visitor/type.ts
+++ b/src/api/system/Visitor/type.ts
@@ -0,0 +1,180 @@
+export interface VisitorVO {
+  /**
+   * 访客管理表id
+   */
+  id: string | number;
+
+  /**
+   * 访问房屋id
+   */
+  houseId: string | number;
+
+  /**
+   * 访客姓名
+   */
+  visitorName: string;
+
+  /**
+   * 访客性别 0男 1女 3未知
+   */
+  visitorGender: string;
+
+  /**
+   * 访客联系方式
+   */
+  visitorPhone: string;
+
+  /**
+   * 车牌号
+   */
+  carNum: string;
+
+  /**
+   * 随行人数
+   */
+  visitorNum: number;
+
+  /**
+   * 来访时间
+   */
+  startTime: string;
+
+  /**
+   * 离开时间
+   */
+  endTime: string;
+
+  /**
+   * 来访方式 0车辆来访 1人员来访
+   */
+  type: string;
+
+  /**
+   * 访客状态 0等待来访 1已到访
+   */
+  status: string;
+}
+
+export interface VisitorForm extends BaseEntity {
+  /**
+   * 访客管理表id
+   */
+  id?: string | number;
+
+  /**
+   * 访问房屋id
+   */
+  houseId?: string | number;
+
+  /**
+   * 访客姓名
+   */
+  visitorName?: string;
+
+  /**
+   * 访客性别 0男 1女 3未知
+   */
+  visitorGender?: string;
+
+  /**
+   * 访客联系方式
+   */
+  visitorPhone?: string;
+
+  /**
+   * 车牌号
+   */
+  carNum?: string;
+
+  /**
+   * 随行人数
+   */
+  visitorNum?: number;
+
+  /**
+   * 来访时间
+   */
+  startTime?: string;
+
+  /**
+   * 离开时间
+   */
+  endTime?: string;
+
+  /**
+   * 来访方式 0车辆来访 1人员来访
+   */
+  type?: string;
+
+  /**
+   * 访客状态 0等待来访 1已到访
+   */
+  status?: string;
+
+  /**
+   * 创建时间
+   */
+  createTime?: string;
+
+  /**
+   * 创建者(住户id)
+   */
+  createId?: string | number;
+}
+
+export interface VisitorQuery extends PageQuery {
+  /**
+   * 访问房屋id
+   */
+  houseId?: string | number;
+
+  /**
+   * 访客姓名
+   */
+  visitorName?: string;
+
+  /**
+   * 访客性别 0男 1女 3未知
+   */
+  visitorGender?: string;
+
+  /**
+   * 访客联系方式
+   */
+  visitorPhone?: string;
+
+  /**
+   * 车牌号
+   */
+  carNum?: string;
+
+  /**
+   * 随行人数
+   */
+  visitorNum?: number;
+
+  /**
+   * 来访时间
+   */
+  startTime?: string;
+
+  /**
+   * 离开时间
+   */
+  endTime?: string;
+
+  /**
+   * 来访方式 0车辆来访 1人员来访
+   */
+  type?: string;
+
+  /**
+   * 访客状态 0等待来访 1已到访
+   */
+  status?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
--- a/src/api/system/cars/index.ts
+++ b/src/api/system/cars/index.ts
@@ -10,7 +10,7 @@ import { CarVO, CarForm, CarQuery } from '@/api/system/cars/type';

 export const listCar = (query?: CarQuery): AxiosPromise<CarVO[]> => {
  return request({
-    url: '/car/car/list',
+    url: '/car/list',
    method: 'get',
    params: query
  });
@@ -22,7 +22,7 @@ export const listCar = (query?: CarQuery): AxiosPromise<CarVO[]> => {
 */
 export const getCar = (id: string | number): AxiosPromise<CarVO> => {
  return request({
-    url: '/car/car/' + id,
+    url: '/car/' + id,
    method: 'get'
  });
 };
@@ -33,7 +33,7 @@ export const getCar = (id: string | number): AxiosPromise<CarVO> => {
 */
 export const addCar = (data: CarForm) => {
  return request({
-    url: '/car/car',
+    url: '/car',
    method: 'post',
    data: data
  });
@@ -45,7 +45,7 @@ export const addCar = (data: CarForm) => {
 */
 export const updateCar = (data: CarForm) => {
  return request({
-    url: '/car/car',
+    url: '/car',
    method: 'put',
    data: data
  });
@@ -57,7 +57,7 @@ export const updateCar = (data: CarForm) => {
 */
 export const delCar = (id: string | number | Array<string | number>) => {
  return request({
-    url: '/car/car/' + id,
+    url: '/car/' + id,
    method: 'delete'
  });
 };
--- a/src/components/Holder/index.vue
+++ b/src/components/Holder/index.vue
@@ -4,10 +4,8 @@
      <span>请选择</span>
      <el-icon><Search /></el-icon>
    </div>
-    <div v-else>
+    <div v-else class="overflow-auto overflow-hidden w-full text-ellipsis text-nowrap">
      <span>姓名：{{ multipleSelection[0] && multipleSelection[0].name }}</span>
-      <span class="ml-4 mr-4">电话：{{ multipleSelection[0] && multipleSelection[0].phone }}</span>
-      <span>住址：{{ multipleSelection[0] && multipleSelection[0].housePath }}</span>
    </div>
  </div>

@@ -87,14 +85,16 @@ interface tableType extends ResidentVO {
  housePath?: string;
 }
 const props = defineProps<{
-  isedit: boolean;
+  userid: string;
 }>();
+// 2. 转成 ref（更安全，可选，但推荐）
+const { userid } = toRefs(props);
 const emit = defineEmits<{
-  change: [value: tableType];
+  change: [value: string | number];
 }>();
 const dialog = ref({
  dialogVisible: false,
-  dialogTitle: '添加'
+  dialogTitle: '选择住户'
 });

 const queryParams = ref({
@@ -130,15 +130,26 @@ function gettreedata() {
  });
 }
 gettreedata();
+getlist();
+
+watch(
+  userid,
+  (newval) => {
+    if (newval !== null && newval !== undefined && newval.length > 0) {
+      const find = tableData.value.find((item) => item.id == newval);
+      if (find) {
+        multipleSelection.value = [find];
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+);

 //
 function choiceResidentFun() {
-  if (props.isedit) {
-    dialog.value.dialogTitle = '编辑车位';
-  } else {
-    dialog.value.dialogTitle = '添加车位';
-  }
-  getlist();
  dialog.value.dialogVisible = true;
 }
 // 获取表格
@@ -181,7 +192,7 @@ function confim() {
  if (multipleSelection.value.length > 0) {
    const pop = multipleSelection.value.pop();
    multipleSelection.value = [pop];
-    emit('change', pop);
+    emit('change', pop.id);
  }
 }

@@ -203,12 +214,12 @@ function handleSelectionChange(val) {

 <style scoped lang="scss">
 .residentBox {
-  width: 500px;
+  width: 385px;
  height: 35px;
  line-height: 35px;
  border: 1px solid #ccc;
  border-radius: 5px;
-  padding: 0 20px;
+  padding: 0 10px;
  .defaultbox {
    display: flex;
    align-items: center;
--- a/src/components/Holder/repairUser.vue
+++ b/src/components/Holder/repairUser.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="residentBox" @click="choiceResidentFun">
+    <div class="defaultbox" v-if="multipleSelection.length === 0">
+      <span>请选择</span>
+      <el-icon><Search /></el-icon>
+    </div>
+    <div v-else class="overflow-auto overflow-hidden w-full text-ellipsis text-nowrap">
+      <span>姓名：{{ multipleSelection[0] && multipleSelection[0].name }}</span>
+    </div>
+  </div>
+
+  <el-dialog append-to-body v-model="dialog.dialogVisible" :title="dialog.dialogTitle" width="1050">
+    <nav class="flex flex-items-center mb-8">
+      <div class="flex flex-items-center mr-5 flex-1">
+        <div style="width: 120px">选择员工</div>
+        <el-select v-model="queryParams.ownerRelationship" placeholder="请选择" clearable>
+          <el-option v-for="dict in com_resident_relationship" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </div>
+      <div class="mr-5 flex-1">
+        <el-input clearable v-model.number="queryParams.name" placeholder="请输入员工姓名" />
+      </div>
+      <div>
+        <el-button type="primary" @click="getlist">查询</el-button>
+        <el-button>重置</el-button>
+      </div>
+    </nav>
+    <el-table ref="multipleTableRef" @selection-change="handleSelectionChange" :data="tableData" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" width="55" type="index" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="角色" align="center" width="85" prop="type">
+        <template #default="{ row }">
+          <dict-tag :options="com_resident_type" :value="row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" width="85" prop="status">
+        <template #default="{ row }">
+          <dict-tag :options="com_certification_status" :value="row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="手机号码" align="center" prop="phone" />
+    </el-table>
+
+    <template #footer>
+      <div class="dialog-footer flex flex-items-center flex-justify-between">
+        <pagination
+          style="margin-top: 0"
+          layout="total, prev, pager, next, jumper"
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getlist"
+        />
+        <div>
+          <el-button @click="conback">退出</el-button>
+          <el-button type="primary" @click="confim"> 确定 </el-button>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { getCommunitylistAPI } from '@/api/system/community';
+import { getVillageTree } from '@/api/system/house';
+import { listResident } from '@/api/system/resident';
+import { ResidentVO } from '@/api/system/resident/type';
+import { convertBuildingToTree, getHousePathById } from '@/utils/house';
+import { ref } from 'vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_resident_type } = toRefs<any>(proxy?.useDict('com_resident_type'));
+const { com_certification_status } = toRefs<any>(proxy?.useDict('com_certification_status'));
+const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
+
+interface tableType extends ResidentVO {
+  housePath?: string;
+}
+const props = defineProps<{
+  userid: string;
+}>();
+// 2. 转成 ref（更安全，可选，但推荐）
+const { userid } = toRefs(props);
+const emit = defineEmits<{
+  change: [value: string | number];
+}>();
+const dialog = ref({
+  dialogVisible: false,
+  dialogTitle: '选择住户'
+});
+
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+
+  date: null,
+  type: null,
+  status: null,
+  ownerRelationship: null,
+  name: null,
+  houseId: null,
+  villageId: null,
+  buildingId: null,
+  unitNo: null
+});
+const multipleTableRef = ref();
+const tableData = ref<tableType[]>([]);
+const multipleSelection = ref([]);
+const total = ref(100);
+const loading = ref(false);
+
+getlist();
+
+watch(
+  userid,
+  (newval) => {
+    if (newval !== null && newval !== undefined && newval.length > 0) {
+      const find = tableData.value.find((item) => item.id == newval);
+      if (find) {
+        multipleSelection.value = [find];
+      }
+    }
+  },
+  {
+    deep: true,
+    immediate: true
+  }
+);
+
+//
+function choiceResidentFun() {
+  dialog.value.dialogVisible = true;
+}
+// 获取表格
+function getlist() {
+  // 查询住户
+  loading.value = true;
+  listResident(queryParams.value).then((res) => {
+    tableData.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  });
+}
+
+// 返回
+function conback() {
+  dialog.value.dialogVisible = false;
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    ownerRelationship: null,
+    name: null,
+    date: null,
+    type: null,
+    status: null,
+    houseId: null,
+    villageId: null,
+    buildingId: null,
+    unitNo: null
+  };
+}
+// 确定
+function confim() {
+  dialog.value.dialogVisible = false;
+  if (multipleSelection.value.length > 0) {
+    const pop = multipleSelection.value.pop();
+    multipleSelection.value = [pop];
+    emit('change', pop.id);
+  }
+}
+
+// 单选
+function handleSelectionChange(val) {
+  if (val && val.length > 0) {
+    const lastoptions = val.pop();
+    val.forEach((row) => {
+      multipleTableRef.value!.toggleRowSelection(row, false);
+    });
+    multipleTableRef.value!.toggleRowSelection(lastoptions, true);
+    multipleSelection.value = [lastoptions];
+  } else {
+    multipleTableRef.value!.clearSelection();
+    multipleSelection.value = [];
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.residentBox {
+  width: 385px;
+  height: 35px;
+  line-height: 35px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  padding: 0 10px;
+  .defaultbox {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  cursor: pointer;
+  &:hover {
+    background-color: #f4f8ff;
+  }
+}
+</style>
--- a/src/utils/Reg.ts
+++ b/src/utils/Reg.ts
@@ -0,0 +1,66 @@
+/**
+ * 验证身份证号码（18位，支持尾号x/X）
+ * @param idCard 身份证号
+ * @return {boolean} true 符合 false 不符合
+ */
+export function validateIdCard(idCard: string): boolean {
+  // 18位身份证正则
+  const reg = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/;
+  return reg.test(idCard.trim());
+}
+/**
+ * 验证车牌号
+ * @param val 兼容新能源 + 普通车牌
+ * @return {boolean} true 符合 false 不符合
+ */
+export function isPlateNumber(val: string): boolean {
+  const reg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼][A-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/;
+  return reg.test(val);
+}
+/**
+ * 验证金钱
+ * @param {number} val
+ * @return {boolean} true 符合 false 不符合
+ */
+export function isMoney(value: number): boolean {
+  const reg = /^(0|[1-9]\d*)(\.\d{1,2})?$/;
+  return reg.test(String(value).trim());
+}
+/**
+ * 验证姓名
+ * @param {string} val
+ * @return {boolean} true 符合 false 不符合
+ */
+export function isChineseName(val: string): boolean {
+  return /^[\u4e00-\u9fa5·]{2,16}$/.test(String(val).trim());
+}
+
+const reg = {
+  /** 金钱 */
+  money: /^(0|[1-9]\d*)(\.\d{1,2})?$/,
+  /** 身份证 */
+  idCard: /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/,
+  /** 车牌 */
+  PlateNumber: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼][A-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/,
+  /** 姓名 */
+  ChineseName: /^[\u4e00-\u9fa5·]{2,16}$/,
+  /** 手机号 */
+  phone: /^1[3-9]\d{9}$/,
+  /** 邮箱 */
+  email: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/,
+  /** QQ */
+  qq: /^[1-9]\d{4,11}$/,
+  /** 微信 */
+  wechat: /^[a-zA-Z][a-zA-Z0-9_-]{5,19}$/
+};
+// 自动推导 TS 类型（最标准）
+export type RegType = keyof typeof reg;
+/**
+ * 验证姓名
+ * @param {string|number} value
+ * @param {string} regType
+ * @return {boolean} true 符合 false 不符合
+ */
+export function validator(value: string | number, regType: RegType): boolean {
+  return reg[regType].test(String(value));
+}
--- a/src/utils/house.ts
+++ b/src/utils/house.ts
@@ -54,7 +54,6 @@ export function convertBuildingToTree(buildings: any[]): Tree[] {
    });

    buildingTree.children = unitTrees;
-    console.log(buildingTree);
    return buildingTree;
  });
 }
@@ -121,17 +120,6 @@ export function getHousePathById(treeData: Tree[], houseId: number, response: Va
  return path;
 }

-/**
- * 验证身份证号码（18位，支持尾号x/X）
- * @param idCard 身份证号
- * @return {boolean} true 符合 false 不符合
- */
-export function validateIdCard(idCard: string): boolean {
-  // 18位身份证正则
-  const reg = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/;
-  return reg.test(idCard.trim());
-}
-
 export const houseUselist = ['普通住宅', '商业用地', '商住两用', '其他'];

 // 对字符串 图片地址，处理
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -316,3 +316,53 @@ export const removeClass = (ele: HTMLElement, cls: string) => {
 export const isExternal = (path: string) => {
  return /^(https?:|http?:|mailto:|tel:)/.test(path);
 };
+
+/**
+ * 通用：根据 projectLevel 层级字段，将扁平数组转为树形结构
+ * @param list 原始扁平数组
+ * @returns 树形结构数据（children 为空则设为 null）
+ */
+export function buildTreeByLevel<T = any>(list: T[]): T[] {
+  if (!list || list.length === 0) return [];
+
+  // 1. 深拷贝 + 初始化 children
+  const data = JSON.parse(JSON.stringify(list));
+  data.forEach((item: any) => (item.children = []));
+
+  const tree: any[] = [];
+
+  // 2. 根据 projectLevel 构建父子关系
+  data.forEach((item: any, index: number) => {
+    const level = Number(item.projectLevel);
+
+    // 顶级节点（level = 0）
+    if (level === 0) {
+      tree.push(item);
+    }
+    // 子节点：寻找上一级节点
+    else {
+      const parentLevel = level - 1;
+      // 向前寻找最近的父级
+      const parent = data
+        .slice(0, index)
+        .reverse()
+        .find((i: any) => Number(i.projectLevel) === parentLevel);
+
+      if (parent) parent.children.push(item);
+    }
+  });
+
+  // 3. 清理空 children（没有子节点 = null，表格不显示展开箭头）
+  const cleanEmptyChildren = (nodes: any[]) => {
+    nodes.forEach((node) => {
+      if (node.children?.length === 0) {
+        node.children = null;
+      } else if (node.children) {
+        cleanEmptyChildren(node.children);
+      }
+    });
+  };
+  cleanEmptyChildren(tree);
+
+  return tree;
+}
--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@@ -0,0 +1,66 @@
+/**
+ * 计算两个日期之间相差的天数
+ * @param date1 开始日期
+ * @param date2 结束日期
+ * @returns 相差天数（绝对值）
+ */
+export function diffDays(date1: string | Date, date2: string | Date): number {
+  const d1 = new Date(date1);
+  const d2 = new Date(date2);
+  // 转为时间戳并取绝对值
+  const diff = Math.abs(d1.getTime() - d2.getTime());
+  // 一天的毫秒数
+  return Math.floor(diff / (1000 * 60 * 60 * 24));
+}
+
+/**
+ * 格式化两个时间的差值，自动显示 年/月/天/时/分/秒
+ * @param startTime 开始时间（Date / 时间戳 / 字符串）
+ * @param endTime 结束时间，默认当前时间
+ * @returns 如：2年3个月、15天、2小时30分、50秒
+ */
+export function formatTimeDiff(startTime: string | number | Date, endTime: string | number | Date = new Date()): string {
+  const start = new Date(startTime).getTime();
+  const end = new Date(endTime).getTime();
+
+  // 毫秒差值（绝对值）
+  let diff = Math.abs(end - start);
+  if (diff < 1000) return '0秒';
+
+  // 单位定义
+  const second = 1000;
+  const minute = 60 * second;
+  const hour = 60 * minute;
+  const day = 24 * hour;
+  const month = 30 * day; // 粗略按月计算
+  const year = 365 * day;
+
+  // 计算
+  const years = Math.floor(diff / year);
+  diff -= years * year;
+
+  const months = Math.floor(diff / month);
+  diff -= months * month;
+
+  const days = Math.floor(diff / day);
+  diff -= days * day;
+
+  const hours = Math.floor(diff / hour);
+  diff -= hours * hour;
+
+  const minutes = Math.floor(diff / minute);
+  diff -= minutes * minute;
+
+  const seconds = Math.floor(diff / second);
+
+  // 拼接显示
+  const res: string[] = [];
+  if (years > 0) res.push(years + '年');
+  if (months > 0) res.push(months + '个月');
+  if (days > 0) res.push(days + '天');
+  if (hours > 0) res.push(hours + '小时');
+  if (minutes > 0) res.push(minutes + '分钟');
+  if (seconds > 0 && res.length === 0) res.push(seconds + '秒');
+
+  return res.join('');
+}
--- a/src/views/community/AddCommunity.vue
+++ b/src/views/community/AddCommunity.vue
@@ -262,9 +262,6 @@ const reg = {
  qq: /^[1-9]\d{4,11}$/,
  wechat: /^[a-zA-Z][a-zA-Z0-9_-]{5,19}$/
 };
-
-// 使用
-reg.phone.test('13800138000');
 //  上传图片
 const submitForm = () => {
  formRef.value?.validate(async (valid: boolean) => {
--- a/src/views/system/MonthCard/addMonthCard.vue
+++ b/src/views/system/MonthCard/addMonthCard.vue
@@ -0,0 +1,245 @@
+<template>
+  <div class="AddBuildingBox">
+    <PageHeader :title="userid ? '编辑月卡' : '添加月卡'"></PageHeader>
+    <div class="AddBuildingBody">
+      <div class="title">基本信息</div>
+      <div class="addBuildingFormBody">
+        <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="月卡编号" prop="cardCode">
+                <el-input v-model.trim="form.cardCode" placeholder="请输入月卡编号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="持卡人姓名" prop="cardName">
+                <el-input v-model.trim="form.cardName" placeholder="请输入持卡人姓名" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="手机号码" prop="phone">
+                <el-input v-model.number="form.phone" placeholder="请输入手机号码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="绑定车牌号" prop="carNum">
+                <el-input v-model.number="form.carNum" placeholder="请输入车牌号" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="办理人" prop="handleName">
+                <el-input v-model.number="form.handleName" placeholder="请输入办理人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="有效日期" prop="phone">
+                <el-date-picker
+                  range-separator="到"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  v-model="checkDate"
+                  type="daterange"
+                  placeholder="选择日期"
+                  @change="handlDate"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="费用" prop="cost">
+                <el-input v-model.number="form.cost" placeholder="请输入费用">
+                  <template #suffix>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="支付方式" prop="payMethod">
+                <el-select v-model="form.payMethod" placeholder="请选择支付方式" clearable>
+                  <el-option v-for="dict in com_pay_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item style="margin-top: 30px">
+            <el-button type="primary" @click="submitForm">提交</el-button>
+            <el-button @click="cancelForm">返回</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import PageHeader from '@/components/Pageheader/index.vue';
+import { addMonthCard, getMonthCard, updateMonthCard } from '@/api/system/MonthCard';
+import { validator } from '@/utils/Reg';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_pay_method } = toRefs<any>(proxy?.useDict('com_pay_method'));
+
+const router = useRouter();
+const route = useRoute();
+
+const formRef = ref();
+const form = ref({
+  id: null,
+  cardCode: '', // 月卡编号
+  cardName: null, // 持卡人姓名
+  phone: '', // 手机号
+  carNum: null, // 绑定车牌号
+  handleName: '', //  办理人姓名
+  cost: null, // 费用/元
+  payMethod: '', // 支付方式
+  remark: '', // 备注
+  startTime: '', // 开始日期
+  endTime: '' // 结束日期
+});
+const checkDate = ref([]);
+function handlDate() {
+  form.value.startTime = checkDate.value[0];
+  form.value.endTime = checkDate.value[1];
+}
+const rules = ref({
+  cardCode: [{ required: true, message: '请输入月卡编号', trigger: 'blur' }],
+  cardName: [
+    { required: true, message: '请输入姓名', trigger: 'blur' },
+    {
+      validator: (_, value) => validator(value, 'ChineseName'),
+      message: '请输入正确的中文姓名',
+      trigger: 'blur'
+    }
+  ],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    {
+      validator: (_, value) => validator(value, 'phone'),
+      message: '请输入正确的手机号码',
+      trigger: 'blur'
+    }
+  ],
+  carNum: [
+    { required: true, message: '请输入车牌号', trigger: 'blur' },
+    {
+      validator: (_, value) => validator(value, 'PlateNumber'),
+      message: '请输入正确的车牌号',
+      trigger: 'blur'
+    }
+  ],
+  startTime: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+  payMethod: [{ required: true, message: '请选择支付方式', trigger: 'blur' }],
+  cost: [
+    {
+      validator: (_, value) => validator(value, 'money'),
+      message: '请输入正确的金额，最多两位小数',
+      trigger: 'blur'
+    }
+  ]
+});
+const userid = ref(null);
+if (route.query.id) {
+  userid.value = route.query.id;
+  getMonthCard(userid.value).then((res) => {
+    form.value = {
+      ...form.value,
+      ...res.data
+    };
+    checkDate.value = [form.value.startTime, form.value.endTime];
+  });
+}
+// !== 提交 =============================================================================
+// 提交
+const submitForm = () => {
+  formRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      if (!form.value.startTime.trim() || !form.value.endTime.trim()) {
+        ElMessage.warning('请选择有效日期');
+      }
+      if (userid.value) {
+        updateMonthCard(form.value).then((res) => {
+          console.log(res);
+          ElMessage.success('编辑成功');
+          cancelForm();
+        });
+      } else {
+        addMonthCard(form.value).then((res) => {
+          console.log(res);
+          ElMessage.success('添加成功');
+
+          cancelForm();
+        });
+      }
+    }
+  });
+};
+// 推出
+const cancelForm = () => {
+  router.push({
+    path: '/carArea/monthCard'
+  });
+};
+</script>
+
+<style scoped lang="scss">
+.AddBuildingBox {
+  padding: 15px;
+  height: 100%;
+  width: 100%;
+}
+.AddBuildingBody {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: white;
+  padding: 15px;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    border-bottom: 1px solid #bbbbbb;
+    margin-bottom: 60px;
+  }
+
+  .formBody {
+    width: 1050px;
+    margin: 0 auto;
+    &:deep(.el-form-item__content, .el-select, .el-input) {
+      width: 350px !important;
+      margin-right: 10px;
+      .el-cascader {
+        width: 100%;
+      }
+    }
+    .el-form-item {
+      margin-bottom: 20px;
+      align-items: center;
+    }
+    .el-button {
+      width: 80px;
+      height: 35px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>
--- a/src/views/system/MonthCard/index.vue
+++ b/src/views/system/MonthCard/index.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="p-2">
+    <pageheader title="月卡管理"></pageheader>
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="月卡状态" prop="payMethod">
+              <el-select v-model="queryParams.parkingStatus" placeholder="请选择" clearable>
+                <el-option v-for="dict in com_month_card_status" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="月卡编号" prop="cardCode">
+              <el-input v-model="queryParams.cardCode" placeholder="请输入月卡编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['monthCard:monthCard:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['monthCard:monthCard:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['monthCard:monthCard:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="monthCardList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="月卡编号" align="center" prop="cardCode" v-if="true" />
+        <el-table-column label="办理时间" align="center" prop="handleTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="业主" align="center" prop="cardName" />
+        <el-table-column label="绑定车牌号" align="center" prop="carNum" />
+        <el-table-column label="剩余有效天数" align="center" prop="handleName">
+          <template #default="scope">
+            {{ diffDays(scope.row.startTime, scope.row.endTime) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="支付方式" align="center" prop="payMethod">
+          <template #default="scope">
+            <dict-tag :options="com_pay_method" :value="scope.row.payMethod" />
+          </template>
+        </el-table-column>
+        <el-table-column label="月卡状态" align="center" prop="payMethod">
+          <template #default="scope">
+            <dict-tag :options="com_pay_method" :value="scope.row.payMethod" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark"></el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['monthCard:monthCard:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['monthCard:monthCard:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改月卡管理对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="monthCardFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="办理时间" prop="handleTime">
+          <el-date-picker clearable v-model="form.handleTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择办理时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="持卡人姓名" prop="cardName">
+          <el-input v-model="form.cardName" placeholder="请输入持卡人姓名" />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号码" />
+        </el-form-item>
+        <el-form-item label="绑定车牌号" prop="carNum">
+          <el-input v-model="form.carNum" placeholder="请输入绑定车牌号" />
+        </el-form-item>
+        <el-form-item label="办理人姓名" prop="handleName">
+          <el-input v-model="form.handleName" placeholder="请输入办理人姓名" />
+        </el-form-item>
+        <el-form-item label="月卡编号" prop="cardCode">
+          <el-input v-model="form.cardCode" placeholder="请输入月卡编号" />
+        </el-form-item>
+        <el-form-item label="费用/元" prop="cost">
+          <el-input v-model="form.cost" placeholder="请输入费用/元" />
+        </el-form-item>
+        <el-form-item label="支付方式 0微信 1支付宝 2线下缴费" prop="payMethod">
+          <el-input v-model="form.payMethod" placeholder="请输入支付方式 0微信 1支付宝 2线下缴费" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="开始日期" prop="startTime">
+          <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束日期" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MonthCard" lang="ts">
+import { listMonthCard, getMonthCard, delMonthCard, addMonthCard, updateMonthCard } from '@/api/system/MonthCard/index';
+import { MonthCardVO, MonthCardQuery, MonthCardForm } from '@/api/system/MonthCard/type';
+import { diffDays } from '@/utils/time';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_pay_method } = toRefs<any>(proxy?.useDict('com_pay_method'));
+const { com_month_card_status } = toRefs<any>(proxy?.useDict('com_month_card_status'));
+
+const router = useRouter();
+const monthCardList = ref<MonthCardVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const monthCardFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: MonthCardForm = {
+  id: undefined,
+  handleTime: undefined,
+  cardName: undefined,
+  phone: undefined,
+  carNum: undefined,
+  handleName: undefined,
+  cardCode: undefined,
+  cost: undefined,
+  payMethod: undefined,
+  remark: undefined,
+  startTime: undefined,
+  endTime: undefined
+};
+const data = reactive<PageData<MonthCardForm, MonthCardQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    handleTime: undefined,
+    cardName: undefined,
+    phone: undefined,
+    carNum: undefined,
+    handleName: undefined,
+    cardCode: undefined,
+    cost: undefined,
+    payMethod: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '月卡管理表id不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询月卡管理列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMonthCard(queryParams.value);
+  monthCardList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  monthCardFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MonthCardVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  router.push({
+    path: '/carArea/addMonthCard'
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MonthCardVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  router.push({
+    path: '/carArea/addMonthCard',
+    query: {
+      id: _id
+    }
+  });
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  monthCardFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateMonthCard(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addMonthCard(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MonthCardVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除月卡管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delMonthCard(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'monthCard/monthCard/export',
+    {
+      ...queryParams.value
+    },
+    `monthCard_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/system/ParkingCost/addParkingCost.vue
+++ b/src/views/system/ParkingCost/addParkingCost.vue
@@ -0,0 +1,293 @@
+<template>
+  <div class="AddBuildingBox">
+    <PageHeader :title="userid ? '编辑月卡' : '添加月卡'"></PageHeader>
+    <div class="AddBuildingBody">
+      <div class="title">基本信息</div>
+      <div class="addBuildingFormBody">
+        <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="区域" prop="areaId">
+                <el-select @change="handleArea" v-model="form.areaId" placeholder="请选择区域" clearable>
+                  <el-option v-for="dict in CarArealist" :key="dict.id" :label="dict.areaName" :value="dict.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="选择车位" prop="parkingId">
+                <el-select v-model="form.parkingId" placeholder="请选择车位">
+                  <el-option v-for="dict in Parkinglist" :key="dict.id" :label="dict.parkingCode" :value="dict.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="缴费项目" prop="chargeItem">
+                <el-select :disabled="com_parking_charge.length > 0" v-model="form.chargeItem" placeholder="请选择缴费项目" clearable>
+                  <el-option v-for="dict in com_parking_charge" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="缴费人" prop="payerName">
+                <el-input v-model.trim="form.payerName" placeholder="请输入缴费人姓名" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="车牌号" prop="carNum">
+                <el-input v-model.number.trim="form.carNum" placeholder="请输入车牌号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="停车时长" prop="startTime">
+                <el-date-picker
+                  :clearable="false"
+                  range-separator="到"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  v-model="checkDate"
+                  type="datetimerange"
+                  placeholder="选择日期"
+                  @change="handlDate"
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="费用" prop="cost">
+                <el-input v-model.number.trim="form.cost" placeholder="请输入费用">
+                  <template #suffix>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="缴纳状态" prop="payerStatus">
+                <el-radio-group v-model="form.payerStatus">
+                  <el-radio v-for="item in com_parking_payer_status" :key="item.value" :value="item.value" :label="item.label"></el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="支付方式" prop="payMethod">
+                <el-select v-model="form.payMethod" placeholder="请选择支付方式" clearable>
+                  <el-option v-for="dict in com_pay_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item style="margin-top: 30px">
+            <el-button type="primary" @click="submitForm">提交</el-button>
+            <el-button @click="cancelForm">返回</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import PageHeader from '@/components/Pageheader/index.vue';
+import { addMonthCard, getMonthCard, updateMonthCard } from '@/api/system/MonthCard';
+import { listArea } from '@/api/system/carArea';
+import { addParkingCost, getParkingCost, updateParkingCost } from '@/api/system/ParkingCost';
+import { listParking } from '@/api/system/parking';
+import { getCommunitylistAPI } from '@/api/system/community';
+import { validator } from '@/utils/Reg';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_pay_method } = toRefs<any>(proxy?.useDict('com_pay_method'));
+const { com_parking_charge } = toRefs<any>(proxy?.useDict('com_parking_charge'));
+const { com_parking_payer_status } = toRefs<any>(proxy?.useDict('com_parking_payer_status'));
+
+const router = useRouter();
+const route = useRoute();
+
+const formRef = ref();
+const form = ref({
+  id: null,
+  villageId: '', // 所属小区id
+  areaId: null, // 区域id
+  parkingId: '', // 车位id
+  chargeItem: '0', // 临时停车
+  payerName: '', //  缴纳人姓名
+  carNum: null, // 车牌号
+  startTime: '', // 开始时间
+  endTime: '', // 结束时间
+  cost: '', //  费用
+  payMethod: '', // 支付方式
+  payerStatus: '0', // 缴纳人状态
+  remark: '' // 备注
+});
+const checkDate = ref([]);
+// 改变时间日期
+function handlDate() {
+  form.value.startTime = checkDate.value[0];
+  form.value.endTime = checkDate.value[1];
+}
+const rules = ref({
+  areaId: [{ required: true, message: '请选择区域', trigger: 'blur' }],
+  parkingId: [{ required: true, message: '请选择车位', trigger: 'blur' }],
+  chargeItem: [{ required: true, message: '请选择缴费项目', trigger: 'blur' }],
+  payerName: [
+    { required: true, message: '请输入缴纳人姓名', trigger: 'blur' },
+    {
+      validator: (_, value) => validator(value, 'ChineseName'),
+      message: '请输入缴纳人姓名',
+      trigger: 'blur'
+    }
+  ],
+  carNum: [
+    { required: true, message: '请绑定车牌号', trigger: 'blur' },
+    {
+      validator: (_, value) => validator(value, 'PlateNumber'),
+      message: '请请绑定车牌号',
+      trigger: 'blur'
+    }
+  ],
+  startTime: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+  payMethod: [{ required: true, message: '请选择支付方式', trigger: 'blur' }],
+  cost: [
+    { required: true, message: '请输入费用', trigger: 'blur' },
+    {
+      validator: (_, value) => validator(value, 'money'),
+      message: '请输入费用',
+      trigger: 'blur'
+    }
+  ]
+});
+const userid = ref(null);
+
+// 小区
+const currentviliage = ref();
+// 区域
+const CarArealist = ref([]);
+// 车位
+const Parkinglist = ref([]);
+function init() {
+  getCommunitylistAPI().then((res) => {
+    currentviliage.value = res.rows.find((item) => item.choiceStatus === 0);
+    listArea().then((res) => {
+      CarArealist.value = res.rows;
+    });
+    if (route.query.id) {
+      userid.value = route.query.id;
+      form.value.id = userid.value;
+      getParkingCost(userid.value).then((res) => {
+        form.value = {
+          ...form.value,
+          ...res.data
+        };
+        checkDate.value = [form.value.startTime, form.value.endTime];
+      });
+    }
+    form.value.villageId = currentviliage.value.villageId;
+  });
+}
+init();
+
+// 选择区域后 动态车位
+function handleArea(val: string) {
+  listParking({
+    areaId: val,
+    pageNum: 1,
+    pageSize: 999999999
+  }).then((res) => {
+    Parkinglist.value = res.rows;
+  });
+}
+
+// !== 提交 =============================================================================
+// 提交
+const submitForm = () => {
+  formRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      if (userid.value) {
+        updateParkingCost(form.value).then((res) => {
+          console.log(res);
+          ElMessage.success('编辑成功');
+          cancelForm();
+        });
+      } else {
+        addParkingCost(form.value).then((res) => {
+          console.log(res);
+          ElMessage.success('添加成功');
+
+          cancelForm();
+        });
+      }
+    }
+  });
+};
+// 推出
+const cancelForm = () => {
+  router.push({
+    path: '/carArea/parkingCost'
+  });
+};
+</script>
+
+<style scoped lang="scss">
+.AddBuildingBox {
+  padding: 15px;
+  height: 100%;
+  width: 100%;
+}
+.AddBuildingBody {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: white;
+  padding: 15px;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    border-bottom: 1px solid #bbbbbb;
+    margin-bottom: 60px;
+  }
+
+  .formBody {
+    width: 1050px;
+    margin: 0 auto;
+    &:deep(.el-form-item__content, .el-select, .el-input) {
+      width: 350px !important;
+      margin-right: 10px;
+      .el-cascader {
+        width: 100%;
+      }
+    }
+    .el-form-item {
+      margin-bottom: 20px;
+      align-items: center;
+    }
+    .el-button {
+      width: 80px;
+      height: 35px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>
--- a/src/views/system/ParkingCost/index.vue
+++ b/src/views/system/ParkingCost/index.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="p-2 h-full flex flex-col">
+    <pageheader title="停车缴费管理"></pageheader>
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="缴费人" prop="payerName">
+              <el-input v-model="queryParams.payerName" placeholder="请输入缴费人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="车牌号" prop="carNum">
+              <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card class="flex-1" shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['parkingCost:parkingCost:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['parkingCost:parkingCost:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['parkingCost:parkingCost:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="parkingCostList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="车位" align="center" prop="areaId">
+          <template #default="scope"> {{ scope.row.areaName }} - {{ scope.row.parkingName }} </template>
+        </el-table-column>
+        <el-table-column label="收费项目" align="center" prop="chargeItem">
+          <template #default="scope">
+            <dict-tag :options="com_parking_charge" :value="scope.row.chargeItem" />
+          </template>
+        </el-table-column>
+        <el-table-column label="缴纳人姓名" align="center" prop="payerName" />
+        <el-table-column label="车牌号" align="center" prop="carNum" />
+        <el-table-column label="停车时长" align="center" width="180">
+          <template #default="scope">
+            <span>{{ formatTimeDiff(scope.row.startTime, scope.row.endTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="费用/元" align="center" prop="cost" />
+        <el-table-column label="缴纳状态" align="center" prop="payerStatus">
+          <template #default="scope">
+            <dict-tag :options="com_parking_payer_status" :value="scope.row.payerStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column label="支付方式" align="center" prop="payMethod">
+          <template #default="scope">
+            <dict-tag :options="com_pay_method" :value="scope.row.payMethod" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['parkingCost:parkingCost:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['parkingCost:parkingCost:remove']"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改停车缴费管理对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="parkingCostFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="区域id" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域id" />
+        </el-form-item>
+        <el-form-item label="车位id" prop="parkingId">
+          <el-input v-model="form.parkingId" placeholder="请输入车位id" />
+        </el-form-item>
+        <el-form-item label="收费项目 0临时停车" prop="chargeItem">
+          <el-input v-model="form.chargeItem" placeholder="请输入收费项目 0临时停车" />
+        </el-form-item>
+        <el-form-item label="缴纳人姓名" prop="payerName">
+          <el-input v-model="form.payerName" placeholder="请输入缴纳人姓名" />
+        </el-form-item>
+        <el-form-item label="车牌号" prop="carNum">
+          <el-input v-model="form.carNum" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="费用/元" prop="cost">
+          <el-input v-model="form.cost" placeholder="请输入费用/元" />
+        </el-form-item>
+        <el-form-item label="缴纳状态 0待缴纳 1已缴纳" prop="payerStatus">
+          <el-radio-group v-model="form.payerStatus">
+            <el-radio v-for="dict in com_parking_payer_status" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="支付方式 0微信 1支付宝 2线下缴费" prop="payMethod">
+          <el-input v-model="form.payMethod" placeholder="请输入支付方式 0微信 1支付宝 2线下缴费" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="所属小区id" prop="villageId">
+          <el-input v-model="form.villageId" placeholder="请输入所属小区id" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ParkingCost" lang="ts">
+import { listArea } from '@/api/system/carArea';
+import { listParking } from '@/api/system/parking';
+import { listParkingCost, getParkingCost, delParkingCost, addParkingCost, updateParkingCost } from '@/api/system/ParkingCost';
+import { ParkingCostVO, ParkingCostQuery, ParkingCostForm } from '@/api/system/ParkingCost/type';
+import { formatTimeDiff } from '@/utils/time';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_parking_charge } = toRefs<any>(proxy?.useDict('com_parking_charge'));
+const { com_parking_payer_status } = toRefs<any>(proxy?.useDict('com_parking_payer_status'));
+const { com_pay_method } = toRefs<any>(proxy?.useDict('com_pay_method'));
+
+const router = useRouter();
+interface ParkingCostType extends ParkingCostVO {
+  areaName: string;
+  parkingName: string;
+}
+const parkingCostList = ref<ParkingCostType[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const parkingCostFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ParkingCostForm = {
+  id: undefined,
+  areaId: undefined,
+  parkingId: undefined,
+  chargeItem: undefined,
+  payerName: undefined,
+  carNum: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  cost: undefined,
+  payerStatus: undefined,
+  payMethod: undefined,
+  remark: undefined,
+  villageId: undefined
+};
+const data = reactive<PageData<ParkingCostForm, ParkingCostQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    areaId: undefined,
+    parkingId: undefined,
+    chargeItem: undefined,
+    payerName: undefined,
+    carNum: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    cost: undefined,
+    payerStatus: undefined,
+    payMethod: undefined,
+    villageId: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '停车缴费表id不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const Arealist = ref([]);
+const Parkinglist = ref([]);
+/** 查询停车缴费管理列表 */
+const getList = async () => {
+  loading.value = true;
+  const rows = await listParking();
+  Parkinglist.value = rows.rows;
+  const arealist = await listArea();
+  Arealist.value = arealist.rows;
+  console.log(Parkinglist.value);
+  const res = await listParkingCost(queryParams.value);
+  parkingCostList.value = res.rows;
+  parkingCostList.value.forEach((parkingCost) => {
+    const find = Parkinglist.value.find((item) => item.id === parkingCost.parkingId);
+    const areaFind = Arealist.value.find((item) => item.id === parkingCost.areaId);
+    parkingCost.areaName = `${areaFind.areaName}(${areaFind.areaCode})`;
+    parkingCost.parkingName = find.parkingCode;
+    console.log(find, areaFind);
+  });
+
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  parkingCostFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ParkingCostVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  router.push({
+    path: '/carArea/addparkingcost'
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ParkingCostVO) => {
+  router.push({
+    path: '/carArea/addparkingcost',
+    query: {
+      id: row.id
+    }
+  });
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  parkingCostFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateParkingCost(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addParkingCost(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ParkingCostVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除停车缴费管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delParkingCost(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'parkingCost/parkingCost/export',
+    {
+      ...queryParams.value
+    },
+    `parkingCost_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style lang="scss" scoped>
+.el-table {
+  height: calc(100% - 80px);
+}
+</style>
--- a/src/views/system/Repair/addRepair.vue
+++ b/src/views/system/Repair/addRepair.vue
@@ -0,0 +1,321 @@
+<template>
+  <div class="AddBuildingBox">
+    <PageHeader :title="userid ? '编辑报修' : '添加报修'"></PageHeader>
+    <div class="AddBuildingBody">
+      <div class="title">基本信息</div>
+      <div class="addBuildingFormBody">
+        <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="关联房屋" prop="houseId">
+                <el-cascader v-model="form.houseId" :options="treedata" @change="handleChangehouse" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="维修项目" prop="maintenanceItemId">
+                <el-cascader
+                  :props="{
+                    label: 'projectName',
+                    value: 'id'
+                  }"
+                  v-model="form.maintenanceItemId"
+                  placeholder="请选择维修项目"
+                  :options="maintenanceItemTreeData"
+                  @change="handleChangemaintenanceItem"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="问题描述" prop="problem">
+                <el-input type="textarea" :rows="5" v-model.trim="form.problem" placeholder="请输入问题描述" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="报修人" prop="residentId">
+                <Holder :userid="form.residentId" @change="handleChangeResident"></Holder>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="手机号码" prop="phone">
+                <el-input v-model.number="form.phone" placeholder="请输入手机号码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="预约日期" prop="orderDate">
+                <el-date-picker v-model="form.orderDate" type="date" placeholder="年/月/日" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="问题图片" prop="remark">
+                <el-upload
+                  v-model:file-list="fileList"
+                  :action="uploadUrl"
+                  list-type="picture-card"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                >
+                  <el-icon><Plus /></el-icon>
+                </el-upload>
+                <el-dialog v-model="dialogVisible">
+                  <img w-full :src="dialogImageUrl" alt="Preview Image" />
+                </el-dialog>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item style="margin-top: 30px">
+            <el-button type="primary" @click="submitForm">提交</el-button>
+            <el-button @click="cancelForm">返回</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import PageHeader from '@/components/Pageheader/index.vue';
+import { addMonthCard, getMonthCard, updateMonthCard } from '@/api/system/MonthCard';
+import { getVillageTree } from '@/api/system/house';
+import { getCommunitylistAPI } from '@/api/system/community';
+import { convertBuildingToTree, hasFormData } from '@/utils/house';
+import Holder from '@/components/Holder/index.vue';
+import { UploadProps, UploadUserFile } from 'element-plus';
+import { addRepair, getRepair, updateRepair, uploadRepairImages } from '@/api/system/Repair';
+import { getRepairProject, gettreelistRepairProject } from '@/api/system/RepairProject';
+
+const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/repair/uploadImages';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_pay_method } = toRefs<any>(proxy?.useDict('com_pay_method'));
+
+const router = useRouter();
+const route = useRoute();
+
+const formRef = ref();
+const form = ref({
+  id: null,
+  houseId: null, // 关联房屋id
+  maintenanceItemId: null, // 维修项目id
+  problem: '', // 问题描述
+  residentId: null, // 报修人id(住户表id)
+  phone: null, // 报手机号码
+  problemImageUrl: '', // 问题图片地址
+  problemStatus: '0', // 0 已提交 1已分配 2维修中 3维修完成
+  repairDes: '', // 维修描述
+  repairImageUrl: '', // 维修图片url
+  orderDate: '' // 预约日期
+});
+const rules = ref({
+  houseId: [{ required: true, message: '请选择关联房屋', trigger: 'blur' }],
+  maintenanceItemId: [{ required: true, message: '请选择维修项目', trigger: 'blur' }],
+  problem: [{ required: true, message: '请输入问题描述', trigger: 'blur' }]
+});
+const userid = ref(null);
+// 当前小区
+const currentviliage = ref();
+// 树形结构
+const treedata = ref();
+// 报修项目 tree 结构
+const maintenanceItemTreeData = ref();
+function init() {
+  getCommunitylistAPI().then((res) => {
+    currentviliage.value = res.rows.find((item) => item.choiceStatus === 0);
+    getVillageTree(currentviliage.value.villageId).then((res) => {
+      treedata.value = convertBuildingToTree(res.data.buildings);
+    });
+
+    gettreelistRepairProject().then((res) => {
+      maintenanceItemTreeData.value = res.data;
+      if (route.query.id) {
+        userid.value = route.query.id;
+        form.value.id = userid.value;
+        getRepair(userid.value).then((res) => {
+          form.value = {
+            ...form.value,
+            ...res.data
+          };
+          fileList.value = form.value.problemImageUrl
+            .split(',')
+            .map((item) => {
+              if (!item) return undefined;
+              return {
+                name: item.split('/').pop(),
+                url: item
+              };
+            })
+            .filter((item) => item);
+          console.log(fileList.value);
+        });
+      }
+    });
+  });
+}
+init();
+
+// ! 上传图片 =--==================================================================
+const fileList = ref<UploadUserFile[]>([]);
+
+const dialogImageUrl = ref('');
+const dialogVisible = ref(false);
+
+const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+  console.log(uploadFile, uploadFiles);
+};
+
+const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+  dialogImageUrl.value = uploadFile.url!;
+  dialogVisible.value = true;
+};
+
+// !== 选择报修人 ====================================================================
+function handleChangeResident(val: string | number) {
+  console.log(val);
+  form.value.residentId = val;
+}
+
+// !== 房屋 ===========================================================================
+function handleChangehouse(val: (string | number)[]) {
+  if (val.length >= 3) {
+    form.value.houseId = val.pop() as number;
+  } else {
+    form.value.houseId = null;
+  }
+}
+function handleChangemaintenanceItem(val: (string | number)[]) {
+  console.log(val);
+  if (val.length >= 2) {
+    form.value.maintenanceItemId = val.pop() as number;
+  } else {
+    form.value.maintenanceItemId = null;
+  }
+}
+
+// !== 提交 =============================================================================
+// 提交
+const submitForm = () => {
+  formRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      let str = '';
+      if (fileList.value.length > 0) {
+        // 有图片
+        const formdata = new FormData();
+        fileList.value.forEach((item) => {
+          if (item.raw && item.raw instanceof File) {
+            formdata.append('files', item.raw);
+          } else {
+            str += item.url + ',';
+          }
+        });
+        if (!hasFormData(formdata)) return sendForm(str);
+        uploadRepairImages(formdata).then((res) => {
+          const successlist = res.data.success;
+          const errorlist = res.data.error;
+          if (successlist.length > 0) {
+            successlist.forEach((item) => {
+              str += item.url + ',';
+            });
+          }
+          if (errorlist.length > 0) {
+            errorlist.forEach((item) => {
+              fileList.value = fileList.value.filter((file) => file.name !== item);
+            });
+            ElMessage.error('图片上传失败： ' + errorlist.join(','));
+          }
+          sendForm(str);
+        });
+      } else {
+        sendForm(str);
+      }
+    }
+  });
+};
+
+const sendForm = (str: string) => {
+  form.value.problemImageUrl = str;
+  if (userid.value) {
+    updateRepair(form.value).then((res) => {
+      console.log(res);
+      ElMessage.success('编辑成功');
+      cancelForm();
+    });
+  } else {
+    addRepair(form.value).then((res) => {
+      console.log(res);
+      ElMessage.success('添加成功');
+
+      cancelForm();
+    });
+  }
+};
+// 推出
+const cancelForm = () => {
+  router.push({
+    path: '/repair/repairlist'
+  });
+};
+</script>
+
+<style scoped lang="scss">
+.AddBuildingBox {
+  padding: 15px;
+  height: 100%;
+  width: 100%;
+}
+.AddBuildingBody {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: white;
+  padding: 15px;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    border-bottom: 1px solid #bbbbbb;
+    margin-bottom: 60px;
+  }
+
+  .formBody {
+    width: 1050px;
+    margin: 0 auto;
+
+    &:deep(.el-date-editor.el-input) {
+      width: inherit;
+    }
+
+    &:deep(.el-form-item__content, .el-select, .el-input) {
+      width: 385px !important;
+      margin-right: 10px;
+      .el-cascader {
+        width: 100%;
+      }
+    }
+    .el-form-item {
+      margin-bottom: 20px;
+      align-items: center;
+    }
+    .el-button {
+      width: 80px;
+      height: 35px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>
--- a/src/views/system/Repair/addRepairlist.vue
+++ b/src/views/system/Repair/addRepairlist.vue
@@ -0,0 +1,182 @@
+<template>
+  <div class="AddBuildingBox">
+    <PageHeader :title="userid ? '编辑车辆信息' : '添加车辆信息'"></PageHeader>
+    <div class="AddBuildingBody">
+      <div class="title">基本信息</div>
+      <div class="addBuildingFormBody">
+        <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="维修项目名" prop="projectName">
+                <el-input v-model.trim="form.projectName" placeholder="请输入维修项目名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="项目类型" prop="projectType">
+                <el-radio-group v-model="form.projectType">
+                  <el-radio v-for="item in com_repair_project_types" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="项目层级" prop="projectLevel">
+                <el-radio-group v-model="form.projectLevel">
+                  <el-radio v-for="item in com_repair_project_level" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="项目状态" prop="status">
+                <el-radio-group v-model="form.status">
+                  <el-radio v-for="item in com_repair_project_status" :key="item.id" :value="item.value">{{ item.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="form.projectLevel === '1'">
+            <el-col :span="11">
+              <el-form-item label="隶属父级" prop="email">
+                <el-select v-model="form.parentId" placeholder="请选择隶属父级" style="width: 240px">
+                  <el-option v-for="item in options" :key="item.id" :label="item.projectName" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item style="margin-top: 30px">
+            <el-button type="primary" @click="submitForm">提交</el-button>
+            <el-button @click="cancelForm">返回</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import PageHeader from '@/components/Pageheader/index.vue';
+import { addRepairProject, listRepairProject, updateRepairProject } from '@/api/system/RepairProject';
+import { buildTreeByLevel } from '@/utils';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_repair_project_types } = toRefs<any>(proxy?.useDict('com_repair_project_types'));
+const { com_repair_project_status } = toRefs<any>(proxy?.useDict('com_repair_project_status'));
+const { com_repair_project_level } = toRefs<any>(proxy?.useDict('com_repair_project_level'));
+
+const router = useRouter();
+const route = useRoute();
+
+const formRef = ref();
+const form = ref({
+  id: null,
+  projectName: null, // 项目名称
+  parentId: '', // 父级项目id
+  projectType: '0', // 项目类型
+  projectLevel: '0', //项目层级
+  status: '0' //状态
+});
+const rules = ref({
+  projectName: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
+  parentId: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
+  projectType: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
+  projectLevel: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
+  status: [{ required: true, message: '请输入名称', trigger: 'blur' }]
+});
+const userid = ref(null);
+const options = ref([]);
+// != ==========================================
+
+function init() {
+  listRepairProject({ pageSize: 999999999, pageNum: 1 }).then((res) => {
+    const arr = res.rows.filter((ite) => ite.projectLevel === 0);
+    options.value = arr;
+    if (route.query.id) {
+      userid.value = route.query.id;
+      const find = res.rows.find((item) => item.id === userid.value);
+      if (find) {
+        form.value = {
+          ...form.value,
+          ...find,
+          projectLevel: String(find.projectLevel)
+        };
+      }
+    }
+  });
+}
+init();
+// !== 提交 =============================================================================
+// 提交
+const submitForm = () => {
+  formRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      console.log(form.value);
+      if (!userid.value) {
+        addRepairProject(form.value).then(() => {
+          ElMessage.success('添加成功');
+          cancelForm();
+        });
+      } else {
+        updateRepairProject(form.value).then(() => {
+          ElMessage.success('编辑成功');
+          cancelForm();
+        });
+      }
+    }
+  });
+};
+// 推出
+const cancelForm = () => {
+  router.push({
+    path: '/repair/repairProjectList'
+  });
+};
+</script>
+
+<style scoped lang="scss">
+.AddBuildingBox {
+  padding: 15px;
+  height: 100%;
+  width: 100%;
+}
+.AddBuildingBody {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: white;
+  padding: 15px;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    padding-left: 20px;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    border-bottom: 1px solid #bbbbbb;
+    margin-bottom: 60px;
+  }
+
+  .formBody {
+    width: 1050px;
+    margin: 0 auto;
+    &:deep(.el-form-item__content, .el-select, .el-input) {
+      width: 350px !important;
+      margin-right: 10px;
+      .el-cascader {
+        width: 100%;
+      }
+    }
+    .el-form-item {
+      margin-bottom: 20px;
+      align-items: center;
+    }
+    .el-button {
+      width: 80px;
+      height: 35px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>
--- a/src/views/system/Repair/index.vue
+++ b/src/views/system/Repair/index.vue
@@ -0,0 +1,264 @@
+<template>
+  <div class="h-full flex flex-col p-2">
+    <pageheader title="报修管理"></pageheader>
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <!-- <el-form-item label="住户类型" prop="houseId">
+              <el-select v-model="queryParams.parkingStatus" placeholder="请选择" clearable>
+                <el-option v-for="dict in com_resident_relationship" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="报修状态" prop="problemStatus">
+              <el-select v-model="queryParams.problemStatus" placeholder="请选择" clearable>
+                <el-option v-for="dict in com_repair_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="预约日期" prop="maintenanceItemId">
+              <el-date-picker
+                clearable
+                v-model="queryParams.orderDate"
+                placeholder="请选择"
+                type="date"
+                value-format="YYYY-MM-DD"
+                format="YYYY-MM-DD"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card class="flex-1" shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['repair:repair:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['repair:repair:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['repair:repair:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="repairList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="报修房屋" align="center" prop="name" />
+        <el-table-column label="维修项目" align="center" prop="maintenanceItemPath" />
+        <el-table-column label="问题描述" align="center" prop="problem" />
+        <el-table-column label="报修人" align="center" prop="residentName" />
+        <el-table-column label="维修状态" align="center" prop="problemStatus">
+          <template #default="scope">
+            <dict-tag :options="com_repair_status" :value="scope.row.problemStatus"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="预约日期" align="center" prop="orderDate" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="分配" placement="top">
+              <el-button link type="primary" icon="Pointer" @click="handleShare(scope.row)"></el-button>
+            </el-tooltip>
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['repair:repair:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['repair:repair:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+  </div>
+</template>
+
+<script setup name="Repair" lang="ts">
+import { listRepair, getRepair, delRepair, addRepair, updateRepair } from '@/api/system/Repair/index';
+import { RepairVO, RepairQuery, RepairForm } from '@/api/system/Repair/type';
+import { listRepairProject } from '@/api/system/RepairProject';
+import { listResident } from '@/api/system/resident';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const { com_repair_status } = toRefs<any>(proxy?.useDict('com_repair_status'));
+interface repairlistType extends RepairVO {
+  maintenanceItemPath?: string;
+  residentName?: string;
+}
+const repairList = ref<repairlistType[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const router = useRouter();
+
+const queryFormRef = ref<ElFormInstance>();
+
+const initFormData: RepairForm = {
+  id: undefined,
+  houseId: undefined,
+  maintenanceItemId: undefined,
+  problem: undefined,
+  residentId: undefined,
+  phone: undefined,
+  orderDate: undefined,
+  problemImageUrl: undefined,
+  createBy: undefined,
+  createTime: undefined,
+  updateBy: undefined,
+  updateTime: undefined,
+  problemStatus: undefined,
+  repairDes: undefined,
+  repairImageUrl: undefined,
+  repairId: undefined
+};
+const data = reactive<PageData<RepairForm, RepairQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    houseId: undefined,
+    maintenanceItemId: undefined,
+    problem: undefined,
+    residentId: undefined,
+    phone: undefined,
+    orderDate: undefined,
+    problemImageUrl: undefined,
+    problemStatus: undefined,
+    repairDes: undefined,
+    repairImageUrl: undefined,
+    repairId: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '报修管理表id不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+// != 维修项目u ===========================================================================
+const RepariPorjectlist = ref([]);
+const residentlist = ref([]);
+function init() {
+  listRepairProject().then((res) => {
+    RepariPorjectlist.value = res.rows;
+  });
+  listResident().then((res) => {
+    residentlist.value = res.rows;
+  });
+}
+init();
+
+// != 维修项目u ===========================================================================
+
+/** 查询报修管理列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listRepair(queryParams.value);
+  repairList.value = res.rows;
+  repairList.value.forEach((item2) => {
+    // 维修项目
+    const find = RepariPorjectlist.value.find((item) => item.id === item2.maintenanceItemId);
+    item2.maintenanceItemPath = '';
+    if (find) {
+      item2.maintenanceItemPath = find.projectName;
+      if (find.parentId) {
+        const find2 = RepariPorjectlist.value.find((item3) => item3.id === find.parentId);
+        console.log(find2);
+        item2.maintenanceItemPath = find2.projectName + ' - ' + item2.maintenanceItemPath;
+      }
+    }
+    // 住户
+    const find2 = residentlist.value.find((item) => item.id === item2.residentId);
+    if (find2) {
+      item2.residentName = find2.name;
+    }
+  });
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: RepairVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  router.push({
+    path: '/repair/addRepair'
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: RepairVO) => {
+  router.push({
+    path: '/repair/addRepair',
+    query: {
+      id: row.id
+    }
+  });
+};
+/** 分配人员 */
+const handleShare = (row) => {
+  router.push({
+    path: '/repair/repairMain',
+    query: {
+      id: row.id
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: RepairVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除报修管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delRepair(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
+<style lang="scss" scoped>
+.el-table {
+  height: calc(100% - 80px);
+}
+</style>
--- a/src/views/system/Repair/repairMain.vue
+++ b/src/views/system/Repair/repairMain.vue
@@ -0,0 +1,230 @@
+<template>
+  <div class="ResidentMainBox p-2 w-full">
+    <PageHeader title="车位详情"></PageHeader>
+    <div class="ResidentMainBody">
+      <el-row :span="24" :gutter="20">
+        <el-col :span="16">
+          <!-- 车位信息 -->
+          <div class="mb-10">
+            <el-card>
+              <template #header>
+                <div class="card-header">
+                  <span>车位信息</span>
+                  <el-button text type="primary">编辑</el-button>
+                </div>
+              </template>
+              <div class="w-full h-full CarinfoBox">
+                <el-row class="mb-20px">
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">报修房屋</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">维修项目</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">问题描述</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                </el-row>
+                <el-row class="mb-20px">
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">报修人</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">手机号码</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">预约日期</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                </el-row>
+                <el-row class="mb-20px">
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">提交人</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">提交时间</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                  <el-col :span="8">
+                    <div class="carinfo_item">
+                      <div class="label">预约日期</div>
+                      <div class="main">地下停车场A区</div>
+                    </div>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <div class="carinfo_item">
+                      <div class="label">附件</div>
+                      <div class="main fileImagebox">
+                        <el-image class="carinfoImage"></el-image>
+                      </div>
+                    </div>
+                  </el-col>
+                </el-row>
+              </div>
+            </el-card>
+          </div>
+          <el-card>
+            <template #header>
+              <div class="card-header">
+                <span>分配工单</span>
+              </div>
+            </template>
+            <div class="w-full h-full flex mt-2">
+              <div class="title">维修师傅</div>
+              <div class="preivewBodybox flex-1 ml-5">
+                <div class="">
+                  <repairUser :userid="userid"></repairUser>
+                </div>
+                <div class="actions mt-5">
+                  <el-button type="primary">审核通过</el-button>
+                  <el-button type="danger">审核不通过</el-button>
+                  <el-button>返回</el-button>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="8">
+          <el-card style="position: relative">
+            <template #header>
+              <div class="asideCardHeader w-full">
+                <div class="cardSubtitle">
+                  <div class="line"></div>
+                  <div class="subtitle">审批流程</div>
+                </div>
+              </div>
+            </template>
+            <div class="w-full h-50%">
+              <el-steps space="108px" direction="vertical" :active="activeStop">
+                <el-step>
+                  <template #title>
+                    <span>已提交维护信息</span>
+                  </template>
+                  <template #description> 提交成功 2024/10/29 10:28:28 </template>
+                </el-step>
+                <el-step>
+                  <template #title>
+                    <span>待分配 </span>
+                  </template>
+                  <template #description>等待物业派单中 </template>
+                </el-step>
+                <el-step>
+                  <template #title>
+                    <span>维修 </span>
+                  </template>
+                  <template #description>维修人员进行维修 </template>
+                </el-step>
+                <el-step>
+                  <template #title>
+                    <span>完成维修 </span>
+                  </template>
+                  <template #description>填写维修记录 </template>
+                </el-step>
+              </el-steps>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue';
+import repairUser from '@/components/Holder/repairUser.vue';
+import PageHeader from '@/components/Pageheader/index.vue';
+
+const route = useRoute();
+const active = ref(6);
+const activeStop = ref(4);
+
+const userid = ref();
+if (route.query.id) {
+  userid.value = route.query.id;
+}
+</script>
+
+<style scoped lang="scss">
+.ResidentMainBox {
+  display: flex;
+  flex-direction: column;
+  .ResidentMainBody {
+    margin-top: 20px;
+    .CarinfoBox {
+      &.gridbox {
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+        grid-template-rows: repeat(4, 1fr);
+        gap: 20px;
+        row-gap: 40px;
+      }
+      .carinfo_item {
+        display: flex;
+        align-items: center;
+        font-size: 14px;
+        .label {
+          font-weight: 600;
+          width: 80px;
+          text-align: right;
+          padding-right: 10px;
+        }
+        .carinfoImage {
+          width: 200px;
+          height: 100px;
+        }
+      }
+    }
+    .card-header,
+    .subtitle {
+      font-size: 15px;
+    }
+    .repairBox {
+      width: 350px;
+      height: 35px;
+      line-height: 35px;
+      border-radius: 5px;
+      border: 1px solid rgba(187, 187, 187, 1);
+    }
+    &:deep(div.el-step__head.is-process) {
+      & > div.el-step__line {
+        width: 0;
+        border: 1px dashed gray;
+        background: transparent;
+      }
+    }
+    &:deep(.el-step.is-vertical .el-step__line) {
+      top: 20px;
+    }
+    &:deep(div.el-step__head.is-finish) {
+      & > div.el-step__line {
+        width: 0;
+        border: 1px solid var(--el-color-primary);
+        background: transparent;
+      }
+    }
+  }
+}
+</style>
--- a/src/views/system/Repair/repairlist.vue
+++ b/src/views/system/Repair/repairlist.vue
@@ -0,0 +1,329 @@
+<template>
+  <div class="h-full flex flex-col p-2">
+    <pageheader title="报修项目"></pageheader>
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :inline="true" label-width="100px" :model="queryParams">
+            <el-form-item label="维修项目名" prop="projectName">
+              <el-input v-model="queryParams.projectName" placeholder="请输入维修项目名" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card class="flex-1" shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['repairProject:repairProject:add']">新增维修类</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['repairProject:repairProject:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table
+        class="h-full"
+        :tree-props="{ children: 'children' }"
+        v-loading="loading"
+        border
+        row-key="id"
+        :data="repairProjectList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="expand">
+          <template #default="props">
+            <div
+              v-if="props.row.children.length >= 0"
+              :class="{
+                'm-4': props.row.children.length >= 0
+              }"
+            >
+              <el-table :data="props.row.children">
+                <el-table-column label="维修项目名" align="center" prop="projectName" />
+                <el-table-column label="维修类型" align="center" prop="projectType">
+                  <template #default="scope">
+                    <dict-tag :options="com_repair_project_types" :value="scope.row.projectType"></dict-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="状态" align="center" prop="status">
+                  <template #default="scope">
+                    <dict-tag :options="com_repair_project_status" :value="scope.row.status"></dict-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+                  <template #default="scope">
+                    <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+                    <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="维修类名" align="center" prop="projectName" />
+        <el-table-column label="项目类型" align="center" prop="projectType">
+          <template #default="scope">
+            <dict-tag :options="com_repair_project_types" :value="scope.row.projectType"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :options="com_repair_project_status" :value="scope.row.status"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="add" @click="handleUpdate(scope.row)"></el-button>
+            <el-tooltip content="修改" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['repairProject:repairProject:edit']"
+              ></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['repairProject:repairProject:remove']"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改报修维修项目管理对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="repairProjectFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="维修项目名" prop="projectName">
+          <el-input v-model="form.projectName" placeholder="请输入维修项目名" />
+        </el-form-item>
+        <el-form-item label="父级项目id" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入父级项目id" />
+        </el-form-item>
+        <el-form-item label="项目层级 0，1" prop="projectLevel">
+          <el-input v-model="form.projectLevel" placeholder="请输入项目层级 0，1" />
+        </el-form-item>
+        <el-form-item label="排序 " prop="sortOrder">
+          <el-input v-model="form.sortOrder" placeholder="请输入排序 " />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="cretaeTime">
+          <el-date-picker clearable v-model="form.cretaeTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建者" prop="createBy">
+          <el-input v-model="form.createBy" placeholder="请输入创建者" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-date-picker clearable v-model="form.updateTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新者" prop="updateBy">
+          <el-input v-model="form.updateBy" placeholder="请输入更新者" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="RepairProject" lang="ts">
+import {
+  listRepairProject,
+  getRepairProject,
+  delRepairProject,
+  addRepairProject,
+  updateRepairProject,
+  gettreelistRepairProject
+} from '@/api/system/RepairProject/index';
+import { RepairProjectVO, RepairProjectQuery, RepairProjectForm } from '@/api/system/RepairProject/type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const { com_repair_project_status } = toRefs<any>(proxy?.useDict('com_repair_project_status'));
+const { com_repair_project_types } = toRefs<any>(proxy?.useDict('com_repair_project_types'));
+
+const router = useRouter();
+const repairProjectList = ref<RepairProjectVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const repairProjectFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: RepairProjectForm = {
+  id: undefined,
+  projectName: undefined,
+  parentId: undefined,
+  projectType: undefined,
+  projectLevel: undefined,
+  sortOrder: undefined,
+  status: undefined,
+  cretaeTime: undefined,
+  createBy: undefined,
+  updateTime: undefined,
+  updateBy: undefined
+};
+const data = reactive<PageData<RepairProjectForm, RepairProjectQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectName: undefined,
+    parentId: undefined,
+    projectType: undefined,
+    projectLevel: undefined,
+    sortOrder: undefined,
+    status: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '维修项目表id不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询报修维修项目管理列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listRepairProject(queryParams.value);
+  let arr = [];
+  arr = res.rows.filter((item) => {
+    item.children = [];
+    if (item.projectLevel === 0) {
+      return {
+        ...item
+      };
+    }
+  });
+  res.rows.map((item) => {
+    if (item.projectLevel === 1) {
+      const index = arr.findIndex((ite) => ite.id === item.parentId);
+      if (index !== -1) {
+        arr[index].children.push(item);
+      }
+    }
+  });
+  repairProjectList.value = arr;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  repairProjectFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: RepairProjectVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  router.push({
+    path: '/repair/addRepairProjectList'
+  });
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: RepairProjectVO) => {
+  router.push({
+    path: '/repair/addRepairProjectList',
+    query: {
+      id: row.id
+    }
+  });
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  repairProjectFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateRepairProject(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addRepairProject(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: RepairProjectVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除报修维修项目管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delRepairProject(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/system/Visitor/index.vue
+++ b/src/views/system/Visitor/index.vue
@@ -0,0 +1,280 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="访客状态" prop="visitorName">
+              <el-input v-model="queryParams.visitorName" placeholder="请输入访客姓名" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="访客姓名" prop="visitorName">
+              <el-input v-model="queryParams.visitorName" placeholder="请输入访客姓名" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['visitor:visitor:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['visitor:visitor:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['visitor:visitor:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="visitorList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="访问房屋" align="center" prop="houseId" />
+        <el-table-column label="访客姓名" align="center" prop="visitorName" />
+        <el-table-column label="访客状态 0等待来访 1已到访" align="center" prop="status" />
+        <el-table-column label="访客性别 0男 1女 3未知" align="center" prop="visitorGender">
+          <template #default="scope">
+            <dict-tag :options="sys_user_sex" :value="scope.row.visitorGender" />
+          </template>
+        </el-table-column>
+        <el-table-column label="访客联系方式" align="center" prop="visitorPhone" />
+        <el-table-column label="来访时间" align="center" prop="startTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['visitor:visitor:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['visitor:visitor:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改访客管理对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="visitorFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="访问房屋id" prop="houseId">
+          <el-input v-model="form.houseId" placeholder="请输入访问房屋id" />
+        </el-form-item>
+        <el-form-item label="访客姓名" prop="visitorName">
+          <el-input v-model="form.visitorName" placeholder="请输入访客姓名" />
+        </el-form-item>
+        <el-form-item label="访客性别 0男 1女 3未知" prop="visitorGender">
+          <el-input v-model="form.visitorGender" placeholder="请输入访客性别 0男 1女 3未知" />
+        </el-form-item>
+        <el-form-item label="访客联系方式" prop="visitorPhone">
+          <el-input v-model="form.visitorPhone" placeholder="请输入访客联系方式" />
+        </el-form-item>
+        <el-form-item label="车牌号" prop="carNum">
+          <el-input v-model="form.carNum" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="随行人数" prop="visitorNum">
+          <el-input v-model="form.visitorNum" placeholder="请输入随行人数" />
+        </el-form-item>
+        <el-form-item label="来访时间" prop="startTime">
+          <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择来访时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="离开时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择离开时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="创建者(住户id)" prop="createId">
+          <el-input v-model="form.createId" placeholder="请输入创建者(住户id)" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Visitor" lang="ts">
+import { listVisitor, getVisitor, delVisitor, addVisitor, updateVisitor } from '@/api/system/Visitor/index';
+import { VisitorVO, VisitorQuery, VisitorForm } from '@/api/system/Visitor/type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_visitor_status } = toRefs<any>(proxy?.useDict('com_visitor_status'));
+
+// com_visitor_status
+const visitorList = ref<VisitorVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const visitorFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: VisitorForm = {
+  id: undefined,
+  houseId: undefined,
+  visitorName: undefined,
+  visitorGender: undefined,
+  visitorPhone: undefined,
+  carNum: undefined,
+  visitorNum: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  type: undefined,
+  status: undefined,
+  createTime: undefined,
+  createId: undefined
+};
+const data = reactive<PageData<VisitorForm, VisitorQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    houseId: undefined,
+    visitorName: undefined,
+    visitorGender: undefined,
+    visitorPhone: undefined,
+    carNum: undefined,
+    visitorNum: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    type: undefined,
+    status: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '访客管理表id不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询访客管理列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listVisitor(queryParams.value);
+  visitorList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  visitorFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: VisitorVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加访客管理';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: VisitorVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getVisitor(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改访客管理';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  visitorFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateVisitor(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addVisitor(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: VisitorVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除访客管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delVisitor(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'visitor/visitor/export',
+    {
+      ...queryParams.value
+    },
+    `visitor_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/system/carArea/addCarArea.vue
+++ b/src/views/system/carArea/addCarArea.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="AddBuildingBox">
-    <PageHeader :title="userid ? '编辑房屋租赁' : '添加房屋租赁'"></PageHeader>
+    <PageHeader :title="parkingid ? '编辑区域信息' : '添加区域信息'"></PageHeader>
    <div class="AddBuildingBody">
      <div class="title">基本信息</div>
      <div class="addBuildingFormBody">
--- a/src/views/system/cars/addCars.vue
+++ b/src/views/system/cars/addCars.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="AddBuildingBox">
-    <PageHeader :title="userid ? '编辑房屋租赁' : '添加房屋租赁'"></PageHeader>
+    <PageHeader :title="userid ? '编辑车辆信息' : '添加车辆信息'"></PageHeader>
    <div class="AddBuildingBody">
      <div class="title">基本信息</div>
      <div class="addBuildingFormBody">
@@ -8,13 +8,13 @@
          <el-row>
            <el-col :span="11">
              <el-form-item label="车牌号" prop="houseId">
-                <el-input v-model.trim="form.rentalName" placeholder="请输入住户姓名" />
+                <el-input v-model.trim="form.rentalName" placeholder="请输入车牌号" />
              </el-form-item>
            </el-col>
            <el-col :span="2"></el-col>
            <el-col :span="11">
              <el-form-item label="车辆品牌" prop="rentalName">
-                <el-input v-model.trim="form.rentalName" placeholder="请输入住户姓名" />
+                <el-input v-model.trim="form.rentalName" placeholder="请输入车辆品牌" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -22,13 +22,13 @@
          <el-row>
            <el-col :span="11">
              <el-form-item label="车辆型号" prop="remark">
-                <el-input v-model.trim="form.supInfo" placeholder="请输入补充房屋信息" />
+                <el-input v-model.trim="form.supInfo" placeholder="请输入补充车辆型号" />
              </el-form-item>
            </el-col>
            <el-col :span="2"></el-col>
            <el-col :span="11">
              <el-form-item label="车声颜色" prop="phone">
-                <el-input v-model.trim="form.phone" placeholder="请输入手机号码" />
+                <el-input v-model.trim="form.phone" placeholder="请输入车声颜色" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -41,7 +41,7 @@
            <el-col :span="24">
              <el-form-item label="持有人">
                <!-- 公共组件 持有人 -->
-                <Holder :isedit="userid === null" @change="handleChange"></Holder>
+                <Holder @change="handleChange"></Holder>
              </el-form-item>
            </el-col>
          </el-row>
@@ -64,6 +64,7 @@

 <script setup lang="ts">
 import { ref } from 'vue';
+import Holder from '@/components/Holder/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

@@ -107,7 +108,7 @@ const submitForm = () => {
 // 推出
 const cancelForm = () => {
  router.push({
-    path: '/house/parkingList'
+    path: '/carArea/cars'
  });
 };

--- a/src/views/system/houseRental/addhouseResident.vue
+++ b/src/views/system/houseRental/addhouseResident.vue
@@ -184,6 +184,7 @@ import { getCommunitylistAPI } from '@/api/system/community';
 import { getVillageTree } from '@/api/system/house';
 import { convertBuildingToTree, getHousePathById, hasFormData, splitStringUrl } from '@/utils/house';
 import { addHouseRental, getHouseRental, updateHouseRental, uploadHouseImage } from '@/api/system/houseRental';
+import { validator } from '@/utils/Reg';

 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/houseRental/uploadImages';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -223,9 +224,7 @@ const rules = ref({
  phone: [
    { required: true, message: '请输入手机号', trigger: 'blur' },
    {
-      validator: (_, value) => {
-        return /^1[3-9]\d{9}$/.test(value);
-      },
+      validator: (_, val) => validator(val, 'phone'),
      message: '请输入正确的手机号码',
      trigger: 'blur'
    }
--- a/src/views/system/parking/addParking.vue
+++ b/src/views/system/parking/addParking.vue
@@ -55,7 +55,7 @@
            <el-col :span="24">
              <el-form-item label="持有人" prop="residentId">
                <!-- 公共组件 持有人 -->
-                <Holder :isedit="userid === null" @change="handleChange"></Holder>
+                <Holder @change="handleChange"></Holder>
              </el-form-item>
            </el-col>
          </el-row>
@@ -131,7 +131,7 @@ const getAreaList = async () => {
 };
 getAreaList();

-const holderInfo = ref();
+const holderInfo = ref(null);
 function handleChange(pop) {
  console.log('获得数据');
  console.log(pop);
@@ -143,7 +143,7 @@ function handleChange(pop) {
 const submitForm = () => {
  formRef.value?.validate(async (valid: boolean) => {
    if (valid) {
-      form.value.resident_id = holderInfo.value.id;
+      form.value.resident_id = holderInfo.value;
      if (userid.value) {
        updateParking(form.value).then((res) => {
          ElMessage.success('编辑成功');
--- a/src/views/system/parking/index.vue
+++ b/src/views/system/parking/index.vue
@@ -7,7 +7,7 @@
          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
            <el-form-item label="车位状态" prop="parkingStatus">
              <el-select v-model="queryParams.parkingStatus" placeholder="请选择" clearable>
-                <el-option v-for="dict in com_parking_status" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+                <el-option v-for="dict in com_parking_statuslist" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
              </el-select>
            </el-form-item>

@@ -50,7 +50,9 @@

      <el-table v-loading="loading" border :data="parkingList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="区域" align="center" prop="areaId" />
+        <el-table-column label="区域" align="center" prop="areaId">
+          <template #default="scope"> {{ getAreaInfoById(scope.row.areaId) }} </template>
+        </el-table-column>
        <el-table-column label="车位编号" align="center" prop="parkingCode" />
        <el-table-column label="车位面积" align="center" prop="parkingArea">
          <template #default="scope"> {{ scope.row.parkingArea }}㎡ </template>
@@ -63,13 +65,13 @@
        </el-table-column>
        <el-table-column label="车位类型" align="center" prop="type">
          <template #default="scope">
-            <dict-tag :options="com_parking_type" :value="scope.row.type" />
+            <dict-tag :options="com_parking_typelist" :value="scope.row.type" />
          </template>
        </el-table-column>
        <el-table-column label="持有人" align="center" prop="residentName" />
        <el-table-column label="审核状态" align="center" prop="checkStatus">
          <template #default="scope">
-            <dict-tag :options="com_review" :value="scope.row.checkStatus" />
+            <dict-tag :options="com_reviewlist" :value="scope.row.checkStatus" />
          </template>
        </el-table-column>
        <el-table-column label="备注" align="center" prop="remark" />
@@ -98,6 +100,10 @@ const { com_review } = toRefs<any>(proxy?.useDict('com_review'));
 const { com_parking_type } = toRefs<any>(proxy?.useDict('com_parking_type'));
 const { com_parking_status } = toRefs<any>(proxy?.useDict('com_parking_status'));

+const com_reviewlist = computed(() => com_review.value ?? []);
+const com_parking_typelist = computed(() => com_parking_type.value ?? []);
+const com_parking_statuslist = computed(() => com_parking_status.value ?? []);
+
 const router = useRouter();
 const parkingList = ref<ParkingVO[]>([]);
 const buttonLoading = ref(false);
@@ -163,6 +169,12 @@ const getList = async () => {
  loading.value = false;
 };

+function getAreaInfoById(id: string) {
+  const obj = AreaList.value.find((item) => item.id === id);
+  console.log(obj);
+  return `${obj.areaName}${obj.areaCode}`;
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
  queryParams.value.pageNum = 1;
--- a/src/views/system/parking/template.vue
+++ b/src/views/system/parking/template.vue
@@ -1,41 +1,80 @@
 <template>
  <div class="AddBuildingBox">
-    <PageHeader :title="userid ? '编辑房屋租赁' : '添加房屋租赁'"></PageHeader>
+    <PageHeader :title="userid ? '编辑月卡' : '添加月卡'"></PageHeader>
    <div class="AddBuildingBody">
      <div class="title">基本信息</div>
      <div class="addBuildingFormBody">
-        <el-form class="formBody" label-position="left" ref="formRef" :model="form" :rules="rules" label-width="130px">
+        <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
          <el-row>
            <el-col :span="11">
-              <el-form-item label="区域名称" prop="houseId">
-                <el-input v-model.trim="form.rentalName" placeholder="请输入住户姓名" />
+              <el-form-item label="月卡编号" prop="cardCode">
+                <el-input v-model.trim="form.cardCode" placeholder="请输入月卡编号" />
              </el-form-item>
            </el-col>
            <el-col :span="2"></el-col>
            <el-col :span="11">
-              <el-form-item label="区域编号" prop="rentalName">
-                <el-input v-model.trim="form.rentalName" placeholder="请输入住户姓名" />
+              <el-form-item label="持卡人姓名" prop="cardName">
+                <el-input v-model.trim="form.cardName" placeholder="请输入持卡人姓名" />
              </el-form-item>
            </el-col>
          </el-row>

          <el-row>
            <el-col :span="11">
-              <el-form-item label="区域面积" prop="remark">
-                <el-input type="textarea" :rows="5" v-model.number="form.supInfo" placeholder="请输入补充房屋信息" />
+              <el-form-item label="手机号码" prop="phone">
+                <el-input v-model.number="form.phone" placeholder="请输入手机号码" />
              </el-form-item>
            </el-col>
            <el-col :span="2"></el-col>
            <el-col :span="11">
-              <el-form-item label="车位数量" prop="phone">
-                <el-input v-model.number="form.phone" placeholder="请输入手机号码" />
+              <el-form-item label="绑定车牌号" prop="carNum">
+                <el-input v-model.number="form.carNum" placeholder="请输入车牌号" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="办理人" prop="handleName">
+                <el-input v-model.number="form.handleName" placeholder="请输入办理人姓名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="有效日期" prop="phone">
+                <el-date-picker
+                  range-separator="到"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  v-model="checkDate"
+                  type="daterange"
+                  placeholder="选择日期"
+                  @change="handlDate"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="费用" prop="cost">
+                <el-input v-model.number="form.cost" placeholder="请输入费用">
+                  <template #suffix>元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="支付方式" prop="payMethod">
+                <el-select v-model="form.payMethod" placeholder="请选择支付方式" clearable>
+                  <el-option v-for="dict in com_pay_method" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="24">
-              <el-form-item label="备注" prop="email">
-                <el-input type="textarea" :rows="5" v-model.trim="form.email" placeholder="请输入" />
+              <el-form-item label="备注" prop="remark">
+                <el-input type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -52,50 +91,77 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
+import { addMonthCard, getMonthCard, updateMonthCard } from '@/api/system/MonthCard';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_pay_method } = toRefs<any>(proxy?.useDict('com_pay_method'));

 const router = useRouter();
 const route = useRoute();

 const formRef = ref();
-const houseformat = ['东', '西', '南', '北'];
 const form = ref({
  id: null,
-  houseId: null,
-  rentalName: '', // 租户姓名
-  rent: null, // 租金
-  houseFace: '', // 房屋朝向
-  rentalType: 0, //  整租合租
-  phone: null, //手机号
-  houseArea: null, // 房屋面积
-  floorNo: null, //楼层号
-  inTime: '', //入住时间
-  facilities: '', //房屋设施
-  houseImageUrl: '', //房屋图片
-  supInfo: '', //补充租房信息
-  vx: '', //微信
-  houseUse: 0, //房屋用途
-  rentalStatus: 0, //租赁状态
-  email: '' //邮箱
+  cardCode: '', // 月卡编号
+  cardName: null, // 持卡人姓名
+  phone: '', // 手机号
+  carNum: null, // 绑定车牌号
+  handleName: '', //  办理人姓名
+  cost: null, // 费用/元
+  payMethod: '', // 支付方式
+  remark: '', // 备注
+  startTime: '', // 开始日期
+  endTime: '' // 结束日期
 });
+const checkDate = ref([]);
+function handlDate() {
+  form.value.startTime = checkDate.value[0];
+  form.value.endTime = checkDate.value[1];
+}
 const rules = ref({
-  houseId: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
-  rentalName: [{ required: true, message: '请输入名称', trigger: 'blur' }]
+  cardCode: [{ required: true, message: '请输入月卡编号', trigger: 'blur' }],
+  cardName: [{ required: true, message: '请输入持卡人姓名', trigger: 'blur' }],
+  phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+  carNum: [{ required: true, message: '请绑定车牌号', trigger: 'blur' }],
+  startTime: [{ required: true, message: '请选择有效日期', trigger: 'blur' }],
+  payMethod: [{ required: true, message: '请选择支付方式', trigger: 'blur' }],
+  cost: [{ required: true, message: '请输入费用', trigger: 'blur' }]
 });
 const userid = ref(null);
-
+if (route.query.id) {
+  userid.value = route.query.id;
+  getMonthCard(userid.value).then((res) => {
+    form.value = {
+      ...form.value,
+      ...res.data
+    };
+  });
+}
 // !== 提交 =============================================================================
 // 提交
 const submitForm = () => {
  formRef.value?.validate(async (valid: boolean) => {
    if (valid) {
+      if (userid.value) {
+        updateMonthCard(form.value).then((res) => {
+          console.log(res);
+          ElMessage.success('编辑成功');
+          cancelForm();
+        });
+      } else {
+        addMonthCard(form.value).then((res) => {
+          console.log(res);
+          ElMessage.success('添加成功');
+
+          cancelForm();
+        });
+      }
    }
  });
 };
 // 推出
 const cancelForm = () => {
  router.push({
-    path: '/house/parkingList'
+    path: '/carArea/monthCard'
  });
 };
 </script>
--- a/src/views/system/resident/addResident.vue
+++ b/src/views/system/resident/addResident.vue
@@ -106,14 +106,14 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { useHouseStore } from '@/store/modules/house';
-import { addHouseAPI, EditHouseApi, getHouseApi, getHouselistAPI, getVillageTree } from '@/api/system/house';
+import { getVillageTree } from '@/api/system/house';
 import { convertBuildingToTree, getHousePathById, ownerRelationshiplist } from '@/utils/house';
 import { ResidentForm } from '@/api/system/resident/type';
 import { CascaderValue, UploadFiles, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
 import { genFileId } from 'element-plus';
 import { getCommunitylistAPI } from '@/api/system/community';
 import { addResident, getResident, updateResident } from '@/api/system/resident';
+import { validator } from '@/utils/Reg';

 const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/resident/uploadImage';

@@ -141,10 +141,7 @@ const rules = ref({
  idCard: [
    { required: true, message: '请输入身份证号', trigger: 'blur' },
    {
-      validator(_, value) {
-        const reg = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/;
-        return reg.test(value);
-      },
+      validator: (_, value) => validator(value, 'idCard'),
      message: '请输入正确的18位身份证号码',
      trigger: 'blur'
    }
@@ -153,9 +150,7 @@ const rules = ref({
  phone: [
    { required: true, message: '请输入手机号', trigger: 'blur' },
    {
-      validator: (_, value) => {
-        return /^1[3-9]\d{9}$/.test(value);
-      },
+      validator: (_, value) => validator(value, 'phone'),
      message: '请输入正确的手机号码',
      trigger: 'blur'
    }