修改

src/api/home.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+//获取所有一、二级菜单
+export function appList() {
+    return request({
+      url: '/system/menu/getPrimarySecondaryMenus',
+      method: 'get'
+    })
+  }

src/components/AppList/index.vue

@@ -8,11 +8,11 @@
             @click="childMethod()">新建应用</el-button> -->
         </div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane v-for="item, index in appList" :label="item.name" :name="item.type" :key="index">
-            <div class="app-item" v-for="(childItem, index) in item.list" :key="index" @click="handleSelect(childItem)"
+          <el-tab-pane v-for="item, index in appList" :label="item.name" :name="item.name" :key="index">
+            <div class="app-item" v-for="(childItem, index) in item.childrenMenus" :key="index" @click="handleSelect(childItem)"
               @mouseover="showContent = index" @mouseleave="showContent = null">
               <svg-icon :icon-class="childItem.icon" style="width: 40px;height: 40px" />
-              {{ childItem.title }}
+              {{ childItem.name }}
               <div v-if="showContent == index" class="app-item-tools">
                 <!-- <i slot="reference" class="el-icon-s-tools" @click.stop="editApp(childItem)"></i> -->
               </div>
@@ -25,81 +25,77 @@
 </template>
 
 <script>
+import {appList} from "@/api/home";
 import { constantRoutes } from "@/router";
 import router from '@/router'
 import store from '@/store'
-import { set } from "nprogress";
 export default {
   data() {
     return {
-      activeName: 'first',
+      activeName: 'OA',
       showContent: null,
       appList: [
         {
           name: 'OA',
-          type: 'first',
-          list: [
-            // {
-            //   type: 1,
-            //   path: 'https://www.baidu.com/',
-            //   title: '自定义应用',
-            //   icon: 'zidingyi',
-            // },
+          childrenMenus: [
+            {
+              type: 1,
+              path: 'https://www.baidu.com/',
+              name: '自定义应用',
+              icon: 'zidingyi',
+            },
             {
               type: 3,
               path: '/system/companyInfo',
-              title: '系统管理',
+              name: '系统管理',
               icon: 'chuchai',
             },
             {
               type: 1,
               path: '/oa/entry',
-              title: '入职审批',
+              name: '入职审批',
               icon: 'qingjia',
             },
             {
               type: 2,
               path: '/oa/turnJust',
-              title: '转正申请',
+              name: '转正申请',
               icon: 'chuchai',
             },
             {
               type: 3,
               path: '/oa/renewal',
-              title: '续签申请',
+              name: '续签申请',
               icon: 'chuchai',
             },
             {
               type: 4,
               path: '/oa/staffQuit',
-              title: '离职申请',
+              name: '离职申请',
               icon: 'chuchai',
             },
            
             {
               type: 4,
               path: '/meeting/list',
-              title: '会议室管理',
+              name: '会议室管理',
               icon: 'chuchai',
             },
           ],
         },
         {
           name: '人事',
-          type: 'second',
-          list: [],
+          childrenMenus: [],
 
         },
         {
           name: '财务',
-          type: 'third',
-          list: [],
+          childrenMenus: [],
 
         },
         {
           name: 'CRM',
-          type: 'fourth',
-          list: [],
+          childrenMenus: [],
 
         },
       ]
@@ -146,7 +142,21 @@ export default {
       return constantRoutes.concat(childrenMenus);
     },
   },
+  created(){
+    // this.getAppList();
+  },
   methods: {
+    getAppList() {
+      appList().then(res => {
+        let appDataList = [];
+        res.data.map((item) => {
+          if (item.name != '其他') {
+            appDataList.push(item);
+          }
+        });
+        this.appList = appDataList;
+      })
+    },
     // 当前激活的路由
     activeRoutes(key) {
       debugger

src/views/meeting/reserveList/index.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="岗位编码" prop="code">
-          <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
+        <el-form-item label="会议ID" prop="reserveId">
+          <el-input v-model="queryParams.reserveId" placeholder="请输入会议ID" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item label="岗位名称" prop="name">
-          <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-form-item label="会议名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入会议名称" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+        <el-form-item label="会议地点" prop="groomId">
+          <el-select v-model="queryParams.groomId" placeholder="会议地点" clearable>
             <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
           </el-select>
         </el-form-item>
@@ -31,20 +31,20 @@
       </el-row>
   
       <el-table v-loading="loading" :data="postList">
-        <el-table-column label="岗位编号" align="center" prop="id" />
-        <el-table-column label="岗位编码" align="center" prop="code" />
-        <el-table-column label="岗位名称" align="center" prop="name" />
-        <el-table-column label="岗位排序" align="center" prop="sort" />
+        <el-table-column label="会议ID" align="center" prop="reserveId" />
+        <el-table-column label="会议名称" align="center" prop="name" />
+        <el-table-column label="会议地点" align="center" prop="groomName" />
+        <el-table-column label="会议开始时间" align="center" prop="startTime" />
+        <el-table-column label="会议结束时间" align="center" prop="endTime" />
+        <el-table-column label="申请人" align="center" prop="applyUser" />
+        <el-table-column label="申请部门" align="center" prop="deptName" />
+        <el-table-column label="参会人数" align="center" prop="num" />
         <el-table-column label="状态" align="center" prop="status">
           <template v-slot="scope">
             <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-          <template v-slot="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template v-slot="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -61,22 +61,44 @@
       <!-- 添加或修改岗位对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="岗位名称" prop="name">
-            <el-input v-model="form.name" placeholder="请输入岗位名称" />
-          </el-form-item>
-          <el-form-item label="岗位编码" prop="code">
-            <el-input v-model="form.code" placeholder="请输入编码名称" />
+          <el-form-item label="会议名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入会议名称" />
           </el-form-item>
-          <el-form-item label="岗位顺序" prop="sort">
-            <el-input-number v-model="form.sort" controls-position="right" :min="0" />
-          </el-form-item>
-          <el-form-item label="岗位状态" prop="status">
-            <el-radio-group v-model="form.status">
+          <el-form-item label="会议地点" prop="groomId">
+            <el-radio-group v-model="form.groomId">
               <el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
                 {{dict.label}}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="备注" prop="remark">
+          <el-form-item label="会议开始时间" prop="startTime">
+            <el-date-picker
+              v-model="queryParams.startTime"
+              style="width: 250px"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择会议开始时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="会议结束时间" prop="endTime">
+            <el-date-picker
+              v-model="queryParams.endTime"
+              style="width: 250px"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择会议结束时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="申请人" prop="applyUser">
+            <el-input v-model="form.applyUser" placeholder="申请人" />
+          </el-form-item>
+          <el-form-item label="申请部门" prop="deptName">
+            <el-input v-model="form.deptName" placeholder="申请部门" />
+          </el-form-item>
+          <el-form-item label="参会人员" prop="meetingParticipants">
+            <el-input v-model="form.meetingParticipants" placeholder="选择参会人员" readonly @click="openPS"/>
+          </el-form-item>
+        
+          <el-form-item label="会议内容">
             <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
           </el-form-item>
         </el-form>
@@ -85,6 +107,8 @@
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
+      <PeopleSelect ref="peopleSelect" type="multiple" :isCheck="true" :open="peopleOpen" @cancel="peopleOpen = false"
+      @submit="submitPeople"></PeopleSelect>
     </div>
   </template>
   
@@ -98,6 +122,8 @@
     name: "SystemPost",
     data() {
       return {
+            //是否打开选人组件，默认不打开
+      peopleOpen: false,
         // 遮罩层
         loading: true,
         // 导出遮罩层
@@ -116,22 +142,34 @@
         queryParams: {
           pageNo: 1,
           pageSize: 10,
-          code: undefined,
+          reserveId: undefined,
           name: undefined,
-          status: undefined
+          groomId: undefined
         },
         // 表单参数
         form: {},
         // 表单校验
         rules: {
           name: [
-            { required: true, message: "岗位名称不能为空", trigger: "blur" }
+            { required: true, message: "会议名称不能为空", trigger: "blur" }
+          ],
+          groomId: [
+            { required: true, message: "会议室不能为空", trigger: "blur" }
+          ],
+          startTime: [
+            { required: true, message: "会议开始时间不能为空", trigger: "blur" }
           ],
-          code: [
-            { required: true, message: "岗位编码不能为空", trigger: "blur" }
+          endTime: [
+            { required: true, message: "会议结束时间不能为空", trigger: "blur" }
           ],
-          sort: [
-            { required: true, message: "岗位顺序不能为空", trigger: "blur" }
+          applyUser: [
+            { required: true, message: "申请人不能为空", trigger: "blur" }
+          ],
+          deptName: [
+            { required: true, message: "申请人部门不能为空", trigger: "blur" }
+          ],
+          deptName: [
+            { required: true, message: "参会人员不能为空", trigger: "blur" }
           ]
         },
   
@@ -145,6 +183,18 @@
       this.getList();
     },
     methods: {
+          //打开选人弹窗
+    openPS() {
+      this.peopleOpen = true;
+    },
+        //选择人的确定按钮事件 submitPeople(nikeNamelist)方法传参一个默认接收用户昵称数组   submitPeople(peopleList,nikeNamelist)方法传参两个则是接收用户昵称数组和用户账号数组
+        submitPeople(userNamelist, nikeNamelist,userIdList) {
+      console.log(userIdList);
+      this.peopleList = nikeNamelist;
+      this.form.peopleList = userNamelist.join(",");
+      this.userIdList = userIdList;
+      this.peopleOpen = false;
+    },
       /** 查询岗位列表 */
       getList() {
         this.loading = true;
@@ -162,11 +212,13 @@
       // 表单重置
       reset() {
         this.form = {
-          id: undefined,
-          code: undefined,
           name: undefined,
-          sort: 0,
-          status: CommonStatusEnum.ENABLE,
+          groomId: undefined,
+          startTime: undefined,
+          endTime:undefined,
+          applyUser:undefined,
+          deptName:undefined,
+          deptName:undefined,
           remark: undefined
         };
         this.resetForm("form");