优化我的会议功能模块/优化封装组件逻辑

src/api/business/door.js

@@ -0,0 +1,25 @@
+import { request } from "@/utils/request";
+
+/**
+ * 门禁接口集合
+ * @method doorControl 门禁开门
+ * @method doorList 门禁列表
+ */
+export function doorApi() {
+    return {
+        doorControl: (data) => {
+            return request({
+                url: `/service-iot/deviceHttp/control`,
+                method: 'GET',
+                data,
+            });
+        },
+        doorList: (data) => {
+            return request({
+                url: `/service-iot/dmpDeviceInfo/pageWhite`,
+                method: 'POST',
+                data,
+            });
+        },
+    };
+}

src/pages.json

@@ -811,7 +811,7 @@
                 {
                     "path": "detailed/index",
                     "style": {
-                        "navigationBarTitleText": "会议详情",
+                        "navigationBarTitleText": "会议室详情",
                         "enablePullDownRefresh": false,
                         "navigationStyle": "custom",
                         "app-plus": {

src/pages/business/meeting/components/switchSlot.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="flex plr10" style="min-height: 50px; line-height: 20px">
-    <view class="flex mtb-auto ptb10 nav" v-for="item in formData" :key="item" @click="itemClick(item.event)" style="overflow-x: auto">
+    <view class="flex mtb-auto ptb10 nav" v-for="item in formData" :key="item" @click="handleClick(item)" style="overflow-x: auto">
       <view
         class="radius p5 mr10"
         :style="{
@@ -8,7 +8,7 @@
           backgroundColor: `${form[item.prop] ? activeColor : disabledColor}30`,
         }"
       >
-        <span v-if="item.type == 'date'">
+        <span v-if="item.type == 'switchTime'">
           {{ proxy.$dayjs(form[item.prop]).format("MM月DD日") }}
           {{ weekData[proxy.$dayjs(form[item.prop]).format("d")] }}
         </span>
@@ -18,8 +18,34 @@
         </span>
       </view>
     </view>
-    <view class="ml-auto mtb-auto pl10 nav" @click="resetClick" :style="{ color: activeColor }">重置</view>
+    <view class="ml-auto mtb-auto pl10 nav" @click="resetSwitch" :style="{ color: activeColor }">重置</view>
   </view>
+
+  <u-popup :show="popup.show" mode="bottom" bgColor="#fff" :round="10" :zIndex="10074" @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>
+  </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="changeSheet"
+  ></u-action-sheet>
 </template>
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
@@ -34,38 +60,73 @@ import { useStores, commonStores } from "@/store/modules/index";
 const { proxy } = getCurrentInstance();
 const commonStore = commonStores();
 /*----------------------------------变量声明-----------------------------------*/
-const emit = defineEmits(["onClick", "resetClick"]);
+const emit = defineEmits(["handleInit", "onClick", "changeSheet", "reset"]);
 const props = defineProps({
   form: {
     type: Object,
     default: {},
-  },
+  }, //选中值
   formData: {
     type: Object,
     default: [],
-  },
+  }, //选中值列表
   weekData: {
     type: Object,
     default: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-  },
+  }, //周数据
   activeColor: {
     type: String,
     default: "",
-  },
+  }, //选中状态颜色
   disabledColor: {
     type: String,
     default: "",
+  }, //禁用状态颜色
+});
+const state = reactive({
+  sheet: {
+    show: false,
+    title: "",
+    actions: [],
+  },
+  popup: {
+    show: false,
+    type: "",
+    list: {},
   },
 });
 
 const { form, formData, weekData, activeColor, disabledColor } = toRefs(props);
+const { sheet, popup } = toRefs(state);
+
+function handleClick(event) {
+  if (event.type === "switchTime") {
+    state.popup.show = true;
+    state.popup.type = event.type;
+  } else if (event.type === "select") {
+    state.sheet.show = true;
+    state.sheet.actions = event.data;
+  }
+}
+
+function changeSheet(event) {
+  emit("changeSheet", event);
+}
+
+/** 日历日期改变事件 */
+function calendarChange(e) {
+  props.form.date = e.fulldate;
+  emit("handleInit");
+}
 
-function itemClick(event) {
-  emit("onClick", ...event);
+/** 日历月份选择事件 */
+function calendarMonthSwitch(e) {
+  console.log(e);
 }
 
-function resetClick() {
-  emit("resetClick");
+/** 重置选项卡 */
+function resetSwitch() {
+  emit("reset");
 }
 </script>
 <style lang="scss" scoped></style>

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

@@ -1,6 +1,6 @@
 <template>
   <view class="about-container">
-    <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="会议详情" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <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>

src/pages/business/meeting/index.vue

@@ -8,7 +8,7 @@
       </template>
       <template #right>
         <view class="u-navbar__content__right__item">
-          <u-icon name="more-dot-fill" size="19" color="#000" @click="sheet1.show = true"></u-icon>
+          <u-icon name="more-dot-fill" size="19" color="#000" @click="handleSheet(true, 'rightMore')"></u-icon>
         </view>
       </template>
     </u-navbar>
@@ -26,7 +26,15 @@
       ></u--input>
     </view>
 
-    <switchSlot :form="form" :form-data="formData" :activeColor="proxy.$settingStore.themeColor.color" disabledColor="#999999" @onClick="handlePopup" @resetClick="resetSwitch"></switchSlot>
+    <switchSlot
+      :form="form"
+      :form-data="formData"
+      :activeColor="proxy.$settingStore.themeColor.color"
+      disabledColor="#999999"
+      @changeSheet="1"
+      @reset="resetSwitch()"
+      @handleInit="init()"
+    ></switchSlot>
   </u-sticky>
 
   <oa-scroll
@@ -76,34 +84,32 @@
         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">
+          <view class="mtb-auto ml-auto" @click="handleSheet(true, 'popupMore')">
             <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>
+        <scroll-view scroll-y="true" :scroll-into-view="scrollIntoView" style="height: 42vh">
+          <u-checkbox-group v-model="checkboxValue" placement="column" shape="circle" :borderBottom="true" @change="checkboxChange">
+            <view :id="'item' + item.id" 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>
+        </scroll-view>
         <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>
@@ -121,19 +127,7 @@
     :closeOnClickOverlay="true"
     :safeAreaInsetBottom="true"
     @close="sheet.show = false"
-    @select="handleSheet"
-  ></u-action-sheet>
-
-  <u-action-sheet
-    :actions="sheet1.actions"
-    :show="sheet1.show"
-    cancelText="取消"
-    :round="10"
-    :wrapMaxHeight="'50vh'"
-    :closeOnClickOverlay="true"
-    :safeAreaInsetBottom="true"
-    @close="sheet1.show = false"
-    @select="handleSheet"
+    @select="changeSheet"
   ></u-action-sheet>
 </template>
 
@@ -142,7 +136,8 @@
 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, control } from "@/api/business/meeting.js";
+import { MeetingRoomList, MeetingRoomReservationList } from "@/api/business/meeting.js";
+import { doorApi } from "@/api/business/door.js";
 /*----------------------------------组件引入-----------------------------------*/
 import timeSlot from "./components/timeSlot.vue";
 import switchSlot from "./components/switchSlot.vue";
@@ -165,16 +160,11 @@ const state = reactive({
   },
   formData: [
     {
-      type: "date",
+      type: "switchTime",
       prop: "date",
-      label: "",
-      event: [true, "switchTime", {}],
-    },
-    {
-      type: "text",
-      prop: "meetingRoomName",
-      label: "会议室名称",
-      event: [],
+      label: "时间",
+      fontSize: "16",
+      data: [],
     },
   ],
   popup: {
@@ -185,35 +175,14 @@ const state = reactive({
   sheet: {
     show: false,
     title: "",
-    actions: [
-      {
-        name: "门禁开门",
-        fontSize: "16",
-        type: "meeting-room",
-      },
-      {
-        name: "会议室详情",
-        fontSize: "16",
-        type: "meeting-details",
-      },
-    ],
-  },
-  sheet1: {
-    show: false,
-    title: "",
-    actions: [
-      {
-        name: "我的会议",
-        fontSize: "16",
-        type: "meeting-my",
-      },
-    ],
+    actions: [],
   },
   checkboxValue: [],
   checkboxList: [],
+  scrollIntoView: "",
 });
 
-const { loading, dataList, pageSize, total, form, formData, popup, sheet, sheet1, checkboxValue, checkboxList } = toRefs(state);
+const { loading, dataList, pageSize, total, form, formData, popup, sheet, checkboxValue, checkboxList, scrollIntoView } = toRefs(state);
 
 /** 初始化 */
 function init() {
@@ -235,7 +204,6 @@ function init() {
     .catch((err) => {
       state.loading = false;
     });
-
   state.checkboxList = getAllTimesDay(state.form.date, 30);
 }
 
@@ -254,6 +222,7 @@ function getAllTimesDay(day, min) {
     let timeSlot = proxy.$dayjs(startTime).format("HH:mm") + " - " + proxy.$dayjs(endTime).format("HH:mm"); //获取开始时间和结束时间“时、分”
 
     const array = {
+      id: defaultList.length + 1,
       startTime: startTime,
       endTime: endTime,
       timeSlot: timeSlot,
@@ -268,7 +237,6 @@ function getAllTimesDay(day, min) {
       array.isAbout = "不可预约";
       array.isDisabled = true;
     }
-
     defaultList.push(array);
   }
   return defaultList;
@@ -325,24 +293,13 @@ function handleSubmit() {
   state.popup.show = false;
 }
 
-/** 日历日期改变事件 */
-function calendarChange(e) {
-  state.form.date = e.fulldate;
-  init();
-}
-
-/** 日历月份选择事件 */
-function calendarMonthSwitch(e) {
-  console.log(e);
-}
-
 /** 操作菜单 */
-function handleSheet(e) {
-  if (e.type == "meeting-details") {
+function changeSheet(e) {
+  if (e.name == "会议室详情") {
     proxy.$tab.navigateTo(`/pages/business/meeting/detailed/index?roomId=${state.popup.list.roomId}`).then(() => {});
-  } else if (e.type == "meeting-room") {
-    openDoor();
-  } else if (e.type == "meeting-my") {
+  } else if (e.name == "门禁开门") {
+    openDoor(e);
+  } else if (e.name == "我的会议") {
     proxy.$tab.navigateTo(`/pages/business/meeting/my/index`).then(() => {});
   }
 }
@@ -350,10 +307,14 @@ function handleSheet(e) {
 /**
  * @门禁开门
  */
-function openDoor() {
-  control({
-    commandStr: JSON.stringify({ method: "control", params: { device_id: "223212768", command: 2 } }),
-  })
+function openDoor(e) {
+  doorApi()
+    .doorControl({
+      productCode: "502_KAT",
+      deviceId: e.doorId,
+      commandCode: "door_onoff",
+      commandValue: 1,
+    })
     .then((item2) => {
       proxy.$modal.msg("开门成功");
     })
@@ -362,6 +323,33 @@ function openDoor() {
     });
 }
 
+/** 操作菜单 */
+function handleSheet(show, type) {
+  state.sheet.show = show;
+  if (type === "rightMore") {
+    state.sheet.actions = [
+      {
+        name: "我的会议",
+        value: "",
+        type: "meeting-my",
+      },
+    ];
+  } else if (type === "popupMore") {
+    state.sheet.actions = [
+      {
+        name: "门禁开门",
+        value: "",
+        type: "meeting-room",
+      },
+      {
+        name: "会议室详情",
+        value: "",
+        type: "meeting-details",
+      },
+    ];
+  }
+}
+
 /** 操作弹窗 */
 function handlePopup(show, type, list) {
   state.popup.show = show;
@@ -382,12 +370,27 @@ function handlePopup(show, type, list) {
         }
       });
     });
+
+    state.scrollIntoView = "";
+    setTimeout(() => {
+      state.checkboxList.some((e) => {
+        if (e.isDisabled === false) {
+          state.scrollIntoView = "item" + e.id;
+          return true;
+        }
+        return false;
+      });
+    });
   }
 }
 
-/** 重置选项卡 */
+/** 操作重置 */
 function resetSwitch() {
-  state.form.date = proxy.$dayjs().format("YYYY-MM-DD");
+  state.form = {
+    date: proxy.$dayjs().format("YYYY-MM-DD"),
+    meetingRoomName: "",
+  };
+  init();
 }
 
 /**
@@ -402,7 +405,6 @@ onReady(() => {});
 onShow(() => {
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
-
   init();
 });
 

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

@@ -7,20 +7,29 @@
         </view>
       </template>
     </u-navbar>
-    <switchSlot :form="form" :form-data="formData" :activeColor="proxy.$settingStore.themeColor.color" disabledColor="#999999" @onClick="handlePopup" @resetClick="resetSwitch"></switchSlot>
+
+    <switchSlot
+      :form="form"
+      :form-data="formData"
+      :activeColor="proxy.$settingStore.themeColor.color"
+      disabledColor="#999999"
+      @changeSheet="changeSheet"
+      @reset="resetSwitch()"
+      @handleInit="init()"
+    ></switchSlot>
   </u-sticky>
 
   <oa-scroll
     customClass="record-container scroll-height"
-    :pageSize="pageSize"
-    :total="total"
+    :pageSize="form.pageSize"
+    :total="form.total"
     :isSticky="true"
     :customStyle="{
       //#ifdef APP-PLUS || MP-WEIXIN
-      height: `calc(100vh - (88px + ${proxy.$settingStore.StatusBarHeight}))`,
+      height: `calc(100vh - (94px + ${proxy.$settingStore.StatusBarHeight}))`,
       //#endif
       //#ifdef H5
-      height: `calc(100vh - (88px))`,
+      height: `calc(100vh - (94px))`,
       //#endif
     }"
     :refresherLoad="true"
@@ -34,39 +43,24 @@
     :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" v-for="(el, index) in reportListNewData" :key="index">
-        <view class="content-area-time font14" v-if="!el.id">{{ proxy.$time.jktTimes(el.submitDate, "否") }}</view>
-        <view class="content-area-center bg-white" v-else style="margin: 0 10px 10px; border-radius: 10px">
-          <view class="content-area-top menu-item" style="float: right; padding: 10px 0px">
-            <view class="content-area-top-time"> </view>
-            <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon>
-          </view>
-          <view class="flex mb10" @click="goContentDetails(el)">
-            <img :src="el.avatar" class="content-area-center-avatarImg mr10" v-if="el.avatar" />
-            <u-avatar
-              v-if="!el.avatar"
-              class="content-area-center-avatar mr10"
-              :text="el.createBy.length > 2 ? el.createBy.slice(1, 3) : el.createBy"
-              shape="square"
-              size="35"
-              fontSize="10"
-              color="#ffffff"
-              :bgColor="proxy.$settingStore.themeColor.color"
-            ></u-avatar>
-            <view>
-              <view class="content-area-center-title font14 mb5">{{ el.createBy }}的日报</view>
-              <view class="content-area-center-time font12">{{ proxy.$time.jktTimes(el.submitDate.replace("T", " ")) }}</view>
-            </view>
+      <u-loading-page :loading="loading" fontSize="16" style="z-index: 99"></u-loading-page>
+
+      <view class="content-area" v-for="(group, date) in proxy.$common.groupedItems(dataList, 'createTime')" :key="date">
+        <view class="content-area-time font14">{{ proxy.$time.jktTimes(date, "否") }}</view>
+        <view class="content-area-center bg-white radius mb10 mlr10" v-for="(el, ind) in group" :key="ind">
+          <view class="flex mb10">
+            <view class="content-area-center-title font14 mr-auto">方惠圣预约的会议</view>
+            <!-- <u-icon class="" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon> -->
           </view>
-          <view class="mb5" @click="goContentDetails(el)">
-            <u-text :text="el.contentText.length >= 100 ? el.contentText.slice(0, 100) + '···' : el.contentText" color="#666666" size="14"></u-text>
+          <view class="mb5">
+            <view>会议室：{{ el.roomName }}</view>
+            <view>发起人：{{ el.createBy }}</view>
+            <view>参会时间：{{ el.startDate.split("T")[1] }} - {{ el.endDate.split("T")[1] }} </view>
           </view>
-          <view class="flex" v-if="el.createBy != useStore.nickName" @click="goContentDetails(el)">
-            <u-tag class="mr10" type="info" text="已读" size="mini" plain v-if="el.readFlag === 1" style="margin: 0 auto"></u-tag>
-            <u-tag class="mr10" type="error" text="未读" size="mini" plain v-if="el.readFlag === 0" style="margin: 0 auto"></u-tag>
-            <u-text text="全文" :color="proxy.$settingStore.themeColor.color" size="14"></u-text>
+          <u-divider v-if="el.meetingStatus == 0"></u-divider>
+          <view class="flex">
+            <view class="pb5 mlr-auto text-center" style="width: 100%" @click="handleButton('meeting-release', el)" v-if="el.meetingStatus == 0">释放会议室</view>
+            <!-- <view class="pb5 mlr-auto text-center" style="width: 100%" @click="handleButton('meeting-details', el)">会议详情</view> -->
           </view>
         </view>
       </view>
@@ -79,135 +73,121 @@
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { projectApi } from "@/api/business/project.js";
+import { myApi, recordApi } from "@/api/business/meeting.js";
 /*----------------------------------组件引入-----------------------------------*/
 import switchSlot from "../components/switchSlot.vue";
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
 /*----------------------------------公共变量-----------------------------------*/
-const { proxy } = getCurrentInstance();
 const useStore = useStores();
+const { proxy } = getCurrentInstance();
+const { meeting_type, meeting_status } = proxy.useDict("meeting_type", "meeting_status");
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
-  tabsList: [
-    { name: "我收到的", value: 2 },
-    { name: "我发出的", value: 3 },
-    { name: "我负责的", value: 1 },
-  ],
-  tabsCurrent: 0,
-
   loading: false,
-  reportListNewData: [],
-  pageSize: 20,
-  current: 1,
-  total: 0,
-  modalShow: false,
-  modalType: "",
-  modalEvent: {},
-
-  popup: {
-    show: false, //弹窗显示
-    content: "", //提示信息
-  },
-  modal: {
-    type: "", //操作类型
-    show: false, //弹窗显示
-    content: "", //提示信息
+  dataList: [],
+  form: {
+    pageSize: 10,
+    current: 1,
+    total: 0,
+    meetingMode: undefined,
+    meetingStatus: undefined,
   },
-  eventList: {}, //数据存储
-
-  reportData: {},
-  tip: {
-    type: undefined, //弹框类型
-    content: "", //提示信息
-    data: {}, //带入数据
-    operation: undefined, //操作类型
-  },
-  timedList: [],
-  tree: [],
+  formData: [
+    {
+      type: "select",
+      prop: "meetingMode",
+      label: "会议类型",
+      fontSize: "16",
+      data: [],
+    },
+    {
+      type: "select",
+      prop: "meetingStatus",
+      label: "会议状态",
+      fontSize: "16",
+      data: [],
+    },
+  ],
 });
 
-const { tabsList, tabsCurrent, reportListNewData, pageSize, current, total, popup, eventList, modal, timedList, tree } = toRefs(state);
+const { loading, dataList, form, formData, sheet } = toRefs(state);
 
 /**
  * @初始化
  */
 function init() {
-  let arrayList = [];
-  projectApi()
-    .ReportRecord({
-      // startDate: "2024-07-10",
-      // endDate: "2024-07-10",
-      pageNum: state.current,
-      pageSize: state.pageSize,
-      projectAscription: state.tabsList[state.tabsCurrent].value,
+  myApi()
+    .Select({
+      current: state.form.current,
+      size: state.form.pageSize,
+      meetingMode: proxy.$common.mapping("value", "label", state.form.meetingMode, meeting_type.value),
+      meetingStatus: proxy.$common.mapping("value", "label", state.form.meetingStatus, meeting_status.value),
     })
     .then((requset) => {
-      requset.data.records.forEach((el) => {
-        el.contentText = "";
-        el.workContents.forEach((cl) => {
-          el.contentText += `${cl.projectName} ${cl.workTime}h \n ${cl.workContent} \n`;
+      state.form.total = requset.data.total;
+      state.dataList = requset.data.records;
+
+      state.formData[0].data = [];
+      state.formData[1].data = [];
+      meeting_type.value.forEach((e) => {
+        state.formData[0].data.push({
+          name: e.label,
+          type: "",
+          prop: state.formData[0].prop,
+          value: e.value,
         });
       });
-      state.total = requset.data.total;
-      state.loading = false;
-
-      var reportListData = requset.data.records;
-      var groupBySubmitTime = reportListData.reduce((acc, current) => {
-        const existIndex = acc.findIndex((item) => item.submitDate.slice(0, 10) === current.submitDate.slice(0, 10));
-        if (existIndex === -1) {
-          acc.push({ submitDate: current.submitDate, items: [current] });
-        } else {
-          acc[existIndex].items.push(current);
-        }
-        return acc;
-      }, []);
-
-      groupBySubmitTime.forEach(function (item, index) {
-        item.items.unshift({ submitDate: item.submitDate });
-        item.items.forEach(function (aa) {
-          arrayList.push(aa);
+      meeting_status.value.forEach((e) => {
+        state.formData[1].data.push({
+          name: e.label,
+          type: "",
+          prop: state.formData[1].prop,
+          value: e.value,
         });
       });
-
-      state.reportListNewData = arrayList;
-    })
-    .catch((err) => {
-      state.loading = false;
-    });
-  projectApi()
-    .TimedReports({})
-    .then((requset) => {
-      state.timedList = requset.data;
     })
     .catch((err) => {});
 }
 
-/**
- * @跳转详情
- */
-function goContentDetails(e) {
-  if (state.tabsCurrent == 0 && e.readFlag != 1) {
-    projectApi()
-      .ReportRecordReadFlag({ reportId: e.id })
+/** 操作按钮 */
+function handleButton(type, event) {
+  if (type === "meeting-release") {
+    recordApi()
+      .Cancel(event.meetingId)
       .then((res) => {
-        if (res.status == "SUCCESS") {
-          proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}`);
-        } else {
-          proxy.$modal.msgError("读取异常");
-        }
+        proxy.$modal.msg("会议取消");
+        init();
       });
-  } else {
-    proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.id}`);
+  } else if (type === "meeting-details") {
+    // proxy.$tab.navigateTo(`/pages/business/meeting/detailed/index?roomId=${event.roomId}`).then(() => {});
   }
 }
 
+/** 操作菜单 */
+function changeSheet(e) {
+  state.form[e.prop] = e.name;
+  init();
+}
+
+/** 操作重置 */
+function resetSwitch() {
+  state.form = {
+    pageSize: 10,
+    current: 1,
+    total: 0,
+    meetingMode: undefined,
+    meetingStatus: undefined,
+  };
+  init();
+}
+
 /**
  * @scrollView加载数据
  */
 function load() {
-  state.pageSize += 10;
+  state.form.pageSize += 10;
   init();
 }
 
@@ -215,36 +195,22 @@ function load() {
  * @scrollView刷新数据
  */
 function refresh() {
-  state.pageSize = 20;
-  init();
-}
-
-/**
- * @tabs点击事件
- */
-function tabsClick(e) {
-  state.tabsCurrent = e.index;
+  state.form.pageSize = 20;
   init();
 }
 
 onReady(() => {});
 
 onShow(() => {
-  state.popup.show = false;
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
 });
 
 onLoad((options) => {
   init();
-  uni.$on("projectMange_record", function (value) {
-    init();
-  });
 });
 
-onUnload(() => {
-  uni.$off("projectMange_record"); //将值删除监听器
-});
+onUnload(() => {});
 </script>
 
 <style lang="scss" scoped>
@@ -282,13 +248,4 @@ onUnload(() => {
     }
   }
 }
-
-.pp {
-  text-align: left;
-}
-</style>
-<style>
-.pp .u-modal__content {
-  justify-content: left !important;
-}
 </style>