diff --git a/src/api/system/cars/index.ts b/src/api/system/cars/index.ts new file mode 100644 index 0000000..4f36d95 --- /dev/null +++ b/src/api/system/cars/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { CarVO, CarForm, CarQuery } from '@/api/system/cars/type'; + +/** + * 查询车辆管理列表 + * @param query + * @returns {*} + */ + +export const listCar = (query?: CarQuery): AxiosPromise => { + return request({ + url: '/car/car/list', + method: 'get', + params: query + }); +}; + +/** + * 查询车辆管理详细 + * @param id + */ +export const getCar = (id: string | number): AxiosPromise => { + return request({ + url: '/car/car/' + id, + method: 'get' + }); +}; + +/** + * 新增车辆管理 + * @param data + */ +export const addCar = (data: CarForm) => { + return request({ + url: '/car/car', + method: 'post', + data: data + }); +}; + +/** + * 修改车辆管理 + * @param data + */ +export const updateCar = (data: CarForm) => { + return request({ + url: '/car/car', + method: 'put', + data: data + }); +}; + +/** + * 删除车辆管理 + * @param id + */ +export const delCar = (id: string | number | Array) => { + return request({ + url: '/car/car/' + id, + method: 'delete' + }); +}; diff --git a/src/api/system/cars/type.ts b/src/api/system/cars/type.ts new file mode 100644 index 0000000..188acd0 --- /dev/null +++ b/src/api/system/cars/type.ts @@ -0,0 +1,170 @@ +export interface CarVO { + /** + * 车辆管理表id + */ + id: string | number; + + /** + * 区域id + */ + areaId: string | number; + + /** + * 车位id + */ + parkingId: string | number; + + /** + * 持有人id(住户表id) + */ + residentId: string | number; + + /** + * 车牌号 + */ + carNum: string; + + /** + * 车辆品牌 + */ + carBrand: string; + + /** + * 车辆型号 + */ + carModel: string; + + /** + * 车身颜色 + */ + carColor: string; + + /** + * 备注 + */ + remark: string; + + /** + * 车辆图片url + */ + carImageUrl: string; +} + +export interface CarForm extends BaseEntity { + /** + * 车辆管理表id + */ + id?: string | number; + + /** + * 区域id + */ + areaId?: string | number; + + /** + * 车位id + */ + parkingId?: string | number; + + /** + * 持有人id(住户表id) + */ + residentId?: string | number; + + /** + * 车牌号 + */ + carNum?: string; + + /** + * 车辆品牌 + */ + carBrand?: string; + + /** + * 车辆型号 + */ + carModel?: string; + + /** + * 车身颜色 + */ + carColor?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 车辆图片url + */ + carImageUrl?: string; + + /** + * 创建者 + */ + createBy?: number; + + /** + * 创建时间 + */ + createTime?: string; + + /** + * 修改者 + */ + updateBy?: number; + + /** + * 修改时间 + */ + updateTime?: string; +} + +export interface CarQuery extends PageQuery { + /** + * 区域id + */ + areaId?: string | number; + + /** + * 车位id + */ + parkingId?: string | number; + + /** + * 持有人id(住户表id) + */ + residentId?: string | number; + + /** + * 车牌号 + */ + carNum?: string; + + /** + * 车辆品牌 + */ + carBrand?: string; + + /** + * 车辆型号 + */ + carModel?: string; + + /** + * 车身颜色 + */ + carColor?: string; + + /** + * 车辆图片url + */ + carImageUrl?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/system/house/type.ts b/src/api/system/house/type.ts index e9a1eb4..7435862 100644 --- a/src/api/system/house/type.ts +++ b/src/api/system/house/type.ts @@ -87,5 +87,4 @@ export interface addHouseType { 'internalArea': string; 'shareArea': string; 'houseType': string; - houseUse: number; } diff --git a/src/components/Holder/index.vue b/src/components/Holder/index.vue new file mode 100644 index 0000000..e9dc0c6 --- /dev/null +++ b/src/components/Holder/index.vue @@ -0,0 +1,222 @@ + + + + + diff --git a/src/views/system/carArea/addCarArea.vue b/src/views/system/carArea/addCarArea.vue index 0293c48..7ecbba4 100644 --- a/src/views/system/carArea/addCarArea.vue +++ b/src/views/system/carArea/addCarArea.vue @@ -7,35 +7,35 @@ - - + + - - + + - - + + - - + + - + diff --git a/src/views/system/carArea/index.vue b/src/views/system/carArea/index.vue index ccbdc26..6760795 100644 --- a/src/views/system/carArea/index.vue +++ b/src/views/system/carArea/index.vue @@ -1,5 +1,6 @@ + + diff --git a/src/views/system/cars/index.vue b/src/views/system/cars/index.vue new file mode 100644 index 0000000..ac6eec5 --- /dev/null +++ b/src/views/system/cars/index.vue @@ -0,0 +1,277 @@ + + + diff --git a/src/views/system/house/AddHouse.vue b/src/views/system/house/AddHouse.vue index 016c242..7fc8d3a 100644 --- a/src/views/system/house/AddHouse.vue +++ b/src/views/system/house/AddHouse.vue @@ -20,11 +20,6 @@ - - - - - @@ -82,7 +77,6 @@ import PageHeader from '@/components/Pageheader/index.vue'; import { useHouseStore } from '@/store/modules/house'; import { addHouseAPI, EditHouseApi, getHouseApi, getHouselistAPI } from '@/api/system/house'; import { addHouseType } from '@/api/system/house/type'; -import { houseUselist } from '@/utils/house'; const router = useRouter(); const route = useRoute(); @@ -96,7 +90,6 @@ const form = ref({ houseArea: '', //建筑面积 internalArea: '', //套内面积 shareArea: '', // 公摊面积 - houseUse: 0, // 房屋类型 houseType: '' // 房屋户型 }); const rules = ref({ @@ -123,7 +116,6 @@ if (route.query.id) { houseId: res.data.houseId, // 房屋id unitNo: res.data.unitNo, floorNo: res.data.floorNo, - houseUse: res.data.houseUse, houseNo: res.data.houseNo, // 房间号 houseArea: res.data.houseArea, //建筑面积 internalArea: res.data.internalArea, //套内面积 diff --git a/src/views/system/houseRental/index.vue b/src/views/system/houseRental/index.vue index 95e049a..6944ae8 100644 --- a/src/views/system/houseRental/index.vue +++ b/src/views/system/houseRental/index.vue @@ -1,27 +1,30 @@ + + diff --git a/src/views/system/parking/addParking.vue b/src/views/system/parking/addParking.vue index 5f92844..58a2814 100644 --- a/src/views/system/parking/addParking.vue +++ b/src/views/system/parking/addParking.vue @@ -9,7 +9,7 @@ - + @@ -38,8 +38,7 @@ - - + {{ dict.label }} @@ -54,7 +53,10 @@ - 持有人 + + + + @@ -75,46 +77,91 @@ @@ -145,6 +192,7 @@ const cancelForm = () => { .formBody { width: 1050px; margin: 0 auto; + &:deep(.el-form-item__content, .el-select, .el-input) { width: 350px !important; margin-right: 10px; diff --git a/src/views/system/parking/index.vue b/src/views/system/parking/index.vue index e5d4c1f..81a4850 100644 --- a/src/views/system/parking/index.vue +++ b/src/views/system/parking/index.vue @@ -1,12 +1,13 @@