sc

src/permission.js

@@ -64,7 +64,9 @@ router.beforeEach(async (to, from, next) => {
       if (tenantId && appId) {
         next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
       } else {
-        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        // next(`/login?redirect=${to.fullPath}`)
+        // 否则全部重定向到平台登陆页
+        window.location.href = 'https://cloud.ahduima.com/ss/login'
       }
     }
   }

src/views/OKR/Meeting/MeetingInfo.vue

@@ -17,20 +17,23 @@
       <el-row :gutter="20">
         <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
           <el-form-item label="会议主题" prop="meetingSubject">
-            <el-input v-model="form.meetingSubject" placeholder="请输入会议主题" />
+            <el-input v-model="form.meetingSubject" placeholder="请输入会议主题" clearable />
           </el-form-item>
         </el-col>
         <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
-          <el-tree-select
+          <el-form-item label="okr节点" prop="nodeId">
-            v-model="form.nodeId"
+            <el-tree-select
-            :data="peroidList"
+              v-model="form.nodeId"
-            :props="defaultProps"
+              :data="peroidList"
-            :render-after-expand="false"
+              :props="defaultProps"
-            :default-expand-all="false"
+              :render-after-expand="false"
-            check-strictly
+              :default-expand-all="false"
-            placeholder="选择OKR节点"
+              check-strictly
-            style="width: 100%"
+              clearable
-          />
+              placeholder="选择OKR节点"
+              style="width: 100%"
+            />
+          </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
           <el-form-item label="会议时间" prop="startTime">
@@ -56,7 +59,7 @@
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
           <el-form-item label="会议地点" prop="meetingRoom">
-            <el-input v-model="form.meetingRoom" placeholder="请输入会议地点" />
+            <el-input v-model="form.meetingRoom" placeholder="请输入会议地点" clearable />
           </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
@@ -64,6 +67,7 @@
             <el-select v-model="form.status" placeholder="请选择会议状态" style="width: 100%">
               <el-option label="未开始" value="1" />
               <el-option label="已结束" value="2" />
+              <el-option label="已取消" value="3" disabled />
             </el-select>
           </el-form-item>
         </el-col>
@@ -146,8 +150,8 @@ const defaultProps = {
 
 const isDetail = route.query.isDetail
 
-onMounted(() => {
+onMounted(async () => {
-  getOptions()
+  await getOptions()
   if (route.params.id && route.params.id != 0) {
     // 这里可以调用API获取会议详情数据
     getMeetingInfo(route.params.id)
@@ -158,18 +162,31 @@ onMounted(() => {
 
 const peroidList = ref([])
 function getOptions() {
-  // 获取OKR节点数据
+  return Promise.all([getAllNodeTree(), getEmployeeSimpleList()])
-  getAllNodeTree().then((resp) => {
+    .then(([okrResp, employeeResp]) => {
-    peroidList.value = listToTree(resp?.tree || [], {
+      peroidList.value = listToTree(okrResp?.tree || [], {
-      id: 'nodeId',
+        id: 'nodeId',
-      pid: 'parentId',
+        pid: 'parentId',
-      children: 'children'
+        children: 'children'
+      })
+      userOptions.value = employeeResp.map((it) => ({ ...it, id: it.id + '' }))
+      // handleUserChange()
     })
-  })
+    .catch((error) => {
-  // 获取人员数据
+      console.error('获取数据失败:', error)
-  getEmployeeSimpleList().then((data) => {
+    })
-    userOptions.value = data.map((it) => ({ ...it, id: it.id + '' }))
+  // // 获取OKR节点数据
-  })
+  // getAllNodeTree().then((resp) => {
+  //   peroidList.value = listToTree(resp?.tree || [], {
+  //     id: 'nodeId',
+  //     pid: 'parentId',
+  //     children: 'children'
+  //   })
+  // })
+  // // 获取人员数据
+  // getEmployeeSimpleList().then((data) => {
+  //   userOptions.value = data.map((it) => ({ ...it, id: it.id + '' }))
+  // })
 }
 
 const form = ref({
@@ -258,6 +275,7 @@ async function submit() {
         message.error('预约会议时，会议内容不能为空')
         return
       }
+      form.value.actualUsers = []
       // 新增会议
       await MeetingApi.createMeeting(form.value)
       message.success('会议创建成功')

src/views/OKR/Meeting/index.vue

@@ -3,10 +3,21 @@
     <!-- 搜索条件：主题、会议状态、会议时间（时间段）、选择OKR节点 -->
     <el-form :model="searchForm" inline label-width="0">
       <el-form-item>
-        <el-input v-model="searchForm.meetingSubject" placeholder="会议主题" style="width: 200px" />
+        <el-input
+          v-model="searchForm.meetingSubject"
+          placeholder="会议主题"
+          style="width: 200px"
+          clearable
+          @keyup.enter="handleSearch"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.status" placeholder="会议状态" style="width: 150px">
+        <el-select
+          v-model="searchForm.status"
+          placeholder="会议状态"
+          style="width: 150px"
+          @change="handleSearch"
+        >
           <el-option label="未开始" value="1" />
           <el-option label="已结束" value="2" />
           <el-option label="已取消" value="3" />
@@ -20,6 +31,7 @@
           value-format="YYYY-MM-DD"
           start-placeholder="会议时间"
           end-placeholder="会议时间"
+          @change="handleSearch"
         />
       </el-form-item>
       <el-form-item>
@@ -32,6 +44,7 @@
           check-strictly
           placeholder="选择OKR节点"
           style="width: 300px"
+          clearable
           @change="handleSearch"
         />
       </el-form-item>
@@ -43,13 +56,13 @@
 
     <el-table :data="tableList" v-loading="loading" border stripe>
       <el-table-column prop="meetingSubject" label="会议主题" />
-      <el-table-column prop="startTime" label="会议时间" />
+      <el-table-column prop="startTime" label="会议时间" width="170px" />
-      <el-table-column prop="meetingRoom" label="会议地点" />
+      <el-table-column prop="meetingRoom" label="会议地点" width="140px" />
-      <el-table-column prop="expectEndTime" label="预计结束时间" />
+      <el-table-column prop="expectEndTime" label="预计结束时间" width="170px" />
       <el-table-column prop="expectUserName" label="预约参会人员" />
       <el-table-column prop="actualUserName" label="实际参会人员" />
-      <el-table-column prop="nodeName" label="关联OKR节点" />
+      <el-table-column prop="nodeName" label="关联OKR节点" width="150px" />
-      <el-table-column prop="status" label="会议状态">
+      <el-table-column prop="status" label="会议状态" width="100px">
         <template #default="{ row }">
           <el-tag :type="['', 'info', 'success', 'warning'][row.status]" size="small">
             {{ ['', '未开始', '已结束', '已取消'][row.status] }}
@@ -58,7 +71,7 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="140">
         <template #default="{ row }">
-          <template v-if="row.status == 1">
+          <template v-if="row.status == 1 && row.creator == currentUserId">
             <el-button type="primary" style="padding: 0" text @click="handleEdit(row.meetingId)">
               修改
             </el-button>
@@ -89,10 +102,12 @@
 
 <script setup name="Meeting">
 import { listToTree } from '@/utils/tree'
-// import { formatDate } from '@/utils/formatTime'
+import { useUserStore } from '@/store/modules/user'
 import { getAllNodeTree } from '@/api/okr/okr'
 import * as MeetingApi from '@/api/okr/meeting'
 
+const currentUserId = useUserStore().getUser.id
+
 const defaultProps = {
   value: 'nodeId',
   label: 'nodeName',
@@ -141,11 +156,11 @@ function getList() {
     const params = { ...searchForm.value }
     if (params.dateRange && params.dateRange.length) {
       params.startTime = params.dateRange[0] + ' 00:00:00'
-      params.endDate = params.dateRange[1] + ' 23:59:59'
+      params.endTime = params.dateRange[1] + ' 23:59:59'
       delete params.dateRange
     } else {
       delete params.startTime
-      delete params.endDate
+      delete params.endTime
     }
     MeetingApi.getMeetingPage(params)
       .then((resp) => {