预约记录

apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/conferenceReservationRecords-detail.vue

@@ -34,18 +34,18 @@ async function handleOpenChange(open: boolean) {
 
 <template>
   <BasicModal :footer="false" :fullscreen-button="false" title="会议室预约记录信息" class="w-[70%]">
-    <Descriptions v-if="conferenceReservationRecordsDetail" size="small" :column="2" bordered :labelStyle="{width:'100px'}">
+    <Descriptions v-if="conferenceReservationRecordsDetail" size="small" :column="2" bordered :labelStyle="{width:'120px'}">
       <DescriptionsItem label="会议室名称">
         {{ conferenceReservationRecordsDetail.name}}
       </DescriptionsItem>
       <DescriptionsItem label="会议室地址">
-        {{ conferenceReservationRecordsDetail.meetLocation }}
+        {{ conferenceReservationRecordsDetail.locationName }}
       </DescriptionsItem>
       <DescriptionsItem label="所属单位">
-        {{ conferenceReservationRecordsDetail.unit }}
+        {{ conferenceReservationRecordsDetail.unitName }}
       </DescriptionsItem>
       <DescriptionsItem label="预定人">
-        {{ conferenceReservationRecordsDetail.person }}
+        {{ conferenceReservationRecordsDetail.personName }}
       </DescriptionsItem>
       <DescriptionsItem label="联系方式">
         {{ conferenceReservationRecordsDetail.phone }}

apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts

@@ -40,12 +40,12 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '所属单位',
-    field: 'unit',
+    field: 'unitName',
     minWidth:'120'
   },
   {
     title: '预定人',
-    field: 'person',
+    field: 'personName',
     minWidth:'120'
   },
   {
@@ -53,12 +53,28 @@ export const columns: VxeGridProps['columns'] = [
     field: 'phone',
     minWidth:'120'
   },
+  // {
+  //   title: '预定时间',
+  //   field: 'scheduledStarttime',
+  //   minWidth: '180',
+  //   formatter: ({ row }) => {
+  //     return `${row.scheduledStarttime} ~ ${row.scheduledEndtime}`;
+  //   },
+  // },
   {
     title: '预定时间',
     field: 'scheduledStarttime',
     minWidth: '180',
     formatter: ({ row }) => {
-      return `${row.scheduledStarttime} ~ ${row.scheduledEndtime}`;
+      const start = row.scheduledStarttime;
+      const end = row.scheduledEndtime;
+
+      const startDate = start.substring(0, 10);
+      const endDate = end.substring(0, 10);
+
+      const endDisplay = startDate === endDate ? end.substring(11) : end;
+
+      return `${start}-${endDisplay}`;
     },
   },
   {
@@ -103,7 +119,7 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '提交时间',
-    field: 'updateTime',
+    field: 'createTime',
     minWidth:'120'
   },
   {

apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/index.vue

@@ -8,6 +8,7 @@ import {
 } from '#/adapter/vxe-table';
 import {
   bookingList,
+  bookingUpdate,
 } from '#/api/property/roomBooking/conferenceReservationRecords';
 import { columns, querySchema } from './data';
 import conferenceReservationRecordsDetail
@@ -66,10 +67,14 @@ async function handleInfo(row: Required<BookingForm>) {
 }
 
 async function handleExamine(row: Required<BookingForm>) {
+  row.state = 2
+  await bookingUpdate(row);
   await tableApi.query();
 }
 
 async function handleUnsubscribe(row: Required<BookingForm>) {
+  row.state = 3
+  await bookingUpdate(row);
   await tableApi.query();
 }
 </script>
@@ -87,8 +92,9 @@ async function handleUnsubscribe(row: Required<BookingForm>) {
           <Popconfirm
             :get-popup-container="getVxePopupContainer"
             placement="left"
-            title="确认删除？"
+            title="确认通过？"
             @confirm="handleExamine(row)"
+            v-if="row.state === 0"
           >
             <ghost-button
               @click.stop=""
@@ -99,8 +105,9 @@ async function handleUnsubscribe(row: Required<BookingForm>) {
           <Popconfirm
             :get-popup-container="getVxePopupContainer"
             placement="left"
-            title="确认删除？"
+            title="确认退订？"
             @confirm="handleUnsubscribe(row)"
+            v-if="!(row.state === 2) && !(row.state === 3)"
           >
             <ghost-button
               @click.stop=""