Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run

This commit is contained in:
FLL
2025-07-20 17:49:49 +08:00
180 changed files with 20672 additions and 189 deletions

View File

@@ -0,0 +1,61 @@
import type { ArrangementVO, ArrangementForm, ArrangementQuery } from './model';
import type { ID, IDS } from '#/api/common';
import type { PageResult } from '#/api/common';
import { commonExport } from '#/api/helper';
import { requestClient } from '#/api/request';
/**
* 查询排班列表
* @param params
* @returns 排班列表
*/
export function arrangementList(params?: ArrangementQuery) {
return requestClient.get<PageResult<ArrangementVO>>('/property/arrangement/list', { params });
}
/**
* 导出排班列表
* @param params
* @returns 排班列表
*/
export function arrangementExport(params?: ArrangementQuery) {
return commonExport('/property/arrangement/export', params ?? {});
}
/**
* 查询排班详情
* @param id id
* @returns 排班详情
*/
export function arrangementInfo(id: ID) {
return requestClient.get<ArrangementVO>(`/property/arrangement/${id}`);
}
/**
* 新增排班
* @param data
* @returns void
*/
export function arrangementAdd(data: ArrangementForm) {
return requestClient.postWithMsg<void>('/property/arrangement', data);
}
/**
* 更新排班
* @param data
* @returns void
*/
export function arrangementUpdate(data: ArrangementForm) {
return requestClient.putWithMsg<void>('/property/arrangement', data);
}
/**
* 删除排班
* @param id id
* @returns void
*/
export function arrangementRemove(id: ID | IDS) {
return requestClient.deleteWithMsg<void>(`/property/arrangement/${id}`);
}

View File

@@ -0,0 +1,129 @@
import type { PageQuery, BaseEntity } from '#/api/common';
export interface ArrangementVO {
/**
* 主键ID
*/
id: string | number;
/**
* 排班名称
*/
scheduleName: string;
/**
* 考勤组ID
*/
groupId: string | number;
/**
* 排班类型1-固定班制2-排班制
*/
scheduleType: number;
/**
* 日期类型1-单个日期2-长期有效3-期间有效
*/
dateType: number;
/**
* 开始日期
*/
startDate: string;
/**
* 结束日期(仅date_type=3时有效)
*/
endDate: string;
/**
* 状态0-未生效1-已生效
*/
status: number;
}
export interface ArrangementForm extends BaseEntity {
/**
* 主键ID
*/
id?: string | number;
/**
* 排班名称
*/
scheduleName?: string;
/**
* 考勤组ID
*/
groupId?: string | number;
/**
* 排班类型1-固定班制2-排班制
*/
scheduleType?: number;
/**
* 日期类型1-单个日期2-长期有效3-期间有效
*/
dateType?: number;
/**
* 开始日期
*/
startDate?: string;
/**
* 结束日期(仅date_type=3时有效)
*/
endDate?: string;
/**
* 状态0-未生效1-已生效
*/
status?: number;
}
export interface ArrangementQuery extends PageQuery {
/**
* 排班名称
*/
scheduleName?: string;
/**
* 考勤组ID
*/
groupId?: string | number;
/**
* 排班类型1-固定班制2-排班制
*/
scheduleType?: number;
/**
* 日期类型1-单个日期2-长期有效3-期间有效
*/
dateType?: number;
/**
* 开始日期
*/
startDate?: string;
/**
* 结束日期(仅date_type=3时有效)
*/
endDate?: string;
/**
* 状态0-未生效1-已生效
*/
status?: number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@@ -0,0 +1,61 @@
import type { GroupVO, GroupForm, GroupQuery } from './model';
import type { ID, IDS } from '#/api/common';
import type { PageResult } from '#/api/common';
import { commonExport } from '#/api/helper';
import { requestClient } from '#/api/request';
/**
* 查询考勤组基本信息列表
* @param params
* @returns 考勤组基本信息列表
*/
export function groupList(params?: GroupQuery) {
return requestClient.get<PageResult<GroupVO>>('/Property/group/list', { params });
}
/**
* 导出考勤组基本信息列表
* @param params
* @returns 考勤组基本信息列表
*/
export function groupExport(params?: GroupQuery) {
return commonExport('/Property/group/export', params ?? {});
}
/**
* 查询考勤组基本信息详情
* @param id id
* @returns 考勤组基本信息详情
*/
export function groupInfo(id: ID) {
return requestClient.get<GroupVO>(`/Property/group/${id}`);
}
/**
* 新增考勤组基本信息
* @param data
* @returns void
*/
export function groupAdd(data: GroupForm) {
return requestClient.postWithMsg<void>('/Property/group', data);
}
/**
* 更新考勤组基本信息
* @param data
* @returns void
*/
export function groupUpdate(data: GroupForm) {
return requestClient.putWithMsg<void>('/Property/group', data);
}
/**
* 删除考勤组基本信息
* @param id id
* @returns void
*/
export function groupRemove(id: ID | IDS) {
return requestClient.deleteWithMsg<void>(`/Property/group/${id}`);
}

View File

@@ -0,0 +1,69 @@
import type { PageQuery, BaseEntity } from '#/api/common';
export interface GroupVO {
/**
* 主键id
*/
id: string | number;
/**
* 考勤组名称
*/
groupName: string;
/**
* 状态(1:启用,0:禁用)
*/
status: number;
/**
* 考勤类型(0:固定班制,1:排班制)
*/
attendanceType: number;
}
export interface GroupForm extends BaseEntity {
/**
* 主键id
*/
id?: string | number;
/**
* 考勤组名称
*/
groupName?: string;
/**
* 状态(1:启用,0:禁用)
*/
status?: number;
/**
* 考勤类型(0:固定班制,1:排班制)
*/
attendanceType?: number;
}
export interface GroupQuery extends PageQuery {
/**
* 考勤组名称
*/
groupName?: string;
/**
* 状态(1:启用,0:禁用)
*/
status?: number;
/**
* 考勤类型(0:固定班制,1:排班制)
*/
attendanceType?: number;
/**
* 日期范围参数
*/
params?: any;
}

View File

@@ -167,3 +167,5 @@ export interface CarChargeQuery extends PageQuery {
*/
params?: any;
}

View File

@@ -42,6 +42,10 @@ export function houseChargeAdd(data: HouseChargeForm) {
return requestClient.postWithMsg<void>('/property/houseCharge', data);
}
export function houseChargeRefund(data: HouseChargeForm) {
return requestClient.postWithMsg<void>('/property/houseCharge/returnFee', data);
}
/**
* 更新房屋收费
* @param data

View File

@@ -12,7 +12,7 @@ import { requestClient } from '#/api/request';
* @returns 费用-水电抄列表
*/
export function costMeterWaterList(params?: CostMeterWaterQuery) {
return requestClient.get<PageResult<CostMeterWaterVO>>('/property/costMeterWater/list', { params });
return requestClient.get<PageResult<CostMeterWaterVO>>('/property/meterWater/list', { params });
}
/**
@@ -30,7 +30,7 @@ export function costMeterWaterExport(params?: CostMeterWaterQuery) {
* @returns 费用-水电抄详情
*/
export function costMeterWaterInfo(id: ID) {
return requestClient.get<CostMeterWaterVO>(`/property/costMeterWater/${id}`);
return requestClient.get<CostMeterWaterVO>(`/property/meterWater/${id}`);
}
/**
@@ -39,7 +39,7 @@ export function costMeterWaterInfo(id: ID) {
* @returns void
*/
export function costMeterWaterAdd(data: CostMeterWaterForm) {
return requestClient.postWithMsg<void>('/property/costMeterWater', data);
return requestClient.postWithMsg<void>('/property/meterWater', data);
}
/**
@@ -48,7 +48,7 @@ export function costMeterWaterAdd(data: CostMeterWaterForm) {
* @returns void
*/
export function costMeterWaterUpdate(data: CostMeterWaterForm) {
return requestClient.putWithMsg<void>('/property/costMeterWater', data);
return requestClient.putWithMsg<void>('/property/meterWater', data);
}
/**
@@ -57,5 +57,5 @@ export function costMeterWaterUpdate(data: CostMeterWaterForm) {
* @returns void
*/
export function costMeterWaterRemove(id: ID | IDS) {
return requestClient.deleteWithMsg<void>(`/property/costMeterWater/${id}`);
}
return requestClient.deleteWithMsg<void>(`/property/meterWater/${id}`);
}