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

2025-07-23 20:55:53 +08:00
parent f6da015fb7 9d75dd2168
commit 189d5ccd14
19 changed files with 1050 additions and 151 deletions
--- a/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceReservations/index.vue
@@ -20,7 +20,7 @@
      <a-form-item class="form-button">
        <a-button @click="handleClean">重置</a-button>
        <a-button type="primary" class="primary-button"
-                  :disabled="!formState.appointmentTime||!formState.openHours||!formState.personNumber"
+                  :disabled="!formState.appointmentTime||!(formState.openHours&&formState.openHours.length)||!formState.personNumber"
                  @click="handleSearch">搜索</a-button>
      </a-form-item>
    </a-form>
--- a/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/conferenceSettings/data.ts
@@ -37,9 +37,14 @@ export const columns: VxeGridProps['columns'] = [
    field: 'name',
    minWidth:100,
  },
+  // {
+  //   title: '会议室地址',
+  //   field: 'locationName',
+  //   width:210,
+  // },
  {
-    title: '会议室地址',
-    field: 'locationName',
+    title: '配套设备',
+    field: 'baseService',
    width:210,
  },
  {