diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts index f2428646..3e5d020d 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts @@ -2,8 +2,6 @@ import type {FormSchemaGetter} from '#/adapter/form'; import type {VxeGridProps} from '#/adapter/vxe-table'; import {renderDict} from "#/utils/render"; import {getDictOptions} from "#/utils/dict"; -import {h} from "vue"; -import {Rate} from "ant-design-vue"; export const querySchema: FormSchemaGetter = () => [ { @@ -96,34 +94,34 @@ export const columns: VxeGridProps['columns'] = [ // field: 'planCompleTime', // width: 100, // }, - { - title: '完成时间', - field: 'compleTime', - width: 100, - }, - { - title: '评价', - field: 'serviceEvalua', - width: 180, - slots: { - default: ({row}) => { - return h(Rate, { - value: row.serviceEvalua || 0, - disabled: true, - }); - }, - }, - }, - { - title: '是否超时', - field: 'isTimeOut', - width: 100, - slots: { - default: ({row}) => { - return row.isTimeOut ? renderDict(row.isTimeOut, 'wy_sf') : ''; - }, - }, - }, + // { + // title: '完成时间', + // field: 'compleTime', + // width: 100, + // }, + // { + // title: '评价', + // field: 'serviceEvalua', + // width: 180, + // slots: { + // default: ({row}) => { + // return h(Rate, { + // value: row.serviceEvalua || 0, + // disabled: true, + // }); + // }, + // }, + // }, + // { + // title: '是否超时', + // field: 'isTimeOut', + // width: 100, + // slots: { + // default: ({row}) => { + // return row.isTimeOut ? renderDict(row.isTimeOut, 'wy_sf') : ''; + // }, + // }, + // }, { title: '创建时间', field: 'createTime', diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue index 6a53cfa8..85309d52 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue @@ -47,7 +47,7 @@ async function handleOpenChange(open: boolean) { try { if (orderDetail.value.orderImgUrl) { const res = await ossInfo([orderDetail.value.orderImgUrl]); - let imgUrls = []; + let imgUrls = [] as string[]; res.forEach(item => { imgUrls.push(item.url) }) @@ -55,7 +55,7 @@ async function handleOpenChange(open: boolean) { } if (orderDetail.value.imgUrl) { const res = await ossInfo([orderDetail.value.imgUrl]); - let imgUrls = []; + let imgUrls = [] as string[]; res.forEach(item => { imgUrls.push(item.url) }) @@ -106,7 +106,6 @@ async function handleOpenChange(open: boolean) { - {{ orderDetail.remark }} diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue b/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue index 43574bb7..e0466038 100644 --- a/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue +++ b/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue @@ -13,6 +13,11 @@ placeholder="请选择类型" style="width: 150px;" > + + 全部类型 + {{ item.label }} + @@ -113,7 +119,7 @@ async function handleSearch() { openStartHours: openStartHours??undefined, openEndHours:openEndHours??undefined, appointmentTime:formState.appointmentTime?formState.appointmentTime.format('YYYY-MM-DD'):undefined, - meetingRoomType:formState.meetingRoomType + meetingRoomType:formState.meetingRoomType=='all'?undefined:formState.meetingRoomType, } meetingList.value =await notlist(obj); }