Merge remote-tracking branch 'origin/master'

jiangping

2024-10-17 f693768b5840db7efc849d7855638ea9c7334b03

 admin/src/views/meeting/components/OperaBookingsWindow.vue

@@ -12,6 +12,7 @@
          v-model="form.roomId"
          filterable
          clearable
          :disabled="isEdit"
          placeholder="请选择关联会议室"
          @change="selectRoom"
        >
@@ -20,6 +21,7 @@
      </el-form-item>
      <el-form-item label="预定日期" prop="date">
        <el-date-picker
          :disabled="isEdit"
          v-model="form.date"
          value-format="yyyy-MM-dd"
          placeholder="请选择预定日期"
@@ -464,9 +466,9 @@
  .time-item {
    margin-right: 8px;
    margin-bottom: 8px;
    border: #111 solid 1px;
    border: #cccccc solid 1px;
    font-size: 14px;
    font-weight: 500;
    font-weight: 400;
    line-height: 14px;
    width: 124px;
    height: 36px;