resolve: 解决合并冲突
This commit is contained in:
wuzhen committed
commit
80dface225
97 files changed
+4789
-1686
No files matched your search
@@ -1,84 +1,39 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
import { HallReservationVO, HallReservationForm, HallReservationQuery } from '@/api/hq/hallReservation/types';
|
||||
import { HallReservationVO, HallReservationQuery } from '../hallReservation/types';
|
||||
import { HallReservationAuditForm, TimeCheckParams, TimeCheckResult } from './types';
|
||||
import { TableDataInfo, R } from '@/api/types';
|
||||
|
||||
/**
|
||||
* 查询报告厅预约列表
|
||||
* @param query
|
||||
* @returns {*}
|
||||
*/
|
||||
|
||||
export const listHallReservation = (query?: HallReservationQuery): AxiosPromise<HallReservationVO[]> => {
|
||||
return request({
|
||||
// 查询报告厅预约列表
|
||||
export function listHallReservation(query: HallReservationQuery) {
|
||||
return request<TableDataInfo<HallReservationVO>>({
|
||||
url: '/hq/hallReservation/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询报告厅预约详细
|
||||
* @param id
|
||||
*/
|
||||
export const getHallReservation = (id: string | number): AxiosPromise<HallReservationVO> => {
|
||||
return request({
|
||||
// 获取报告厅预约详细信息
|
||||
export function getHallReservation(id: string | number) {
|
||||
return request<R<HallReservationVO>>({
|
||||
url: '/hq/hallReservation/' + id,
|
||||
method: 'get'
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 新增报告厅预约
|
||||
* @param data
|
||||
*/
|
||||
export const addHallReservation = (data: HallReservationForm) => {
|
||||
return request({
|
||||
url: '/hq/hallReservation',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 修改报告厅预约
|
||||
* @param data
|
||||
*/
|
||||
export const updateHallReservation = (data: HallReservationForm) => {
|
||||
return request({
|
||||
url: '/hq/hallReservation',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 删除报告厅预约
|
||||
* @param id
|
||||
*/
|
||||
export const delHallReservation = (id: string | number | Array<string | number>) => {
|
||||
return request({
|
||||
url: '/hq/hallReservation/' + id,
|
||||
method: 'delete'
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 审核报告厅预约（批准/拒绝）
|
||||
* @param data
|
||||
*/
|
||||
export interface HallReservationAuditForm {
|
||||
/** 预约记录ID列表 */
|
||||
ids: Array<string | number>;
|
||||
/** 审核状态：1-批准，2-拒绝 */
|
||||
status: string;
|
||||
/** 审核备注 */
|
||||
auditRemark?: string;
|
||||
}
|
||||
|
||||
export const auditHallReservation = (data: HallReservationAuditForm) => {
|
||||
return request({
|
||||
// 审核报告厅预约
|
||||
export function auditHallReservation(data: HallReservationAuditForm) {
|
||||
return request<R<any>>({
|
||||
url: '/hq/hallReservation/audit',
|
||||
method: 'put',
|
||||
data: data
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
// 检查报告厅预约时间是否存在冲突
|
||||
export function checkTimeConflict(data: TimeCheckParams) {
|
||||
return request<R<TimeCheckResult>>({
|
||||
url: '/hq/hallReservation/checkTimeConflict',
|
||||
method: 'post',
|
||||
data: data
|
||||
});
|
||||
}
|
||||
@@ -1,200 +1,39 @@
|
||||
export interface HallReservationVO {
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* 报告厅ID
|
||||
*/
|
||||
hallId: string | number;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
hallName: string;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
startTime: string;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
endTime: string;
|
||||
|
||||
/**
|
||||
* 预约用途
|
||||
*/
|
||||
reservationPurpose: string;
|
||||
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
applicantId: string | number;
|
||||
|
||||
/**
|
||||
* 申请人姓名
|
||||
*/
|
||||
applicantName: string;
|
||||
|
||||
/**
|
||||
* 申请人电话
|
||||
*/
|
||||
applicantPhone: string;
|
||||
|
||||
/**
|
||||
* 预约状态
|
||||
*/
|
||||
status: string;
|
||||
|
||||
/**
|
||||
* 审核人id
|
||||
*/
|
||||
auditBy: number;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
auditName: string;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
auditTime: string;
|
||||
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
auditRemark: string;
|
||||
import { HallReservationVO } from '../hallReservation/types';
|
||||
|
||||
/**
|
||||
* 报告厅预约审核表单
|
||||
*/
|
||||
export interface HallReservationAuditForm {
|
||||
/** 预约ID列表 */
|
||||
ids: Array<string | number>;
|
||||
/** 审核状态 */
|
||||
status: string;
|
||||
/** 审核备注 */
|
||||
auditRemark?: string;
|
||||
}
|
||||
|
||||
export interface HallReservationForm extends BaseEntity {
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
id?: string | number;
|
||||
|
||||
/**
|
||||
* 报告厅ID
|
||||
*/
|
||||
hallId?: string | number;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
hallName?: string;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
startTime?: string;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
endTime?: string;
|
||||
|
||||
/**
|
||||
* 预约用途
|
||||
*/
|
||||
reservationPurpose?: string;
|
||||
|
||||
/**
|
||||
* 申请人id
|
||||
*/
|
||||
applicantId?: string | number;
|
||||
|
||||
/**
|
||||
* 申请人姓名
|
||||
*/
|
||||
applicantName?: string;
|
||||
|
||||
/**
|
||||
* 申请人电话
|
||||
*/
|
||||
applicantPhone?: string;
|
||||
|
||||
/**
|
||||
* 预约状态
|
||||
*/
|
||||
status?: string;
|
||||
|
||||
/**
|
||||
* 审核人id
|
||||
*/
|
||||
auditBy?: number;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
auditName?: string;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
auditTime?: string;
|
||||
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
auditRemark?: string;
|
||||
|
||||
/**
|
||||
* 时间冲突检查参数
|
||||
*/
|
||||
export interface TimeCheckParams {
|
||||
/** 报告厅ID */
|
||||
hallId: string | number;
|
||||
/** 预约开始时间 */
|
||||
startTime: string;
|
||||
/** 预约结束时间 */
|
||||
endTime: string;
|
||||
/** 排除的预约ID */
|
||||
excludeId?: string | number;
|
||||
}
|
||||
|
||||
export interface HallReservationQuery extends PageQuery {
|
||||
|
||||
/**
|
||||
* 报告厅ID
|
||||
*/
|
||||
hallId?: string | number;
|
||||
|
||||
/**
|
||||
* 报告厅名称
|
||||
*/
|
||||
hallName?: string;
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
*/
|
||||
startTime?: string;
|
||||
|
||||
/**
|
||||
* 结束时间
|
||||
*/
|
||||
endTime?: string;
|
||||
|
||||
/**
|
||||
* 开始时间查询参数（字符串格式）
|
||||
*/
|
||||
startTimeStr?: string;
|
||||
|
||||
/**
|
||||
* 结束时间查询参数（字符串格式）
|
||||
*/
|
||||
endTimeStr?: string;
|
||||
|
||||
/**
|
||||
* 申请人ID
|
||||
*/
|
||||
applicantId?: string | number;
|
||||
|
||||
/**
|
||||
* 申请人姓名
|
||||
*/
|
||||
applicantName?: string;
|
||||
|
||||
/**
|
||||
* 预约状态
|
||||
*/
|
||||
status?: string;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
/**
|
||||
* 时间冲突检查结果
|
||||
*/
|
||||
export interface TimeCheckResult {
|
||||
/** 是否存在冲突 */
|
||||
hasConflict: boolean;
|
||||
/** 冲突的预约列表 */
|
||||
conflictList: HallReservationVO[];
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import request from '@/utils/request';
|
||||
import { AxiosPromise } from 'axios';
|
||||
import { RepairCategoryVO, RepairCategoryForm, RepairCategoryQuery } from '@/api/hq/hq/pm/types';
|
||||
import { RepairCategoryVO, RepairCategoryForm, RepairCategoryQuery } from '@/api/hq/pm/types';
|
||||
|
||||
/**
|
||||
* 查询维修类型列表
|
||||
|
||||
@@ -209,6 +209,19 @@ export const deptTreeSelect = (): AxiosPromise<DeptTreeVO[]> => {
|
||||
});
|
||||
};
|
||||
|
||||
/** 获取具有指定权限的用户列表 */
|
||||
export function listUsersByPermission(permission: string, tenantId?: string): AxiosPromise<UserVO[]> {
|
||||
return request({
|
||||
url: '/system/user/list-by-permission',
|
||||
method: 'get',
|
||||
params: {
|
||||
permission,
|
||||
tenantId
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export default {
|
||||
listUser,
|
||||
getUser,
|
||||
@@ -225,5 +238,6 @@ export default {
|
||||
getAuthRole,
|
||||
updateAuthRole,
|
||||
deptTreeSelect,
|
||||
listUserByDeptId
|
||||
listUserByDeptId,
|
||||
listUsersByPermission
|
||||
};
|
||||
Reference in new issue
Block a user