From 67b80d76878404c8c02fad89fb05b977b794b22b Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Mon, 25 Aug 2025 17:00:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=A5=E9=A9=BB=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=85=A5=E9=A9=BB=E4=BD=8D=E7=BD=AE=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/property/resident/unit/model.d.ts |  1 +
 .../src/views/property/resident/unit/data.ts  |  2 +-
 .../property/resident/unit/unit-modal.vue     | 11 +++++++---
 .../conferenceReservationRecords/data.ts      | 22 +++++++++----------
 .../conferenceReservations/index.vue          | 10 ++++-----
 .../roomBooking/conferenceSettings/data.ts    |  2 +-
 6 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/apps/web-antd/src/api/property/resident/unit/model.d.ts b/apps/web-antd/src/api/property/resident/unit/model.d.ts
index 8ae348bf..259e2abe 100644
--- a/apps/web-antd/src/api/property/resident/unit/model.d.ts
+++ b/apps/web-antd/src/api/property/resident/unit/model.d.ts
@@ -35,6 +35,7 @@ export interface Resident_unitVO {
    * 入驻位置
    */
   location: string;
+  locations: string[];
 
   /**
    * 入驻时间
diff --git a/apps/web-antd/src/views/property/resident/unit/data.ts b/apps/web-antd/src/views/property/resident/unit/data.ts
index a7ac0cae..7e7358f9 100644
--- a/apps/web-antd/src/views/property/resident/unit/data.ts
+++ b/apps/web-antd/src/views/property/resident/unit/data.ts
@@ -157,7 +157,7 @@ export const modalSchema: FormSchemaGetter = () => [
   },
   {
     label: '入驻位置',
-    fieldName: 'location',
+    fieldName: 'locations',
     component: 'TreeSelect',
     rules: 'selectRequired',
     formItemClass: 'col-span-2'
diff --git a/apps/web-antd/src/views/property/resident/unit/unit-modal.vue b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue
index 3346c219..0d5d78a7 100644
--- a/apps/web-antd/src/views/property/resident/unit/unit-modal.vue
+++ b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue
@@ -64,7 +64,11 @@ const [BasicModal, modalApi] = useVbenModal({
     await initLocationOptions();
     if (isUpdate.value && id) {
       const record = await resident_unitInfo(id);
-      await formApi.setValues({...record,authTime:[record.authBegDate,record.authEndDate]});
+      let roomIds=record.location.split(',')
+      await formApi.setValues({...record,
+        authTime:[record.authBegDate,record.authEndDate],
+        locations:roomIds
+      });
     }
     await markInitialized();
 
@@ -84,7 +88,7 @@ async function handleConfirm() {
 
     data.authBegDate = data.authTime[0];
     data.authEndDate = data.authTime[1];
-
+    data.location=data.locations.join(',')
     await (isUpdate.value ? resident_unitUpdate(data) : resident_unitAdd(data));
     resetInitialized();
     emit('reload');
@@ -125,8 +129,9 @@ async function initLocationOptions() {
         treeNodeFilterProp: 'label',
         // 选中后显示在输入框的值
         treeNodeLabelProp: 'fullName',
+        multiple:true
       }),
-      fieldName: 'location',
+      fieldName: 'locations',
     },
   ]);
 }
diff --git a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts b/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts
index e21faef6..6fd44227 100644
--- a/apps/web-antd/src/views/property/roomBooking/conferenceReservationRecords/data.ts
+++ b/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;
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 69fea076..43574bb7 100644
--- a/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue
+++ b/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 >
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 1c829d53..866e5f5a 100644
--- a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
+++ b/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,