feat:入驻单位入驻位置多选

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

@@ -43,16 +43,16 @@ export const columns: VxeGridProps['columns'] = [
     field: 'unitName',
     minWidth:'120'
   },
-  {
-    title: '预定人',
-    field: 'personName',
-    minWidth:'120'
-  },
-  {
-    title: '联系方式',
-    field: 'phone',
-    minWidth:'120'
-  },
+  // {
+  //   title: '预定人',
+  //   field: 'personName',
+  //   minWidth:'120'
+  // },
+  // {
+  //   title: '联系方式',
+  //   field: 'phone',
+  //   minWidth:'120'
+  // },
   // {
   //   title: '预定时间',
   //   field: 'scheduledStarttime',
@@ -64,7 +64,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '预定时间',
     field: 'scheduledStarttime',
-    minWidth: '180',
+    minWidth: '200',
     formatter: ({ row }) => {
       const start = row.scheduledStarttime;
       const end = row.scheduledEndtime;

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

@@ -10,8 +10,8 @@
         <Select
           v-model:value="formState.meetingRoomType"
           class="room-select"
-          placeholder="请选择会议室类型"
-          style="width: 180px;"
+          placeholder="请选择类型"
+          style="width: 150px;"
         >
           <SelectOption
             v-for="item in getDictOptions('meeting_room_type')"
@@ -23,14 +23,14 @@
         </Select>
       </a-form-item>
       <a-form-item label="会议日期">
-        <DatePicker v-model:value="formState.appointmentTime" style="width: 180px;"/>
+        <DatePicker v-model:value="formState.appointmentTime" style="width: 130px;"/>
       </a-form-item>
       <a-form-item label="会议时段">
-        <TimeRangePicker style="width: 200px;" format="HH:mm"
+        <TimeRangePicker style="width: 190px;" format="HH:mm"
                          v-model:value="formState.openHours"></TimeRangePicker>
       </a-form-item>
       <a-form-item label="参会人数">
-        <InputNumber style="width: 150px;" placeholder="请输入参会人数"
+        <InputNumber style="width: 120px;" placeholder="请输入人数"
                      v-model:value="formState.personNumber"/>
       </a-form-item>
       <a-form-item >

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

@@ -42,7 +42,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'meetingRoomType',
     slots: {
       default: ({row}) => {
-        return renderDict(row.meetingRoomType, 'meeting_room_type');
+        return row.meetingRoomType!=null?renderDict(row.meetingRoomType, 'meeting_room_type'):'';
       },
     },
     minWidth:100,