by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Details

Browse Source
This commit is contained in:
fyy
2025-07-09 18:20:21 +08:00
parent d8174111c2 f93b6d356b
commit 0d2a4db6a6
35 changed files with 2717 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/web-antd/src/api/property/roomBooking/conferenceAddServices/index.ts
View File

@@ -14,6 +14,9 @@ import { requestClient } from '#/api/request';
export function attachList(params?: AttachQuery) {
return requestClient.get<PageResult<AttachVO>>('/property/attach/list', { params });
}
export function attachListAll() {
return requestClient.get<AttachVO[]>('/property/attach/attachList', );
}
/**
* 导出会议室增值服务列表

8
apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/index.ts
View File

@@ -1,8 +1,6 @@
import type { BookingVO, BookingForm, BookingQuery } 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';
@@ -12,7 +10,7 @@ import { requestClient } from '#/api/request';
* @returns booking列表
*/
export function bookingList(params?: BookingQuery) {
return requestClient.get<PageResult<BookingVO>>('/system/booking/list', { params });
return requestClient.get<PageResult<BookingVO>>('/property/meetbooking/list', { params });
}
/**
@@ -30,7 +28,7 @@ export function bookingExport(params?: BookingQuery) {
* @returns booking详情
*/
export function bookingInfo(id: ID) {
return requestClient.get<BookingVO>(`/system/booking/${id}`);
return requestClient.get<BookingVO>(`/property/meetbooking/${id}`);
}
/**
@@ -48,7 +46,7 @@ export function bookingAdd(data: BookingForm) {
* @returns void
*/
export function bookingUpdate(data: BookingForm) {
return requestClient.putWithMsg<void>('/system/booking', data);
return requestClient.putWithMsg<void>('/property/meetbooking', data);
}
/**

2
apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/model.d.ts vendored
View File

@@ -85,7 +85,6 @@ export interface BookingVO {
* 搜索值
*/
searchValue: string;
}
export interface BookingForm extends BaseEntity {
@@ -173,7 +172,6 @@ export interface BookingForm extends BaseEntity {
* 搜索值
*/
searchValue?: string;
}
export interface BookingQuery extends PageQuery {

12
apps/web-antd/src/api/property/roomBooking/conferenceReservations/index.ts Normal file
View File

@@ -0,0 +1,12 @@
import type { ReservationForm} from './model';
import { requestClient } from '#/api/request';
/**
* 新增会议管理
* @param data
* @returns void
*/
export function reservationAdd(data: ReservationForm) {
return requestClient.postWithMsg<void>('/property/meetbooking', data);
}

59
apps/web-antd/src/api/property/roomBooking/conferenceReservations/model.d.ts vendored Normal file
View File

@@ -0,0 +1,59 @@
import type { BaseEntity } from '#/api/common';
export interface ReservationForm extends BaseEntity {
/**
* id
*/
id?: string | number;
/**
* 会议室id
*/
meetId?: string | number;
/**
* 预约人
*/
person?: string;
/**
* 所属单位
*/
unit?: string;
/**
* 参会人数
*/
personSum?: string;
/**
* 会议主题
*/
conferenceTheme?: string;
/**
* 预约日期
*/
appointmentDate?: string;
/**
* 预约开始时段
*/
appointmentBeginTime?: string;
/**
* 预约结束时段
*/
appointmentEndTime?: string;
/**
* 备注
*/
remark?: string;
/**
* 是否需要增值服务（0：需要，1：不需要）
*/
attach?: number;
}

18
apps/web-antd/src/api/property/roomBooking/conferenceSettings/index.ts
View File

@@ -1,4 +1,4 @@
import type { MeetVO, MeetForm, MeetQuery } from './model';
import type {MeetVO, MeetForm, MeetQuery, MeetBo} from './model';
import type { ID, IDS } from '#/api/common';
import type { PageResult } from '#/api/common';
@@ -12,7 +12,7 @@ import { requestClient } from '#/api/request';
* @returns 会议室设置列表
*/
export function meetList(params?: MeetQuery) {
return requestClient.get<PageResult<MeetVO>>('/system/meet/list', { params });
return requestClient.get<PageResult<MeetVO>>('/property/meet/list', { params });
}
/**
@@ -21,7 +21,7 @@ export function meetList(params?: MeetQuery) {
* @returns 会议室设置列表
*/
export function meetExport(params?: MeetQuery) {
return commonExport('/system/meet/export', params ?? {});
return commonExport('/property/meet/export', params ?? {});
}
/**
@@ -30,7 +30,7 @@ export function meetExport(params?: MeetQuery) {
* @returns 会议室设置详情
*/
export function meetInfo(id: ID) {
return requestClient.get<MeetVO>(`/system/meet/${id}`);
return requestClient.get<MeetVO>(`/property/meet/${id}`);
}
/**
@@ -39,7 +39,7 @@ export function meetInfo(id: ID) {
* @returns void
*/
export function meetAdd(data: MeetForm) {
return requestClient.postWithMsg<void>('/system/meet', data);
return requestClient.postWithMsg<void>('/property/meet', data);
}
/**
@@ -48,7 +48,7 @@ export function meetAdd(data: MeetForm) {
* @returns void
*/
export function meetUpdate(data: MeetForm) {
return requestClient.putWithMsg<void>('/system/meet', data);
return requestClient.putWithMsg<void>('/property/meet', data);
}
/**
@@ -57,5 +57,9 @@ export function meetUpdate(data: MeetForm) {
* @returns void
*/
export function meetRemove(id: ID | IDS) {
return requestClient.deleteWithMsg<void>(`/system/meet/${id}`);
return requestClient.deleteWithMsg<void>(`/property/meet/${id}`);
}
export function notlist(params?: MeetBo) {
return requestClient.get<PageResult<MeetVO>>('/property/meet/notlist', { params });
}

199
apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts vendored
View File

@@ -24,7 +24,7 @@ export interface MeetVO {
/**
* 基础服务
*/
baseServiceId: string | number;
baseService: string;
/**
* 基础价格
@@ -35,21 +35,38 @@ export interface MeetVO {
* 增值服务是否启用
*/
attach: number;
/**
* 创建人id
* 负责人
*/
createById: string | number;
principals: string;
/**
* 更新人id
* 描述
*/
updateById: string | number;
descs: string;
/**
* 搜索值
* 联系电话
*/
searchValue: string;
phoneNo: string;
/**
* 是否审核
*/
isCheck: string;
/**
* 开放时间
*/
openHours: string;
/**
* 状态
*/
status: string;
/**
*费用模式
*/
expenseType: string;
/**
* 图片
*/
picture: string;
}
export interface MeetForm extends BaseEntity {
@@ -103,6 +120,39 @@ export interface MeetForm extends BaseEntity {
*/
searchValue?: string;
/**
* 负责人
*/
principals: string;
/**
* 描述
*/
descs: string;
/**
* 联系电话
*/
phoneNo: string;
/**
* 是否审核
*/
isCheck: string;
/**
* 开放时间
*/
openHours: string;
/**
* 状态
*/
status: string;
/**
*费用模式
*/
expenseType: string;
/**
* 图片
*/
picture: string;
}
export interface MeetQuery extends PageQuery {
@@ -155,6 +205,39 @@ export interface MeetQuery extends PageQuery {
* 日期范围参数
*/
params?: any;
/**
* 负责人
*/
principals: string;
/**
* 描述
*/
descs: string;
/**
* 联系电话
*/
phoneNo: string;
/**
* 是否审核
*/
isCheck: string;
/**
* 开放时间
*/
openHours: string;
/**
* 状态
*/
status: string;
/**
*费用模式
*/
expenseType: string;
/**
* 图片
*/
picture: string;
}
export interface conferenceSettingsDetail extends BaseEntity {
@@ -173,6 +256,8 @@ export interface conferenceSettingsDetail extends BaseEntity {
*/
location: string;
locationName: string;
/**
* 容纳人数
*/
@@ -183,6 +268,8 @@ export interface conferenceSettingsDetail extends BaseEntity {
*/
baseServiceId: string | number;
baseService: string;
/**
* 基础价格
*/
@@ -207,4 +294,96 @@ export interface conferenceSettingsDetail extends BaseEntity {
* 搜索值
*/
searchValue: string;
/**
* 负责人
*/
principals: string;
principalsName: string;
/**
* 描述
*/
descs: string;
/**
* 联系电话
*/
phoneNo: string;
/**
* 是否审核
*/
isCheck: string;
/**
* 开放时间
*/
openHours: string;
/**
* 状态
*/
status: string;
/**
*费用模式
*/
expenseType: string;
/**
* 图片
*/
picture: string;
}
export interface MeetBo{
/**
* 会议室名称
*/
name?: string;
/**
* 位置
*/
location?: string;
/**
* 容纳人数
*/
personNumber?: number;
/**
* 基础服务
*/
baseServiceId?: string | number;
/**
* 基础价格
*/
basePrice?: number;
/**
* 增值服务是否启用
*/
attach?: number;
/**
* 创建人id
*/
createById?: string | number;
/**
* 更新人id
*/
updateById?: string | number;
/**
* 搜索值
*/
searchValue?: string;
/**
* 日期范围参数
*/
params?: any;
/**
* 开放时间
*/
openHours?: string;
}