From 3b51a615edc234c0de8a0b1f0328c3268881be71 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Thu, 31 Jul 2025 15:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conferenceSettings-detail.vue             |  5 +++++
 .../roomBooking/conferenceSettings/data.ts    | 20 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue
index 66fbbb68..256eb696 100644
--- a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/conferenceSettings-detail.vue
@@ -39,6 +39,11 @@ async function handleOpenChange(open: boolean) {
       <DescriptionsItem label="会议室名称">
         {{ conferenceSettingsDetail.name }}
       </DescriptionsItem>
+      <DescriptionsItem label="会议室类型">
+        <component
+          :is="renderDict(conferenceSettingsDetail.meetingRoomType,'meeting_room_type')"
+        />
+      </DescriptionsItem>
       <DescriptionsItem label="可容纳人数">
         {{ conferenceSettingsDetail.personNumber }}
       </DescriptionsItem>
diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
index c569d228..b4fba655 100644
--- a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
@@ -37,6 +37,16 @@ export const columns: VxeGridProps['columns'] = [
     field: 'name',
     minWidth:100,
   },
+  {
+    title: '会议室类型',
+    field: 'meetingRoomType',
+    slots: {
+      default: ({row}) => {
+        return renderDict(row.meetingRoomType, 'meeting_room_type');
+      },
+    },
+    minWidth:100,
+  },
   // {
   //   title: '会议室地址',
   //   field: 'locationName',
@@ -99,7 +109,15 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'name',
     component: 'Input',
     rules: 'required',
-    formItemClass: 'col-span-1',
+  },
+  {
+    label: '会议室类型',
+    fieldName: 'meetingRoomType',
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions('meeting_room_type'),
+    },
+    rules: 'selectRequired',
   },
   {
     label: '可容纳人数',