Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

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>

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: '可容纳人数',