房屋详情,单元变更

This commit is contained in:
Zy
2026-05-21 14:13:28 +08:00
parent 9645412534
commit 38274ab612
68 changed files with 1867 additions and 568 deletions

View File

@@ -60,12 +60,12 @@ export interface DecorationForm extends BaseEntity {
* 所属小区id
*/
villageId?: string;
villageName?: string;
/**
* 所属房屋id
*/
houseId?: string | number;
houseName?: string;
/**
* 申请人姓名
*/

View File

@@ -0,0 +1,17 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { NoticeVO, NoticeForm, NoticeQuery } from '@/api/system/NoticePc/type';
/**
* 查询消息通知列表
* @param query
* @returns {*}
*/
export const getNotificationList = (query?: NoticeQuery): AxiosPromise<NoticeVO[]> => {
return request({
url: '/notification/list',
method: 'get',
params: query
});
};

View File

@@ -85,13 +85,21 @@ export const listBillHouse = (query: { pageNum: number; pageSize: number }): Axi
};
// ! =---------------
export type BillUserlist = {
'gender': string;
'phone': string;
'house_name': string;
'residentName': string;
'houseNo': string;
'residentId': string;
'buildingId': string;
};
/**
* 查询业主列表
* @param data
* @returns {*}
*/
export const queryResidentList_holder = (query: { pageNum: number; pageSize: number }) => {
export const queryResidentList_holder = (query: { pageNum: number; pageSize: number }): AxiosPromise<BillUserlist[]> => {
return request({
url: '/bill/getResidentList',
method: 'GET',

View File

@@ -5,13 +5,11 @@ import { addBuildingType, addHouseType, BuildingUnit, BuildingVo } from './type'
// 楼栋---------------------------------------------------------------------------------------
/** 根据 小区id 和 类型 查询楼栋信息 */
export function getBuildinglistAPI(buildingUse: string): AxiosPromise<BuildingVo[]> {
export function getBuildinglistAPI(): AxiosPromise<BuildingVo[]> {
return request({
url: '/building/byVillage',
method: 'get',
params: {
buildingUse: buildingUse
}
params: {}
});
}
/** 获取所有楼栋 */
@@ -55,9 +53,9 @@ export function deleteBuildingApi(id: string) {
// 房屋----------------------------------------------------------------------------------------------
/** 根据 楼栋id 查询房屋信息 */
export function getHouselistAPI(buildingId: string, houseName: string = ''): AxiosPromise<BuildingUnit> {
export function getHouselistAPI(buildingId: string, houseName: string = '', houseUseTypeId: string = ''): AxiosPromise<BuildingUnit> {
return request({
url: `/house/groupByUnitTree/${buildingId}?houseName=${houseName}`,
url: `/house/groupByUnitTree/${buildingId}?houseName=${houseName}&houseUseTypeId=${houseUseTypeId}`,
method: 'get'
});
}
@@ -119,7 +117,7 @@ export interface Data {
billResidentList: BillResidentList[];
chargeItemList: string[];
house: House;
parking: null;
parking: Parking;
residentList: ResidentList[];
storeroom: Storeroom;
}
@@ -143,7 +141,7 @@ export interface House {
houseType: string;
internalArea: string;
shareArea: string;
unitNo: number;
unitNoName: string;
villageName: string;
}
@@ -166,3 +164,19 @@ export interface Storeroom {
storeroomNo: string;
unitNo: number;
}
export interface Parking {
'parkingArea': number;
'areaName': string;
'createTime': string;
'parkingId': string;
'parkingStatus': string;
'remark': string;
'parkingFloor': string;
'type': string;
'villageId': number;
'parkingCode': string;
'residentName': string;
'residentId': string;
'createName': string;
}

View File

@@ -47,14 +47,15 @@ export interface BuildingUnit {
buildingId: number;
buildingName: string;
floorCount: number;
unitCount: number;
units: BuildingUnitlist[];
}
// 单元
export interface BuildingUnitlist {
floors: FloorsType[];
unitNo: number;
unitNoName: string;
unitNoId: string;
}
// 楼层
export interface FloorsType {
floorNo: string;
@@ -80,7 +81,8 @@ export interface addHouseType {
'houseId'?: string;
'buildingId'?: string;
'villageId'?: string;
'unitNo': string;
'houseUseTypeId': string;
'unitNoId': string;
'floorNo': string;
'houseNo': string;
'houseArea': string;

View File

@@ -0,0 +1,76 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { UnitNoVO, UnitNoForm, UnitNoQuery } from './type';
/**
* 查询单元列表
* @param query
* @returns {*}
*/
export const listUnitNo = (query?: UnitNoQuery): AxiosPromise<UnitNoVO[]> => {
return request({
url: '/unitNo/list',
method: 'get',
params: query
});
};
/**
* 查询单元详细
* @param id
*/
export const getUnitNo = (id: string | number): AxiosPromise<UnitNoVO> => {
return request({
url: '/unitNo/' + id,
method: 'get'
});
};
/**
* 新增单元
* @param data
*/
export const addUnitNo = (data: UnitNoForm) => {
return request({
url: '/unitNo',
method: 'post',
data: data
});
};
/**
* 修改单元
* @param data
*/
export const updateUnitNo = (data: UnitNoForm) => {
return request({
url: '/unitNo',
method: 'put',
data: data
});
};
/**
* 删除单元
* @param id
*/
export const delUnitNo = (id: string | number | Array<string | number>) => {
return request({
url: '/unitNo/' + id,
method: 'delete'
});
};
/**
* 根据 楼栋id 获取单元
* @param id
*/
export const getByBUildingidtoUnitNo = (id: string) => {
return request({
url: '/unitNo/byBuildingList',
method: 'GET',
params: {
buildingId: id
}
});
};

View File

@@ -0,0 +1,65 @@
export interface UnitNoVO {
/**
* 单元表id
*/
id: string | number;
/**
* 单元名称
*/
name: string;
/**
* 小区id
*/
villageId: string | number;
/**
* 楼栋id
*/
buildingId: string | number;
}
export interface UnitNoForm extends BaseEntity {
/**
* 单元表id
*/
id?: string | number;
/**
* 单元名称
*/
name?: string;
/**
* 小区id
*/
villageId?: string | number;
/**
* 楼栋id
*/
buildingId?: string | number;
}
export interface UnitNoQuery extends PageQuery {
/**
* 单元名称
*/
name?: string;
/**
* 小区id
*/
villageId?: string | number;
/**
* 楼栋id
*/
buildingId?: string | number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { HouseUseTypeVO, HouseUseTypeForm, HouseUseTypeQuery } from './type';
/**
* 查询房屋类型列表
* @param query
* @returns {*}
*/
export const listHouseUseType = (query?: HouseUseTypeQuery): AxiosPromise<HouseUseTypeVO[]> => {
return request({
url: '/houseUseType/list',
method: 'get',
params: query
});
};
/**
* 查询房屋类型详细
* @param id
*/
export const getHouseUseType = (id: string | number): AxiosPromise<HouseUseTypeVO> => {
return request({
url: '/houseUseType/' + id,
method: 'get'
});
};
/**
* 新增房屋类型
* @param data
*/
export const addHouseUseType = (data: HouseUseTypeForm) => {
return request({
url: '/houseUseType',
method: 'post',
data: data
});
};
/**
* 修改房屋类型
* @param data
*/
export const updateHouseUseType = (data: HouseUseTypeForm) => {
return request({
url: '/houseUseType',
method: 'put',
data: data
});
};
/**
* 删除房屋类型
* @param id
*/
export const delHouseUseType = (id: string | number | Array<string | number>) => {
return request({
url: '/houseUseType/' + id,
method: 'delete'
});
};

View File

@@ -0,0 +1,35 @@
export interface HouseUseTypeVO {
/**
* 房屋类型id
*/
id: string | number;
/**
* 用途名称
*/
name: string;
}
export interface HouseUseTypeForm extends BaseEntity {
/**
* 房屋类型id
*/
id?: string | number;
/**
* 用途名称
*/
name?: string;
}
export interface HouseUseTypeQuery extends PageQuery {
/**
* 用途名称
*/
name?: string;
/**
* 日期范围参数
*/
params?: any;
}

View File

@@ -91,9 +91,13 @@ export const getParkingReviewInfo = (id: string) => {
* @returns {*}
*/
export const GetVillageListParking = (villageid?: string): AxiosPromise<ParkingVO[]> => {
export const GetVillageListParking = (villageid: string, houseId: string = undefined): AxiosPromise<ParkingVO[]> => {
return request({
url: `/parking/getList/${villageid}`,
method: 'GET'
url: `/parking/getList`,
method: 'POST',
data: {
villageId: villageid,
houseId: houseId
}
});
};

View File

@@ -68,9 +68,10 @@ export const delStoreroom = (id: string | number | Array<string | number>) => {
*/
export const GetVillagelistStoreroom = (
data: { villageid: string; unitNo: string; buildingId: string } = {
data: { villageid: string; unitNo: string; houseId?: string; buildingId: string } = {
villageid: null,
buildingId: null,
houseId: null,
unitNo: null
}
): AxiosPromise<StoreroomVO[]> => {
@@ -80,7 +81,8 @@ export const GetVillagelistStoreroom = (
data: {
villageId: data.villageid,
buildingId: data.buildingId,
unitNo: data.unitNo
unitNo: data.unitNo,
houseId: data.houseId
}
});
};

View File

@@ -2,12 +2,12 @@ export interface StoreroomVO {
/**
* 储藏室ID
*/
id: string | number;
id: string;
/**
* 所属楼栋ID
*/
buildingId: string | number;
buildingId: string;
/**
* 单元号
@@ -54,12 +54,12 @@ export interface StoreroomForm extends BaseEntity {
/**
* 储藏室ID
*/
id?: string | number;
id?: string;
/**
* 所属楼栋ID
*/
buildingId?: string | number;
buildingId?: string;
/**
* 单元号
@@ -106,7 +106,7 @@ export interface StoreroomQuery extends PageQuery {
/**
* 所属楼栋ID
*/
buildingId?: string | number;
buildingId?: string;
/**
* 单元号