diff --git a/web/src/api/hq/hallAudit/index.ts b/web/src/api/hq/hallAudit/index.ts index 784b378e..5f3b008d 100644 --- a/web/src/api/hq/hallAudit/index.ts +++ b/web/src/api/hq/hallAudit/index.ts @@ -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 => { - return request({ +// 查询报告厅预约列表 +export function listHallReservation(query: HallReservationQuery) { + return request>({ url: '/hq/hallReservation/list', method: 'get', params: query }); -}; +} -/** - * 查询报告厅预约详细 - * @param id - */ -export const getHallReservation = (id: string | number): AxiosPromise => { - return request({ +// 获取报告厅预约详细信息 +export function getHallReservation(id: string | number) { + return request>({ 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) => { - return request({ - url: '/hq/hallReservation/' + id, - method: 'delete' - }); -}; - -/** - * 审核报告厅预约(批准/拒绝) - * @param data - */ -export interface HallReservationAuditForm { - /** 预约记录ID列表 */ - ids: Array; - /** 审核状态:1-批准,2-拒绝 */ - status: string; - /** 审核备注 */ - auditRemark?: string; } -export const auditHallReservation = (data: HallReservationAuditForm) => { - return request({ +// 审核报告厅预约 +export function auditHallReservation(data: HallReservationAuditForm) { + return request>({ url: '/hq/hallReservation/audit', method: 'put', data: data }); -}; +} + +// 检查报告厅预约时间是否存在冲突 +export function checkTimeConflict(data: TimeCheckParams) { + return request>({ + url: '/hq/hallReservation/checkTimeConflict', + method: 'post', + data: data + }); +} diff --git a/web/src/views/hq/hallAudit/index.vue b/web/src/views/hq/hallAudit/index.vue index 02d4aaf4..855ce1cb 100644 --- a/web/src/views/hq/hallAudit/index.vue +++ b/web/src/views/hq/hallAudit/index.vue @@ -268,8 +268,7 @@
申请人: - {{ record.applicantName }} - ({{ record.applicantPhone || '手机号暂无' }}) + {{ record.applicantName }}({{ record.applicantPhone || '手机号暂无' }})
预约时间: @@ -281,6 +280,46 @@ 预约用途: {{ record.reservationPurpose }}
+
+ 审核建议: + + + + + + + +
@@ -297,6 +336,22 @@ {{ auditForm.status === '1' ? '批准' : '拒绝' }} + + +
+ 冲突检查统计: +
+ 总计:{{ selectedRecords.length }} 个预约 + 无冲突:{{ getNoConflictCount() }} 个 + 有冲突:{{ getConflictCount() }} 个 + 未检查:{{ getUncheckCount() }} 个 +
+
+ + 建议先处理时间冲突的预约,或选择拒绝有冲突的申请 +
+
+
审核备注: