diff --git a/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/index.ts b/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/index.ts index 3bf2a7bf..92c7e0b4 100644 --- a/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/index.ts +++ b/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/index.ts @@ -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>('/system/booking/list', { params }); + return requestClient.get>('/property/meetbooking/list', { params }); } /** @@ -30,7 +28,7 @@ export function bookingExport(params?: BookingQuery) { * @returns booking详情 */ export function bookingInfo(id: ID) { - return requestClient.get(`/system/booking/${id}`); + return requestClient.get(`/property/meetbooking/{id}`); } /** diff --git a/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/model.d.ts b/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/model.d.ts index 83a45ee4..b27f5d02 100644 --- a/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/model.d.ts +++ b/apps/web-antd/src/api/property/roomBooking/conferenceReservationRecords/model.d.ts @@ -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 { diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/conferenceReservationRecords-detail.vue b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/conferenceReservationRecords-detail.vue new file mode 100644 index 00000000..adee01c1 --- /dev/null +++ b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/conferenceReservationRecords-detail.vue @@ -0,0 +1,82 @@ + + + diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/conferenceReservationRecords-modal.vue b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/conferenceReservationRecords-modal.vue deleted file mode 100644 index a35647e5..00000000 --- a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/conferenceReservationRecords-modal.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts index 4d739609..eecef5a5 100644 --- a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts +++ b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts @@ -33,7 +33,6 @@ export const querySchema: FormSchemaGetter = () => [ ]; export const columns: VxeGridProps['columns'] = [ - { type: 'checkbox', width: 60 }, { title: '会议室名称', field: 'name', @@ -60,14 +59,12 @@ export const columns: VxeGridProps['columns'] = [ minWidth:'120' }, { - title: '预定开始时间', + title: '预定时间', field: 'scheduledStarttime', - minWidth:'120' - }, - { - title: '预定结束时间', - field: 'scheduledEndtime', - minWidth:'120' + minWidth: '180', + formatter: ({ row }) => { + return `${row.scheduledStarttime} ~ ${row.scheduledEndtime}`; + }, }, { title: '参会人数', @@ -82,6 +79,11 @@ export const columns: VxeGridProps['columns'] = [ { title: '是否有增值服务', field: 'attach', + slots: { + default: ({ row }) => { + return renderDict(row.attach, 'pro_add_service'); + }, + }, minWidth:'120' }, { @@ -209,7 +211,6 @@ export const modalSchema: FormSchemaGetter = () => [ fieldName: 'payState', component: 'Select', componentProps: { - // 可选从DictEnum中获取 DictEnum.PRO_CHARGING_STATUS 便于维护 options: getDictOptions('pro_charging_status'), }, rules: 'selectRequired', @@ -219,7 +220,6 @@ export const modalSchema: FormSchemaGetter = () => [ fieldName: 'state', component: 'Select', componentProps: { - // 可选从DictEnum中获取 DictEnum.WY_YYZT 便于维护 options: getDictOptions('wy_yyzt'), }, rules: 'selectRequired', diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/index.vue b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/index.vue index 564ee8db..77b31564 100644 --- a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/index.vue +++ b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/index.vue @@ -1,21 +1,18 @@ diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts index 2cf22cce..339a688a 100644 --- a/apps/web-antd/vite.config.mts +++ b/apps/web-antd/vite.config.mts @@ -27,7 +27,7 @@ export default defineConfig(async () => { changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, ''), // mock代理目标地址 - target: 'http://192.168.0.103:8080', + target: 'http://192.168.0.108:8080', // target: 'http://192.168.0.106:8080', // target: 'http://47.109.37.87:3010', ws: true,