会议预约功能模块完成

src/api/business/meeting.js

@@ -0,0 +1,247 @@
+import { request } from "@/utils/request";
+
+// 首页统计
+export function FirstPageStatistic(data) {
+    return request({
+        url: '/service-meeting/meetingRoom/FirstPageStatistic',
+        method: 'GET',
+        params: data
+    })
+}
+
+// 会议室列表
+export function dmMeetingRoomList(data) {
+    return request({
+        url: '/service-meeting/meetingRoom/dmMeetingRoomList',
+        method: 'POST',
+        data: data
+    })
+}
+
+// 会议室下拉列表
+export function MeetingRoomList(data) {
+    return request({
+        url: '/service-meeting/meetingRoom/MeetingRoomList',
+        method: 'GET',
+        params: data
+    })
+}
+
+
+
+/**
+ * 楼层管理api接口集合
+ * @method Select 列表
+ * @method Insert 新增
+ * @method Update 修改
+ * @method Delete 删除
+ */
+export function floorApi() {
+    return {
+        Select: (data) => {
+            return request({
+                url: '/service-meeting/meetingFloor/meetingFloorList',
+                method: 'POST',
+                data,
+            });
+        },
+        Insert: (data) => {
+            return request({
+                url: '/service-meeting/meetingFloor',
+                method: 'POST',
+                data
+            });
+        },
+        Update: (data) => {
+            return request({
+                url: '/service-meeting/meetingFloor',
+                method: 'PUT',
+                data
+            });
+        },
+        Delete: (data) => {
+            return request({
+                url: '/service-meeting/meetingFloor?floorId=' + data,
+                method: 'DELETE',
+            });
+        },
+    };
+}
+
+/**
+ * 设备管理api接口集合
+ * @method Select 列表
+ * @method Insert 新增
+ * @method Update 修改
+ * @method Delete 删除
+ */
+export function deviceApi() {
+    return {
+        Select: (data) => {
+            return request({
+                url: '/service-meeting/meetingDevice/meetingDeviceList',
+                method: 'POST',
+                data,
+            });
+        },
+        Insert: (data) => {
+            return request({
+                url: '/service-meeting/meetingDevice',
+                method: 'POST',
+                data
+            });
+        },
+        Update: (data) => {
+            return request({
+                url: '/service-meeting/meetingDevice',
+                method: 'PUT',
+                data
+            });
+        },
+        Delete: (data) => {
+            return request({
+                url: '/service-meeting/meetingDevice?deviceId=' + data,
+                method: 'DELETE',
+            });
+        },
+    };
+}
+
+
+/**
+ * 会议室管理api接口集合
+ * @method Select 列表
+ * @method Insert 新增
+ * @method Update 修改
+ * @method Delete 删除
+ */
+export function roomApi() {
+    return {
+        Select: (data) => {
+            return request({
+                url: '/service-meeting/meetingRoom/dmMeetingRoomList',
+                method: 'POST',
+                data,
+            });
+        },
+        Insert: (data) => {
+            return request({
+                url: '/service-meeting/meetingRoom',
+                method: 'POST',
+                data
+            });
+        },
+        Update: (data) => {
+            return request({
+                url: '/service-meeting/meetingRoom',
+                method: 'PUT',
+                data
+            });
+        },
+        Delete: (data) => {
+            return request({
+                url: '/service-meeting/meetingRoom?roomId=' + data,
+                method: 'DELETE',
+            });
+        },
+    };
+}
+
+//会议室详情
+export function meetingRoomDetails(data) {
+    return request({
+        url: '/service-meeting/meetingRoom/meetingRoomDetails',
+        method: 'GET',
+        params: data
+    })
+}
+
+//会议室预约情况列表
+export function MeetingRoomReservationList(data) {
+    return request({
+        url: '/service-meeting/meetingRoom/getMeetingRoomReservationList',
+        method: 'POST',
+        data: data
+    })
+}
+
+//会议室预约-新增会议
+export function meetingInfoAdd(data) {
+    return request({
+        url: '/service-meeting/meetingInfo/add',
+        method: 'POST',
+        data
+    })
+}
+
+/**
+ * 会议室记录api接口集合
+ * @method Select 列表
+ * @method Cancel 取消
+ */
+export function recordApi() {
+    return {
+        Select: (data) => {
+            return request({
+                url: '/service-meeting/meetingInfo/meetingInfoList',
+                method: 'POST',
+                data,
+            });
+        },
+        Cancel: (data) => {
+            return request({
+                url: '/service-meeting/meetingInfo/cancel?meetingId=' + data,
+                method: 'POST',
+            });
+        },
+    };
+}
+
+/**
+ * 我的会议api接口集合
+ * @method Select 列表
+ * @method SignList 人员签到-列表
+ * @method InsertFile 会议文件-添加
+ * @method SelectFile 会议文件-列表
+ */
+export function myApi() {
+    return {
+        Select: (data) => {
+            return request({
+                url: '/service-meeting/meetingInfo/myMeetingList',
+                method: 'POST',
+                data,
+            });
+        },
+        SignList: (data) => {
+            return request({
+                url: '/service-meeting/meetingInfo/meetingSignList',
+                method: 'GET',
+                params: data
+            });
+        },
+        InsertFile: (data) => {
+            return request({
+                url: '/service-meeting/meetingFile/insertMeetingFile',
+                method: 'POST',
+                data,
+            });
+        },
+        SelectFile: (data) => {
+            return request({
+                url: '/service-meeting/meetingFile/meetingFileList',
+                method: 'POST',
+                data,
+            });
+        },
+    };
+}
+
+//人员签到-人员签退
+export function signOnOut(data) {
+    return request({
+        url: '/service-meeting/meetingInfo/signOnOut',
+        method: 'POST',
+        data
+    })
+}

src/pages.json

@@ -65,6 +65,18 @@
                     "titleNView": false
                 }
             }
+        },
+        {
+            "path": "pages/common/face/index",
+            "style": {
+                "navigationBarTitleText": "人脸识别",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
+            }
         }
     ],
     "subPackages": [
@@ -160,18 +172,6 @@
                             "titleNView": false
                         }
                     }
-                },
-                {
-                    "path": "face/index",
-                    "style": {
-                        "navigationBarTitleText": "人脸识别",
-                        "enablePullDownRefresh": false,
-                        "navigationStyle": "custom",
-                        "app-plus": {
-                            "bounce": "none",
-                            "titleNView": false
-                        }
-                    }
                 }
             ]
         },
@@ -745,6 +745,30 @@
                             "titleNView": false
                         }
                     }
+                },
+                {
+                    "path": "meeting/index",
+                    "style": {
+                        "navigationBarTitleText": "会议预约",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
+                },
+                {
+                    "path": "meeting/new/index",
+                    "style": {
+                        "navigationBarTitleText": "新建日程",
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
+                    }
                 }
             ]
         }

src/pages/business/common/meeting/components/avatarList.vue

@@ -0,0 +1,79 @@
+<template>
+  <view class="flex flex-wrap">
+    <view class="mr10 mb10" v-for="(user, index) in userList" :key="index" @click="deleteUsers(index)">
+      <u-avatar
+        class="avatar"
+        :src="user.avatar ? user.avatar : '/static/images/404.png'"
+        shape="square"
+        size="40"
+        fontSize="12"
+        color="#ffffff"
+        :bgColor="$settingStore.themeColor.color"
+        v-if="user.avatar"
+      ></u-avatar>
+      <u-avatar
+        class="avatar"
+        :text="user.label.length > 2 ? user.label.slice(1, 3) : user.label"
+        shape="square"
+        size="40"
+        fontSize="12"
+        color="#ffffff"
+        :bgColor="$settingStore.themeColor.color"
+        v-else
+      ></u-avatar>
+      <view class="font12 text-center mt5">{{ user.label }}</view>
+    </view>
+  </view>
+</template>
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, commonStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const commonStore = commonStores();
+/*----------------------------------变量声明-----------------------------------*/
+const emit = defineEmits(["deleteUsers"]);
+const props = defineProps({
+  userList: {
+    type: Object,
+    default: [],
+  },
+});
+
+const { userList } = toRefs(props);
+
+/** 删除回调事件 */
+function deleteUsers(index) {
+  emit("deleteUsers", index);
+}
+</script>
+<style lang="scss" scoped>
+.avatar {
+  position: relative;
+
+  &::after {
+    position: absolute;
+    content: "✖";
+    display: inline-block;
+    padding: 2px 4px;
+    border-radius: 100%;
+    cursor: pointer;
+    font-size: 8px;
+    text-align: center;
+    background-color: #ccc;
+    color: #fff;
+    top: -5px;
+    right: -5px;
+  }
+
+  &::after:hover {
+    background-color: #ccc;
+  }
+}
+</style>

src/pages/business/common/meeting/components/timeSlot.vue

@@ -0,0 +1,208 @@
+<template>
+  <view>
+    <view class="axis" :style="{ backgroundColor: this.defaultColor }">
+      <view class="leftLine" :style="leftTimeStyle"></view>
+      <view class="line" v-for="item in disArr" :key="item" :style="item"></view>
+      <view class="kedu">
+        <view class="kedu-line" v-for="num in 24" :key="num"></view>
+      </view>
+    </view>
+    <view class="nums">
+      <view class="num" v-for="num in nums" :key="num">
+        {{ num }}
+      </view>
+    </view>
+    <view class="tip">
+      <view class="tip-block">
+        <view class="tip-color" :style="{ backgroundColor: this.activeColor }"> </view>
+        <view class="tip-text"> 已预约 </view>
+      </view>
+      <view class="tip-block">
+        <view class="tip-color" :style="{ backgroundColor: this.defaultColor, border: `1px ${this.leftColor} solid` }"> </view>
+        <view class="tip-text"> 可预约 </view>
+      </view>
+      <view class="tip-block">
+        <view class="tip-color" :style="{ backgroundColor: this.leftColor }"> </view>
+        <view class="tip-text"> 不可预约 </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "time-slot",
+  props: {
+    leftColor: {
+      type: String,
+      default: "#CAD1CE",
+    }, //不可预约颜色
+    activeColor: {
+      type: String,
+      default: "#149eff",
+    }, //已预约颜色
+    defaultColor: {
+      type: String,
+      default: "#FFFFFF",
+    }, //可预约颜色
+    currentDay: {
+      type: String,
+      default: "",
+    }, //当前时间
+    startDateKey: {
+      type: String,
+      default: "startDate",
+    }, //开始时间key
+    endDateKey: {
+      type: String,
+      default: "endDate",
+    }, //结束时间key
+    aboutTimeData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    }, //预约时间集合
+  },
+  data() {
+    return {
+      nums: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24],
+    };
+  },
+  computed: {
+    curDay() {
+      return this.currentDay ? this.currentDay : this.getCurrentDay();
+    },
+    disArr() {
+      const zeroTime = this.get_unix_time(this.curDay + " 00:00:00");
+      return this.aboutTimeData.map((e) => {
+        const leftWidth = this.get_unix_time(e[this.startDateKey].indexOf("T") != -1 ? e[this.startDateKey].replace("T", " ") : e[this.startDateKey]) - zeroTime;
+        const owerWidth = this.get_unix_time(e[this.endDateKey].indexOf("T") != -1 ? e[this.endDateKey].replace("T", " ") : e[this.endDateKey]) - zeroTime - leftWidth;
+        return {
+          left: leftWidth / 864 + "%",
+          width: owerWidth / 864 + "%",
+          backgroundColor: this.activeColor,
+        };
+      });
+    },
+    leftTimeStyle() {
+      var owerWidth = (new Date().getTime().toString().substr(0, 10) - this.get_unix_time(this.curDay + " 00:00:00")) / 864;
+      var newWidth = 0;
+
+      if (owerWidth >= 100) {
+        newWidth = 100;
+      } else if (owerWidth <= 0) {
+        newWidth = 0;
+      } else {
+        newWidth = owerWidth;
+      }
+
+      return {
+        left: 0,
+        width: newWidth + "%",
+        backgroundColor: this.leftColor,
+      };
+    },
+  },
+  methods: {
+    get_unix_time(dateStr) {
+      var newstr = dateStr.replace(/-/g, "/");
+      var date = new Date(newstr);
+      var time_str = date.getTime().toString();
+      return time_str.substr(0, 10);
+    },
+    getCurrentDay() {
+      const strFormat = (str) => {
+        return str < 10 ? `0${str}` : str;
+      };
+      const myDate = new Date();
+      const y = myDate.getFullYear();
+      const m = myDate.getMonth() + 1;
+      const d = myDate.getDate();
+      return y + "-" + strFormat(m) + "-" + strFormat(d);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.axis {
+  position: relative;
+  width: 100%;
+  height: 20rpx;
+  background-color: #fff;
+  border: 1px #cad1ce solid;
+  margin-bottom: 5px;
+  .line {
+    position: absolute;
+    height: 20rpx;
+    width: 200rpx;
+    top: 0;
+    left: 50%;
+    background-color: #31b179;
+    z-index: 3;
+  }
+  .leftLine {
+    position: absolute;
+    height: 20rpx;
+    width: 200rpx;
+    max-width: 100%;
+    top: 0;
+    left: 50%;
+    background-color: #cad1ce;
+    z-index: 2;
+  }
+}
+
+.kedu {
+  display: flex;
+  position: absolute;
+  align-items: flex-end;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+  z-index: 4;
+  .kedu-line {
+    width: 4.16666%;
+    height: 6rpx;
+    border-right: 1px solid #333333;
+  }
+  .kedu-line:nth-child(2n) {
+    height: 12rpx;
+  }
+  .kedu-line:last-child {
+    border-right: 0;
+  }
+}
+.nums {
+  width: 108.2%;
+  display: flex;
+  margin-left: -4.16666%;
+  .num {
+    width: 8.2%;
+    font-size: 14rpx;
+    text-align: center;
+  }
+}
+.tip {
+  display: flex;
+  .tip-block {
+    display: flex;
+    align-items: center;
+    padding: 10rpx;
+    justify-content: center;
+
+    .tip-color {
+      width: 20rpx;
+      height: 20rpx;
+    }
+    .tip-text {
+      margin-left: 10rpx;
+      font-size: 22rpx;
+      font-family: Adobe Heiti Std;
+      font-weight: normal;
+      color: #999999;
+    }
+  }
+}
+</style>

src/pages/business/common/meeting/index.vue

@@ -0,0 +1,383 @@
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="会议预约" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+        </view>
+      </template>
+      <template #right>
+        <view class="u-navbar__content__right__item">
+          <u-icon name="more-dot-fill" size="19" color="#000"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
+    <view class="flex plr10">
+      <u--input
+        style="width: 100%"
+        v-model="form.meetingRoomName"
+        placeholder="搜索会议室"
+        prefixIcon="search"
+        prefixIconStyle="font-size: 22px;color: #909399"
+        customStyle="height:35px;background-color:#f5f6fa; "
+        @confirm="init()"
+        clearable
+      ></u--input>
+    </view>
+
+    <view class="flex plr10" style="line-height: 20px">
+      <view class="flex mtb-auto ptb10 nav" style="overflow-x: auto" @click="handlePopup(true, 'switchTime', {})">
+        <view
+          class="radius p5 mr10"
+          :style="{
+            color: proxy.$settingStore.themeColor.color,
+            backgroundColor: `${proxy.$settingStore.themeColor.color}30`,
+          }"
+        >
+          {{ proxy.$dayjs(form.date).format("MM月DD日") }}
+          {{ weekData[proxy.$dayjs(form.date).format("d")] }}
+        </view>
+      </view>
+      <view class="ml-auto mtb-auto pl10 nav" :style="{ color: proxy.$settingStore.themeColor.color }">重置</view>
+    </view>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="record-container scroll-height"
+    :isSticky="true"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (44px + 35px + 50px + ${proxy.$settingStore.StatusBarHeight}))`,
+      //#endif
+      //#ifdef H5
+      height: 'calc(100vh - (44px + 35px + 50px))',
+      //#endif
+    }"
+    :pageSize="pageSize"
+    :total="total"
+    :refresherLoad="false"
+    :refresherEnabled="true"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    @refresh="refresh"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
+      <view class="content-area bg-white radius flex flex-wrap m10 p10" v-for="room in dataList" :key="room" @click="handlePopup(true, 'aboutMeeting', room)">
+        <view class="mr10 mtb-auto">
+          <u-image v-if="room.imgPath" :show-loading="true" :src="room.imgPath" width="50px" height="50px" radius="5px"></u-image>
+          <u-image v-else :show-loading="true" src="@/static/images/defaultImg.jpg" width="50px" height="50px" radius="5px"></u-image>
+        </view>
+        <view class="mtb-auto">
+          <view class="font16 text-black mb5">{{ room.roomName }}</view>
+          <view class="font12 text-gray">可容纳{{ room.capacity || 0 }}人</view>
+        </view>
+        <view class="mt10" style="width: 100%">
+          <timeSlot :currentDay="form.date" :aboutTimeData="room.dmMeetingList" :activeColor="proxy.$settingStore.themeColor.color" />
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+
+  <u-popup :show="popup.show" mode="bottom" bgColor="#fff" :round="10" @close="popup.show = false">
+    <view
+      :style="{
+        borderTopLeftRadius: '10px',
+        borderTopRightRadius: '10px',
+        overflow: 'hidden',
+      }"
+    >
+      <oa-calendar v-if="popup.type === 'switchTime'" :date="form.date" :showMonth="true" @change="calendarChange" @monthSwitch="calendarMonthSwitch">
+        <template #headerRight> </template>
+      </oa-calendar>
+
+      <view v-if="popup.type === 'aboutMeeting'">
+        <view class="flex p15 font16">
+          <view class="mtb-auto"> {{ popup.list.roomName }}</view>
+          <view class="mtb-auto ml-auto" @click="sheet.show = true">
+            <u-icon name="info-circle" size="16" label="更多" labelSize="14" labelColor="#333" color="#333"></u-icon>
+          </view>
+        </view>
+
+        <u-gap height="10" bgColor="#f5f6f7"></u-gap>
+        <u-checkbox-group v-model="checkboxValue" placement="column" shape="circle" :borderBottom="true" @change="checkboxChange" style="height: 42vh; overflow: auto">
+          <view v-for="(item, index) in checkboxList" :key="index">
+            <u-checkbox
+              :customStyle="{ padding: '15px', margin: '0', backgroundColor: `${item.isDisabledColor}30` }"
+              :label="item.timeSlot"
+              :name="item.startTime"
+              :disabled="item.isDisabled || item.isAbout === '已预约'"
+              :activeColor="proxy.$settingStore.themeColor.color"
+            >
+              <template #label>
+                <view class="font15 mtb-auto" :style="{ color: item.isDisabled || item.isAbout === '已预约' ? '#c8c9cc' : '#333333' }"> {{ item.timeSlot }}</view>
+                <view class="font15 mtb-auto ml-auto" :style="{ color: item.isDisabled || item.isAbout === '已预约' ? '#c8c9cc' : '#333333' }"> {{ item.isAbout }}</view>
+              </template>
+            </u-checkbox>
+          </view>
+        </u-checkbox-group>
+
+        <u-gap height="10" bgColor="#f5f6f7"></u-gap>
+
+        <view class="p10" style="overflow: hidden">
+          <u-button type="primary" @click="handleSubmit('下一步')" text="下一步" style="width: 100px; float: right"></u-button>
+        </view>
+      </view>
+    </view>
+  </u-popup>
+
+  <u-action-sheet
+    :actions="sheet.actions"
+    :show="sheet.show"
+    cancelText="取消"
+    :round="10"
+    :wrapMaxHeight="'50vh'"
+    :closeOnClickOverlay="true"
+    :safeAreaInsetBottom="true"
+    @close="sheet.show = false"
+    @select="handleSheet"
+  ></u-action-sheet>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { MeetingRoomList, MeetingRoomReservationList } from "@/api/business/meeting.js";
+/*----------------------------------组件引入-----------------------------------*/
+import timeSlot from "./components/timeSlot.vue";
+/*----------------------------------store引入-----------------------------------*/
+import { useStores, systemStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+import { storageSystem } from "@/utils/storage"; // 公共方法引用
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const useStore = useStores();
+const systemStore = systemStores();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  loading: false,
+  dataList: [],
+  pageSize: 20,
+  total: 0,
+  form: {
+    date: proxy.$dayjs().format("YYYY-MM-DD"),
+    meetingRoomName: "",
+  },
+  popup: {
+    show: false,
+    type: "",
+    list: {},
+  },
+  sheet: {
+    show: false,
+    title: "",
+    actions: [
+      {
+        name: "更多",
+        fontSize: "16",
+        disabled: true,
+      },
+      {
+        name: "会议室详情",
+        fontSize: "16",
+        type: "meeting-details",
+      },
+    ],
+  },
+  weekData: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+  checkboxValue: [],
+  checkboxList: [],
+});
+
+const { loading, dataList, pageSize, total, form, popup, sheet, weekData, checkboxValue, checkboxList } = toRefs(state);
+
+/** 初始化 */
+function init() {
+  state.checkboxValue = [];
+  state.checkboxList = [];
+
+  state.loading = true;
+  MeetingRoomReservationList({
+    date: state.form.date + " 00:00:00",
+    meetingRoomName: state.form.meetingRoomName,
+  })
+    .then((requset) => {
+      if (requset.status === "SUCCESS") {
+        state.dataList = requset.data;
+        state.total = requset.data.length;
+        state.loading = false;
+      }
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+
+  state.checkboxList = getAllTimesDay(state.form.date, 30);
+}
+
+/** 获取当天时间 */
+function getAllTimesDay(day, min) {
+  let defaultList = [];
+  // 获取当天开始的时间
+  const startOfDay = proxy.$dayjs(day).startOf("day");
+  const endOfDay = proxy.$dayjs(day).endOf("day");
+
+  // 循环半小时直到当天结束
+  for (let currentTime = startOfDay; currentTime.isBefore(endOfDay); currentTime = currentTime.add(min, "minute")) {
+    let isAfter = currentTime.add(min, "minute").isAfter(endOfDay); //当前时间是否在结束时间之后（true|false）
+    let startTime = currentTime.add(0, "minute").format("YYYY-MM-DD HH:mm:ss"); //获取开始时间
+    let endTime = isAfter ? endOfDay.format("YYYY-MM-DD HH:mm:ss") : currentTime.add(min, "minute").format("YYYY-MM-DD HH:mm:ss"); //获取结束时间
+    let timeSlot = proxy.$dayjs(startTime).format("HH:mm") + " - " + proxy.$dayjs(endTime).format("HH:mm"); //获取开始时间和结束时间“时、分”
+
+    const array = {
+      startTime: startTime,
+      endTime: endTime,
+      timeSlot: timeSlot,
+      isDisabled: false,
+      isAbout: "",
+      isDisabledColor: "#FFFFFF",
+      isDisabledFontColor: "#333333",
+    }; //此返回值（不可删除）可叠加
+
+    //判断当前时间是否相同或在其之后
+    if (proxy.$dayjs().isSameOrAfter(startTime)) {
+      array.isAbout = "不可预约";
+      array.isDisabled = true;
+    }
+
+    defaultList.push(array);
+  }
+  return defaultList;
+}
+
+/** 复选框改变事件 */
+function checkboxChange(e, index) {
+  if (e.length > 1) {
+    const startOfDay = proxy.$dayjs(e[0]);
+    const endOfDay = proxy.$dayjs(e[e.length - 1]);
+
+    for (let currentTime = startOfDay; currentTime.isBefore(endOfDay); currentTime = currentTime.add(30, "minute")) {
+      if (!e.includes(currentTime.format("YYYY-MM-DD HH:mm:ss"))) {
+        e.push(currentTime.format("YYYY-MM-DD HH:mm:ss"));
+      }
+    }
+  }
+
+  state.checkboxValue = e.sort((a, b) => new Date(`${proxy.$dayjs(a).format("YYYY-MM-DD HH:mm:ss")}`) - new Date(`${proxy.$dayjs(b).format("YYYY-MM-DD HH:mm:ss")}`));
+}
+
+/** 点击预约 */
+function handleSubmit() {
+  if (!state.checkboxValue.length) {
+    proxy.$modal.msg("请先选择时间");
+    return false;
+  }
+
+  systemStore.meetingList.form = {
+    roomId: state.popup.list.roomId, //房间Id
+    roomName: state.popup.list.roomName, //会议室名称
+    startDate: state.checkboxValue[0], //会议开始时间
+    endDate: state.checkboxValue[state.checkboxValue.length - 1], //会议结束时间
+    meetingName: useStore.nickName + "预约的会议", //会议名称
+    initiatorUser: {
+      contacts: useStore.phonenumber, //联系方式
+      deptId: useStore.deptId,
+      email: useStore.email,
+      id: useStore.userId,
+      isApprover: false,
+      name: useStore.nickName, //验证人名称
+      sex: useStore.sex,
+    }, //发起人信息
+    meetingDescribe: "", //会议介绍
+    users: [], //参会人信息
+    meetingMode: 0, //会议模式
+    sendType: ["站内信"], //通知类型(短信)
+    remark: "", //备注
+    room: state.popup.list, //会议室信息
+    meetingFileList: [], //会议文件信息
+  };
+
+  proxy.$tab.navigateTo(`/pages/business/common/meeting/new/index`);
+  state.popup.show = false;
+}
+
+/** 实时保存填写数据 */
+function realTimeSaving() {
+  if (!state.form.id) {
+    state.saveTime = proxy.$time.formatterDate(new Date(), "hh:mm");
+    storageSystem.set("project", state);
+  }
+}
+
+/** 日历日期改变事件 */
+function calendarChange(e) {
+  state.form.date = e.fulldate;
+  init();
+}
+
+/** 日历月份选择事件 */
+function calendarMonthSwitch(e) {
+  console.log(e);
+}
+
+/** 操作菜单 */
+function handleSheet(e) {
+  console.log(e);
+  if (e.type == "meeting-details") {
+  }
+}
+
+/** 操作弹窗 */
+function handlePopup(show, type, list) {
+  state.popup.show = show;
+  state.popup.type = type;
+  state.popup.list = list;
+
+  if (type === "aboutMeeting") {
+    list.dmMeetingList.forEach((e) => {
+      let startTime = proxy.$dayjs(e.startDate).add(0, "minute").format("YYYY-MM-DD HH:mm:ss");
+      let endTimeNum = e.endDate.indexOf("59") != -1 ? -29.59 : -30;
+      let endTime = proxy.$dayjs(e.endDate).add(endTimeNum, "minute").format("YYYY-MM-DD HH:mm:ss");
+
+      state.checkboxList.forEach((f) => {
+        if (proxy.$dayjs(f.startTime).isBetween(startTime, endTime, null, "[]")) {
+          f.isDisabledColor = proxy.$settingStore.themeColor.color;
+          f.isDisabledFontColor = "#FFFFFF";
+          f.isAbout = "已预约";
+        }
+      });
+    });
+  }
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  init();
+}
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+
+  init();
+});
+
+onLoad((options) => {});
+
+onUnload(() => {});
+</script>
+
+<style lang="scss" scoped>
+.content-area {
+  color: #000000;
+}
+</style>

src/pages/business/common/meeting/new/index.vue

@@ -0,0 +1,210 @@
+<template>
+  <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="新建日程" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff" @rightClick="submitForm()">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+        </view>
+      </template>
+      <template #right>
+        <view class="u-navbar__content__right__item">
+          <view style="color: #333">完成</view>
+        </view>
+      </template>
+    </u-navbar>
+  </u-sticky>
+
+  <oa-scroll
+    customClass="record-container scroll-height"
+    :isSticky="false"
+    :customStyle="{
+      //#ifdef APP-PLUS || MP-WEIXIN
+      height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight}))`,
+      //#endif
+    }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="content-area">
+        <view class="content-area-item mt10 p10 bg-white">
+          <view class="font15 weight mb10 required">会议议题</view>
+          <u-textarea
+            v-model="form.meetingName"
+            placeholder="请输入"
+            placeholderStyle="color:#909399;font-size:13px"
+            confirmType="return"
+            :autoHeight="true"
+            :maxlength="-1"
+            :height="'100%'"
+            border="none"
+            style="padding: 0px"
+          ></u-textarea>
+        </view>
+        <view class="content-area-item mt10 p10 bg-white">
+          <view class="font15 weight mb10">预约人</view>
+          <u-textarea
+            v-model="form.initiatorUser.name"
+            placeholder="请输入"
+            placeholderStyle="color:#909399;font-size:13px"
+            confirmType="return"
+            :autoHeight="true"
+            :maxlength="-1"
+            :height="'100%'"
+            border="none"
+            style="padding: 0px"
+            :disabled="true"
+          ></u-textarea>
+        </view>
+        <view class="content-area-item mt10 p10 bg-white">
+          <view class="font15 weight mb10 required">会议介绍</view>
+          <u-textarea
+            v-model="form.meetingDescribe"
+            placeholder="请输入"
+            placeholderStyle="color:#909399;font-size:13px"
+            confirmType="return"
+            :autoHeight="true"
+            :maxlength="-1"
+            :height="'100%'"
+            border="none"
+            style="padding: 0px"
+          ></u-textarea>
+        </view>
+        <view class="content-area-item mt10 p10 bg-white">
+          <view class="font14 weight mb10 required">参会人员</view>
+          <avatarList :userList="form.users" @deleteUsers="deleteUsers" />
+          <u-button class="mt20" type="primary" style="width: 100px; height: 25px" @click="insertUsers()" shape="circle" icon="plus" size="mini" :disabled="form.reportStatus == 1">
+            选择人员
+          </u-button>
+        </view>
+        <view class="content-area-item mt10 p10 bg-white">
+          <view class="font15 weight mb10">通知类型</view>
+          <u-checkbox-group v-model="form.sendType" placement="row" size="14px" @change="checkboxChange">
+            <u-checkbox :customStyle="{ marginRight: '10px' }" v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"> </u-checkbox>
+          </u-checkbox-group>
+        </view>
+      </view>
+    </template>
+  </oa-scroll>
+</template>
+
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { meetingInfoAdd } from "@/api/business/meeting.js";
+/*----------------------------------组件引入-----------------------------------*/
+import avatarList from "../components/avatarList.vue";
+/*----------------------------------store引入-----------------------------------*/
+import { systemStores } from "@/store/modules/index";
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+const { proxy } = getCurrentInstance();
+const systemStore = systemStores();
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
+  form: computed(() => {
+    return systemStore.meetingList.form;
+  }),
+  checkboxList: [{ name: "站内信" }, { name: "短信" }],
+});
+
+const { form, checkboxList } = toRefs(state);
+
+/** 初始化 */
+function init() {}
+
+/** 提交按钮 */
+function submitForm() {
+  var newForm = JSON.parse(JSON.stringify(state.form));
+
+  if (!newForm.meetingName) {
+    proxy.$modal.msg("请输入会议议题");
+    return false;
+  }
+
+  if (!newForm.meetingDescribe) {
+    proxy.$modal.msg("请输入会议介绍");
+    return false;
+  }
+
+  if (newForm.users.length <= 0) {
+    proxy.$modal.msg("请选择参会人员");
+    return false;
+  }
+
+  const minute = proxy.$dayjs(newForm.endDate).add(30, "minute");
+  const endOfDay = proxy.$dayjs(proxy.$dayjs(newForm.endDate).format("YYYY-MM-DD")).endOf("day");
+  const isAfter = minute.isAfter(endOfDay); //当前时间是否在结束时间之后（true|false）
+  const endTime = isAfter ? endOfDay.format("YYYY-MM-DD HH:mm:ss") : minute.format("YYYY-MM-DD HH:mm:ss");
+
+  newForm.endDate = endTime;
+  newForm.meetingFileList.forEach((e) => {
+    e.fileUrl = e.url;
+    e.fileName = e.name;
+    e.fileType = 1;
+  });
+  newForm.sendType = Array.isArray(newForm.sendType) ? newForm.sendType.join(",") : newForm.sendType;
+
+  meetingInfoAdd(newForm).then((res) => {
+    proxy.$modal.msg("会议室预约成功");
+    proxy.$tab.navigateBack(1); //返回到需要执行方法的页面
+    state.form = [];
+  });
+}
+
+/** 添加人员按钮事件 */
+function insertUsers() {
+  proxy.$tab.navigateTo(`/pages/business/common/projectMange/mall/index?number=200&type=3&title=选择参会人`).then(() => {
+    setTimeout(() => {
+      uni.$emit("FathertuSon__UserMall", state.form.users); //将值存储监听器
+    }, 500);
+  });
+}
+
+/** 删除人员按钮事件 */
+function deleteUsers(index) {
+  state.form.users.splice(index, 1);
+  realTimeSaving();
+}
+
+/** 点击预约 */
+function handleSubmit() {}
+
+onReady(() => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+
+  // 监听组件返回数据
+  uni.$on("SontoFather__UserMall", function (value) {
+    state.form.users = value;
+  });
+});
+
+onLoad((options) => {
+  init();
+});
+
+onUnload(() => {
+  uni.$off("SontoFather__UserMall"); //将值删除监听器
+});
+</script>
+
+<style lang="scss" scoped>
+.content-area {
+  color: #000000;
+}
+
+:deep() {
+  .u-textarea--disabled {
+    background-color: #ffffff;
+  }
+}
+</style>

src/store/modules/system.js

@@ -9,6 +9,9 @@ const systemStores = defineStore(`storage-system`, {
         homeList: storageSystem.get("homeList"),
         mallList: {
             activeUserList: []
+        },
+        meetingList: {
+            form: {}
         }
     }),
     unistorage: true,

src/store/modules/user.js

@@ -20,6 +20,9 @@ const useStores = defineStore("useStores", {
     name: storage.get("name"),//用户名称
     nickName: storage.get("nickName"),//用户昵称
     phonenumber: storage.get("phonenumber"),//用户手机号
+    deptId: storage.get("deptId"),//部门ID
+    email: storage.get("email"),//邮箱
+    sex: storage.get("sex"),//性别
     avatar: storage.get("avatar"),//用户头像
     roles: storage.get("roles"),//用户权限
     permissions: storage.get("permissions"),
@@ -99,8 +102,11 @@ const useStores = defineStore("useStores", {
               userId: data.user.userId,//用户ID
               name: data.user.userName,//用户名称
               nickName: data.user.nickName,//用户昵称
-              phonenumber: data.user.phonenumber ? data.user.phonenumber.substr(0, 3) + "******" + data.user.phonenumber.substr(9) : "",//手机号码
+              phonenumber: data.user.phonenumber,//手机号码
               avatar: data.user.avatar,//头像
+              deptId: data.user.deptId,//部门ID
+              email: data.user.email,//邮箱
+              sex: data.user.sex,//性别
             })
 
             resolve(res);