Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

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

@@ -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<PageResult<AttachVO>>('/property/attach/attachList', );
+}
 
 /**
  * 导出会议室增值服务列表

apps/web-antd/src/api/property/roomBooking/conferenceReservations/index.ts

@@ -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);
+}

apps/web-antd/src/api/property/roomBooking/conferenceReservations/model.d.ts

@@ -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;
+
+}

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

@@ -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';
@@ -59,3 +59,7 @@ export function meetUpdate(data: MeetForm) {
 export function meetRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/property/meet/${id}`);
 }
+
+export function notlist(params?: MeetBo) {
+  return requestClient.get<PageResult<MeetVO>>('/property/meet/notlist', { params });
+}

apps/web-antd/src/api/property/roomBooking/conferenceSettings/model.d.ts

@@ -268,6 +268,8 @@ export interface conferenceSettingsDetail extends BaseEntity {
    */
   baseServiceId: string | number;
 
+  baseService: string;
+
   /**
    * 基础价格
    */
@@ -297,6 +299,8 @@ export interface conferenceSettingsDetail extends BaseEntity {
    * 负责人
    */
   principals: string;
+
+  principalsName: string;
   /**
    * 描述
    */
@@ -326,3 +330,60 @@ export interface conferenceSettingsDetail extends BaseEntity {
    */
   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;
+}