sc

Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web/pulls/7

.env.base

@@ -4,10 +4,11 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://localhost:48080'
+# VITE_BASE_URL='http://localhost:48080'
 
-# VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://47.98.161.246:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
+# VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'

src/api/home/salary.js

@@ -54,3 +54,8 @@ export const getLinkHistorySalary = async () => {
 export const getCommissionDetail = async (params) => {
   return await request.get({ url: '/admin-api/oa/user-salary-grant/detail', params })
 }
+
+// 发送工资条通知
+export const sendSalaryNotice = (data) => {
+  return request.post({ url: '/admin-api/oa/user-salary-grant/pushUserSalaryGrantDetail', data })
+}

src/api/okr/meeting.js

@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+export const createMeeting = (data) => {
+  return request.post({
+    url: '/admin-api/okr/meeting/add',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 修改
+export const updateMeeting = (data) => {
+  return request.put({
+    url: '/admin-api/okr/meeting/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+// 查询详情
+export const getMeetingDetail = (params) => {
+  return request.get({
+    url: '/admin-api/okr/meeting/get',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 取消会议
+export const cancelMeeting = (data) => {
+  return request.put({
+    url: '/admin-api/okr/meeting/cancel',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 分页查询
+export const getMeetingPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/meeting/page',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}

src/api/okr/okr.js

@@ -20,10 +20,10 @@ export const updateOkrNode = (data) => {
 }
 
 // 查询详情
-export const getOkrNodeDetail = (nodeId) => {
+export const getOkrNodeDetail = (params) => {
   return request.get({
     url: '/admin-api/okr/node/get',
-    params: { nodeId }
+    params
     // headers: { 'instance-id': 1016 }
   })
 }
@@ -108,3 +108,47 @@ export const getOkrRelationTreeChildren = (params) => {
     // headers: { 'instance-id': 1016 }
   })
 }
+
+// 获取我的组员
+export const getMyMemberList = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/my-members',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取我的组员节点树
+export const getMySonNodeTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/member/node/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取我的组员OKR列表
+export const getMySonOkrPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/member/objective/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取渠道
+export const getChannelOptions = () => {
+  return request.get({
+    url: '/admin-api/okr/node/source'
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取统计表中的合计信息
+export const getOkrStatisticsTotal = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/data/count',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}

src/api/system/dept/index.ts

@@ -13,8 +13,8 @@ export interface DeptVO {
 }
 
 // 查询部门（精简)列表
-export const getSimpleDeptList = async (): Promise<DeptVO[]> => {
-  return await request.get({ url: '/admin-api/system/dept/list-all-simple' })
+export const getSimpleDeptList = async (params: any): Promise<any[]> => {
+  return await request.get({ url: '/admin-api/system/dept/list-all-simple', params })
 }
 
 // 查询部门列表

src/permission.js

@@ -1,14 +1,14 @@
 import router from './router'
 import { isRelogin } from '@/config/axios/service'
-import { getAccessToken, removeToken } from '@/utils/auth'
+import { getAccessToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
-import { getTenantId, getAppId } from '@/utils/auth'
-import cache from '@/plugins/cache'
+import { useAppStoreWithOut } from '@/store/modules/app'
+import { getTenantId, getAppId, setTenantId, setAppId } from '@/utils/auth'
 
 const { start, done } = useNProgress()
 
@@ -20,58 +20,74 @@ const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/regis
 router.beforeEach(async (to, from, next) => {
   start()
   loadStart()
-  if (getAppId() && to.query?.appId && getAppId() != to.query?.appId) {
-    removeToken()
-    cache?.local?.delete('appInfo')
-    cache?.local?.delete('roleRouters')
-    cache?.local?.delete('user')
-    cache?.local?.delete('App_ID')
-    next(`/login?tenantId=${to.query?.tenantId}&appId=${to.query?.appId}`)
-  } else {
-    if (getAccessToken()) {
-      if (to.path === '/login') {
-        next({ path: '/' })
-      } else {
-        // 获取所有字典
-        const dictStore = useDictStoreWithOut()
-        const userStore = useUserStoreWithOut()
-        const permissionStore = usePermissionStoreWithOut()
-        if (!dictStore.getIsSetDict) {
-          await dictStore.setDictMap()
-        }
-        if (!userStore.getIsSetUser) {
-          isRelogin.show = true
-          await userStore.setUserInfoAction()
-          isRelogin.show = false
-          // 后端过滤菜单
-          await permissionStore.generateRoutes()
-          permissionStore.getAddRouters.forEach((route) => {
-            router.addRoute(route) // 动态添加可访问路由表
-          })
-          const redirectPath = from.query.redirect || to.path
-          const redirect = decodeURIComponent(redirectPath)
-          const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
-          next(nextData)
-        } else {
-          next()
-        }
+  const userStore = useUserStoreWithOut()
+  if (to.path == '/login') {
+    userStore.resetState() // 重置用户信息状态
+  }
+  if (getAccessToken()) {
+    if (to.path === '/login') {
+      if (to.query?.tenantId && to.query?.appId) {
+        setApp(to.query.tenantId, to.query.appId)
+        await waitTime(1500)
       }
+      next({ path: '/' })
     } else {
-      if (whiteList.indexOf(to.path) !== -1) {
+      // 获取所有字典
+      const dictStore = useDictStoreWithOut()
+      const permissionStore = usePermissionStoreWithOut()
+      if (!dictStore.getIsSetDict) {
+        await dictStore.setDictMap()
+      }
+      if (!userStore.getIsSetUser) {
+        isRelogin.show = true
+        await userStore.setUserInfoAction()
+        isRelogin.show = false
+        // 后端过滤菜单
+        await permissionStore.generateRoutes()
+        permissionStore.getAddRouters.forEach((route) => {
+          router.addRoute(route) // 动态添加可访问路由表
+        })
+        const redirectPath = from.query.redirect || to.path
+        const redirect = decodeURIComponent(redirectPath)
+        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        next(nextData)
+      } else {
         next()
+      }
+    }
+  } else {
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      const tenantId = getTenantId()
+      const appId = getAppId()
+      if (tenantId && appId) {
+        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
       } else {
-        const tenantId = getTenantId()
-        const appId = getAppId()
-        if (tenantId && appId) {
-          next(`/oa/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        } else {
-          next(`/oa/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        }
+        // next(`/login?redirect=${to.fullPath}`)
+        // 否则全部重定向到平台登陆页
+        window.location.href = 'https://cloud.ahduima.com/ss/login'
       }
     }
   }
 })
 
+async function waitTime(seconds) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve()
+    }, seconds)
+  })
+}
+
+function setApp(tenantId, appId) {
+  setTenantId(tenantId)
+
+  setAppId(appId)
+  const appStore = useAppStoreWithOut()
+  appStore.setAppInfo(appId)
+}
+
 router.afterEach((to) => {
   useTitle(to?.meta?.title)
   done() // 结束Progress

src/router/modules/remaining.ts

@@ -106,41 +106,29 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
-  {
-    path: '/Basic',
-    component: Layout,
-    name: 'Basic',
-    meta: {
-      title: '菜单管理'
-    },
-    redirect: '/Basic/menu',
-    children: [
-      {
-        path: 'menu',
-        component: () => import('@/views/Basic/Menu/index.vue'),
-        name: 'Menu',
-        meta: {
-          canTo: true,
-          // hidden: true,
-          noTagsView: false,
-          icon: 'ep:user',
-          title: '菜单管理'
-        }
-      },
-      {
-        path: 'okr',
-        component: () => import('@/views/OKR/Management/index.vue'),
-        name: 'OkrManagement',
-        meta: {
-          canTo: true,
-          // hidden: true,
-          noTagsView: false,
-          icon: 'ep:user',
-          title: 'Okr管理'
-        }
-      }
-    ]
-  },
+  // {
+  //   path: '/Basic',
+  //   component: Layout,
+  //   name: 'Basic',
+  //   meta: {
+  //     title: '菜单管理'
+  //   },
+  //   redirect: '/Basic/menu',
+  //   children: [
+  //     {
+  //       path: 'menu',
+  //       component: () => import('@/views/Basic/Menu/index.vue'),
+  //       name: 'Menu',
+  //       meta: {
+  //         canTo: true,
+  //         // hidden: true,
+  //         noTagsView: false,
+  //         icon: 'ep:user',
+  //         title: '菜单管理'
+  //       }
+  //     }
+  //   ]
+  // },
   {
     path: '/login',
     component: () => import('@/views/Login/Login.vue'),

src/router/modules/static.ts

@@ -0,0 +1,87 @@
+const staticRouter: AppCustomRouteRecordRaw[] = [
+  {
+    icon: 'ep:calendar',
+    path: '/Okr',
+    component: '',
+    name: 'OKR',
+    componentName: '',
+    redirect: '',
+    parentId: 0,
+    visible: true,
+    alwaysShow: true,
+    children: [
+      {
+        icon: 'ep:finished',
+        path: 'okr-management',
+        name: 'OKR管理',
+        componentName: 'OkrManagement',
+        component: 'OKR/Management/index',
+        visible: true,
+        alwaysShow: true,
+        meta: {
+          title: 'OKR管理'
+        },
+        redirect: ''
+      },
+      {
+        icon: 'ep:alarm-clock',
+        path: 'okr-wait',
+        name: '待办事项',
+        componentName: 'OkrWait',
+        component: 'OKR/Wait/index',
+        meta: {
+          title: '待办事项'
+        },
+        visible: true,
+        alwaysShow: true,
+        redirect: ''
+      },
+      {
+        icon: 'ep:data-line',
+        path: 'okr-analysis',
+        name: 'OKR统计',
+        componentName: 'OkrAnalysis',
+        component: 'OKR/Analysis/index',
+        meta: {
+          title: 'OKR统计'
+        },
+        visible: true,
+        alwaysShow: true,
+        redirect: ''
+      },
+      {
+        icon: 'ep:data-board',
+        path: 'okr-meeting',
+        name: '会议管理',
+        componentName: 'OkrMeeting',
+        component: 'OKR/Meeting/index',
+        meta: {
+          title: '会议管理'
+        },
+        visible: true,
+        alwaysShow: true,
+        redirect: ''
+      },
+      {
+        icon: 'ep:data-board',
+        path: 'okr-meeting-info/:id',
+        name: '会议详情',
+        componentName: 'MeetingInfo',
+        component: 'OKR/Meeting/MeetingInfo',
+        meta: {
+          title: '会议详情'
+        },
+        visible: false,
+        alwaysShow: true,
+        redirect: '',
+        keepAlive: true
+      }
+    ],
+    meta: {
+      title: 'OKR',
+      icon: 'ep:calendar'
+    }
+  }
+]
+
+export default staticRouter

src/store/modules/dict.ts

@@ -45,7 +45,7 @@ export const useDictStore = defineStore('dict', {
         this.dictMap = dictMap
         this.isSetDict = true
       } else {
-        const res = await listSimpleDictData()
+        const res = (await listSimpleDictData()) || []
         // 设置数据
         const dictDataMap = new Map<string, any>()
         res.forEach((dictData: DictDataVO) => {
@@ -75,7 +75,7 @@ export const useDictStore = defineStore('dict', {
     },
     async resetDict() {
       cache.session.delete(CACHE_KEY.DICT_CACHE)
-      const res = await listSimpleDictData()
+      const res = (await listSimpleDictData()) || []
       // 设置数据
       const dictDataMap = new Map<string, any>()
       res.forEach((dictData: DictDataVO) => {

src/store/modules/permission.ts

@@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
+import staticRouter from '@/router/modules/static'
 import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
 import { CACHE_KEY } from '@/hooks/web/useCache'
 
@@ -37,6 +38,25 @@ export const usePermissionStore = defineStore('permission', {
         if (cache.local.get(CACHE_KEY.ROLE_ROUTERS)) {
           res = cache.local.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
         }
+        const staticRouters = cloneDeep(staticRouter)
+        // 与动态路由比较，首先判断目录是否存在，如果存在就合并，并替换动态路由中的目录
+        staticRouters.forEach((item) => {
+          const index = res.findIndex((item2) => item2.path === item.path)
+          if (index !== -1) {
+            const arr = []
+            if (!item.children || item.children.length === 0) {
+              item.children = arr
+            }
+            if (res[index].children && res[index].children.length > 0) {
+              item.children = item.children.concat(res[index].children)
+            }
+            // routerMap[index].children = item.children
+            // 插入动态路由数组的第二位
+            res[index] = { ...res, ...item }
+          } else {
+            res = [...staticRouters, ...res]
+          }
+        })
         const routerMap: AppRouteRecordRaw[] = generateRoute(res)
         // 动态路由，404一定要放到最后面
         this.addRouters = routerMap.concat([
@@ -50,6 +70,7 @@ export const usePermissionStore = defineStore('permission', {
             }
           }
         ])
+
         // 渲染菜单的所有路由
         this.routers = cloneDeep(remainingRouter).concat(routerMap)
         resolve()

src/store/modules/user.ts

@@ -63,7 +63,7 @@ export const useUserStore = defineStore('admin-user', {
     async loginOut() {
       await loginOut()
       removeToken()
-      cache.local.clear()
+      // cache.local.clear()
       this.resetState()
     },
     resetState() {
@@ -75,6 +75,7 @@ export const useUserStore = defineStore('admin-user', {
         avatar: '',
         nickname: ''
       }
+      cache.local.delete(CACHE_KEY.USER)
     },
     refresh() {
       cache.local.delete(CACHE_KEY.USER)

src/styles/index.scss

@@ -98,3 +98,12 @@
 .el-input__inner[type='number'] {
   -moz-appearance: textfield;
 }
+.el-drawer__header {
+  padding: 16px 16px 8px 16px !important;
+  margin: 0 !important;
+  line-height: 24px !important;
+  font-size: 18px !important;
+  color: #303133 !important;
+  box-sizing: border-box !important;
+  // border-bottom: 1px solid #e8e8e8 !important;
+}

src/utils/auth.ts

@@ -9,26 +9,34 @@ const RefreshTokenKey = 'REFRESH_TOKEN'
 // 获取token
 export const getAccessToken = () => {
   // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return cache.local.get(AccessTokenKey)
-    ? cache.local.get(AccessTokenKey)
-    : cache.local.get('ACCESS_TOKEN')
+  return localStorage.getItem(AccessTokenKey)
+    ? localStorage.getItem(AccessTokenKey)
+    : localStorage.getItem('ACCESS_TOKEN')
+  // return cache.local.get(AccessTokenKey)
+  //   ? cache.local.get(AccessTokenKey)
+  //   : cache.local.get('ACCESS_TOKEN')
 }
 
 // 刷新token
 export const getRefreshToken = () => {
-  return cache.local.get(RefreshTokenKey)
+  return localStorage.getItem(RefreshTokenKey)
+  // return cache.local.get(RefreshTokenKey)
 }
 
 // 设置token
 export const setToken = (token: TokenType) => {
-  cache.local.set(RefreshTokenKey, token.refreshToken)
-  cache.local.set(AccessTokenKey, token.accessToken)
+  localStorage.setItem(AccessTokenKey, token.accessToken)
+  localStorage.setItem(RefreshTokenKey, token.refreshToken)
+  // cache.local.set(RefreshTokenKey, token.refreshToken)
+  // cache.local.set(AccessTokenKey, token.accessToken)
 }
 
 // 删除token
 export const removeToken = () => {
-  cache.local.delete(AccessTokenKey)
-  cache.local.delete(RefreshTokenKey)
+  localStorage.removeItem(AccessTokenKey)
+  localStorage.removeItem(RefreshTokenKey)
+  // cache.local.delete(AccessTokenKey)
+  // cache.local.delete(RefreshTokenKey)
 }
 
 /** 格式化token（jwt格式） */

src/utils/index.ts

@@ -220,3 +220,30 @@ export const removeNullField = (obj: Object) => {
   }
   return obj
 }
+
+import * as XLSX from 'xlsx'
+import * as FileSaver from 'file-saver'
+export const exportTableWithVue = (domId: any, fileName: String) => {
+  // const XLSX = require('xlsx')
+  // 使用 this.$nextTick 是在dom元素都渲染完成之后再执行
+  // this.$nextTick(function () {
+  // 设置导出的内容是否只做解析，不进行格式转换     false：要解析， true:不解析
+  const xlsxParam = { raw: true }
+  const wb = XLSX.utils.table_to_book(document.querySelector(domId), xlsxParam)
+
+  const wbout = XLSX.write(wb, {
+    bookType: 'xlsx',
+    bookSST: true,
+    type: 'array'
+  })
+  try {
+    // 下载保存文件
+    FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), `${fileName}.xlsx`)
+  } catch (e) {
+    if (typeof console !== 'undefined') {
+      console.log(e, wbout)
+    }
+  }
+  return wbout
+  // });
+}

src/views/Basic/Dept/DeptForm.vue

@@ -30,7 +30,12 @@
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
           <el-form-item label="负责人" prop="leaderUserId">
-            <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
+            <el-select
+              v-model="formData.leaderUserId"
+              clearable
+              filterable
+              placeholder="请输入负责人"
+            >
               <el-option
                 v-for="item in employeeOptions"
                 :key="item.id"
@@ -57,17 +62,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" :offset="0">
-          <el-form-item label="开通系统" prop="instanceIds">
+          <el-form-item label="业务系统" prop="instanceId">
             <el-select
-              v-model="formData.instanceIds"
-              placeholder="选择开通系统"
-              multiple
-              collapse-tags
+              v-model="formData.instanceId"
+              placeholder="选择主业务系统"
               clearable
               filterable
             >
               <el-option
-                v-for="item in instanceIdsOptions"
+                v-for="item in instanceIdOptions"
                 :key="item.instanceId"
                 :label="item.instanceName"
                 :disabled="item.status == 1"
@@ -105,16 +108,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  parentId: undefined,
-  name: undefined,
-  sort: 1,
-  leaderUserId: undefined,
-  status: CommonStatusEnum.ENABLE,
-  remark: undefined,
-  instanceIds: undefined
-})
+const formData = ref<any>({})
 const formRules = reactive<any>({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
@@ -128,7 +122,7 @@ const formRules = reactive<any>({
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
 const employeeOptions = ref<any>([]) // 用户列表
-const instanceIdsOptions = ref<any>([]) // 实例ids
+const instanceIdOptions = ref<any>([]) // 实例ids
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -141,6 +135,7 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await DeptApi.getDept(id)
+      formData.value.remark = formData.value.remark || ''
     } finally {
       formLoading.value = false
     }
@@ -151,7 +146,7 @@ const open = async (type: string, id?: number) => {
   })
   //实例
   getSimpleAppList().then((data) => {
-    instanceIdsOptions.value = data
+    instanceIdOptions.value = data
   })
   // 获得部门树
   await getTree()
@@ -194,7 +189,7 @@ const resetForm = () => {
     leaderUserId: undefined,
     status: CommonStatusEnum.ENABLE,
     remark: undefined,
-    instanceIds: undefined
+    instanceId: undefined
   }
   formRef.value?.resetFields()
 }
@@ -202,7 +197,7 @@ const resetForm = () => {
 /** 获得部门树 */
 const getTree = async () => {
   deptTree.value = []
-  const data = await DeptApi.getSimpleDeptList()
+  const data = await DeptApi.getSimpleDeptList({ allFlag: true })
   let dept: Tree = { id: 0, name: '顶级部门', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)

src/views/Basic/Dept/index.vue

@@ -22,7 +22,7 @@
   <el-table v-loading="loading" :data="list" row-key="id" default-expand-all border>
     <el-table-column prop="name" label="部门名称" />
     <el-table-column prop="leaderUserName" label="负责人" width="120" />
-    <el-table-column prop="instanceNames" label="业务系统" width="200" />
+    <el-table-column prop="instanceName" label="业务系统" width="200" />
     <el-table-column prop="sort" label="排序" width="80" />
     <el-table-column prop="status" label="状态" width="100">
       <template #default="scope">
@@ -68,6 +68,7 @@ const { t } = useI18n() // 国际化
 const loading = ref(true) // 列表的加载中
 const list = ref() // 列表的数据
 const queryParams = reactive({
+  allFlag: true,
   name: undefined
 })
 const queryFormRef = ref() // 搜索的表单

src/views/Basic/User/UserForm.vue

@@ -13,7 +13,7 @@
             <el-input v-model="formData.nickname" placeholder="请输入用户姓名" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="用户性别">
             <el-radio-group v-model="formData.sex">
               <el-radio :value="1"> 男 </el-radio>
@@ -34,7 +34,7 @@
               placeholder="请选择归属部门"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item label="角色" prop="role">
             <el-select
@@ -84,7 +84,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12" :offset="0">
           <el-form-item label="入职日期" prop="hireDate">
             <el-date-picker
@@ -96,7 +96,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注">
@@ -113,7 +113,8 @@
 </template>
 <script lang="ts" name="SystemUserForm" setup>
 import { CommonStatusEnum } from '@/utils/constants'
-import { defaultProps, handleTree } from '@/utils/tree'
+// import { defaultProps, handleTree } from '@/utils/tree'
+import { handleTree } from '@/utils/tree'
 import { formatDate } from '@/utils/formatTime'
 
 import * as RoleApi from '@/api/system/role'
@@ -174,7 +175,7 @@ const open = async (type: string, id?: number) => {
     }
   }
   // 加载部门树
-  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList({ allFlag: false }))
   // 加载岗位列表
   roleOptions.value = await RoleApi.getSimpleRoleList()
 }

src/views/Basic/User/index.vue

@@ -1,105 +1,100 @@
 <template>
-  <el-row :gutter="20">
-    <!-- 左侧部门树 -->
-    <el-col :span="4" :xs="24">
+  <!-- <el-row :gutter="20"> -->
+  <!-- 左侧部门树 -->
+  <!-- <el-col :span="4" :xs="24">
       <DeptTree @node-click="handleDeptNodeClick" />
     </el-col>
-    <el-col :span="20" :xs="24">
-      <!-- 搜索 -->
-      <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
-        <el-form-item label="姓名" prop="nickname">
-          <el-input
-            v-model="queryParams.nickname"
-            placeholder="请输入姓名"
-            clearable
-            @keyup.enter="handleQuery"
-            class="!w-240px"
-          />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="mobile">
-          <el-input
-            v-model="queryParams.mobile"
-            placeholder="请输入手机号码"
-            clearable
-            @keyup.enter="handleQuery"
-            class="!w-240px"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
-          <el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
-          <el-button
-            type="primary"
-            plain
-            @click="openForm('create')"
-            v-hasPermi="['basic:employee:add']"
-          >
-            新增
-          </el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" :data="list">
-        <el-table-column label="用户编号" key="id" prop="id" />
-        <el-table-column label="登录账号" prop="username" />
-        <el-table-column label="用户姓名" prop="nickname" />
-        <el-table-column label="部门" key="deptName" prop="deptName" />
-        <el-table-column label="手机号码" prop="mobile" width="120" />
-        <el-table-column label="状态" key="status">
-          <template #default="scope">
-            <el-switch
-              v-model="scope.row.status"
-              :active-value="0"
-              :inactive-value="1"
-              active-text="在职"
-              inactive-text="离职"
-              v-hasPermi="['basic:employee:update']"
-              @change="handleStatusChange(scope.row)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="createTime"
-          width="180"
-          :formatter="dateFormatter"
-        />
-        <el-table-column label="操作" width="260">
-          <template #default="scope">
-            <el-button
-              type="primary"
-              link
-              @click="openForm('update', scope.row.id)"
-              v-hasPermi="['basic:employee:update']"
-            >
-              修改
-            </el-button>
-            <el-button
-              type="primary"
-              link
-              @click="handleDelete(scope.row.id)"
-              v-hasPermi="['basic:employee:delete']"
-            >
-              删除
-            </el-button>
-            <el-button
-              type="primary"
-              link
-              @click="handleResetPwd(scope.row)"
-              v-hasPermi="['basic:employee:password']"
-            >
-              重置密码
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getList"
+    <el-col :span="20" :xs="24"> -->
+  <!-- 搜索 -->
+  <el-form :model="queryParams" ref="queryFormRef" inline label-width="0">
+    <el-form-item prop="nickname">
+      <el-input
+        v-model="queryParams.nickname"
+        placeholder="请输入姓名"
+        clearable
+        @keyup.enter="handleQuery"
+        class="!w-240px"
       />
-    </el-col>
-  </el-row>
+    </el-form-item>
+    <el-form-item prop="mobile">
+      <el-input
+        v-model="queryParams.mobile"
+        placeholder="请输入手机号码"
+        clearable
+        @keyup.enter="handleQuery"
+        class="!w-240px"
+      />
+    </el-form-item>
+    <el-form-item>
+      <el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
+      <el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
+      <el-button
+        type="primary"
+        plain
+        @click="openForm('create')"
+        v-hasPermi="['basic:employee:add']"
+      >
+        新增
+      </el-button>
+    </el-form-item>
+  </el-form>
+  <el-table v-loading="loading" :data="list">
+    <el-table-column label="用户编号" key="id" prop="id" />
+    <el-table-column label="登录账号" prop="username" />
+    <el-table-column label="用户姓名" prop="nickname" />
+    <!-- <el-table-column label="部门" key="deptName" prop="deptName" /> -->
+    <el-table-column label="手机号码" prop="mobile" width="120" />
+    <el-table-column label="状态" key="status">
+      <template #default="scope">
+        <el-switch
+          v-model="scope.row.status"
+          :active-value="0"
+          :inactive-value="1"
+          active-text="在职"
+          inactive-text="离职"
+          v-hasPermi="['basic:employee:update']"
+          @change="handleStatusChange(scope.row)"
+        />
+      </template>
+    </el-table-column>
+    <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
+    <el-table-column label="操作" width="260">
+      <template #default="scope">
+        <el-button
+          type="primary"
+          link
+          @click="openForm('update', scope.row.id)"
+          v-hasPermi="['basic:employee:update']"
+        >
+          修改
+        </el-button>
+        <el-button
+          type="primary"
+          link
+          @click="handleDelete(scope.row.id)"
+          v-hasPermi="['basic:employee:delete']"
+        >
+          删除
+        </el-button>
+        <el-button
+          type="primary"
+          link
+          @click="handleResetPwd(scope.row)"
+          v-hasPermi="['basic:employee:password']"
+        >
+          重置密码
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  <Pagination
+    :total="total"
+    v-model:page="queryParams.pageNo"
+    v-model:limit="queryParams.pageSize"
+    @pagination="getList"
+  />
+  <!-- </el-col> -->
+  <!-- </el-row> -->
 
   <!-- 添加或修改用户对话框 -->
   <UserForm ref="formRef" @success="getList" />
@@ -109,7 +104,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import { dateFormatter } from '@/utils/formatTime'
 import * as UserApi from '@/api/system/user'
 import UserForm from './UserForm.vue'
-import DeptTree from './DeptTree.vue'
+// import DeptTree from './DeptTree.vue'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -150,11 +145,11 @@ const resetQuery = () => {
   handleQuery()
 }
 
-/** 处理部门被点击 */
-const handleDeptNodeClick = async (row) => {
-  queryParams.deptId = row.id
-  await getList()
-}
+// /** 处理部门被点击 */
+// const handleDeptNodeClick = async (row) => {
+//   queryParams.deptId = row.id
+//   await getList()
+// }
 
 /** 添加/修改操作 */
 const formRef = ref()

src/views/Home/Index.vue

@@ -1,7 +1,96 @@
 <template>
-  <div> 首页 </div>
+  <div>
+    <el-card shadow="never">
+      <el-skeleton :loading="loading" animated>
+        <el-row :gutter="20" justify="space-between">
+          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+            <div class="flex items-center">
+              <img :src="avatar" alt="" class="w-40px h-40px rounded-[50%] mr-20px" />
+              <div class="text-20px text-700">
+                {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
+              </div>
+            </div>
+          </el-col>
+          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+            <div class="flex h-40px items-center justify-end <sm:mt-10px">
+              <div
+                class="px-8px text-right"
+                @click="router.push({ path: '/Okr/okr-wait', query: { type: 1 } })"
+              >
+                <div class="text-14px text-red-600 mb-20px">今日待办</div>
+                <CountTo
+                  class="text-20px number-font"
+                  :start-val="0"
+                  :end-val="waitCount.dayEndAgentWorkNum"
+                  :duration="2600"
+                />
+              </div>
+              <el-divider direction="vertical" border-style="dashed" />
+              <div
+                class="px-8px text-right"
+                @click="router.push({ path: '/Okr/okr-wait', query: { type: 2 } })"
+              >
+                <div class="text-14px text-gray-400 mb-20px">我的待办</div>
+                <CountTo
+                  class="text-20px number-font"
+                  :start-val="0"
+                  :end-val="waitCount.myAgentWorkNum"
+                  :duration="2600"
+                />
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-skeleton>
+    </el-card>
+  </div>
 </template>
+<script setup lang="ts" name="Home">
+import { useUserStore } from '@/store/modules/user'
+import avatarImg from '@/assets/imgs/avatar.gif'
+import { getWaitCount } from '@/api/okr/wait'
 
-<script setup name="Home"></script>
+const { t } = useI18n()
+const userStore = useUserStore()
+const router = useRouter() // 路由对象
+const loading = ref(false)
+const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg
+const username = userStore.getUser.nickname
 
-<style lang="scss" scoped></style>
+function getWaitTargetCount() {
+  getWaitCount({}).then((res) => {
+    waitCount.value = res
+  })
+}
+
+const waitCount = ref({
+  dayEndAgentWorkNum: 0,
+  myAgentWorkNum: 0,
+  urgeAgentWorkNum: 0,
+  notifyNum: 0
+})
+
+const getAllApi = async () => {
+  await getWaitTargetCount()
+  loading.value = false
+}
+
+onMounted(() => {
+  getAllApi()
+})
+</script>
+
+<style lang="scss" scoped>
+@font-face {
+  font-family: numberFont;
+  src: url('@/assets/fonts/DISPLAY FREE TFB.ttf');
+}
+
+.number-font {
+  font-family: numberFont !important;
+}
+
+:deep(.el-card__header) {
+  padding: 10px;
+}
+</style>

src/views/Home/Salary/index.vue

@@ -308,9 +308,24 @@
             <span v-if="row.status == 0">封存</span>
             <span v-else-if="row.status == 1">已封存</span>
           </el-button>
-          <el-button type="primary" v-if="row.grantId" text @click="handleDetail(row)">
+          <el-button
+            type="primary"
+            v-if="row.grantId"
+            style="padding: 0"
+            text
+            @click="handleDetail(row)"
+          >
             提成明细
           </el-button>
+          <el-button
+            type="primary"
+            text
+            v-hasPermi="['home:salary:send']"
+            style="padding: 0"
+            @click="handelSendNotic(row)"
+          >
+            发送工资条
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -468,6 +483,20 @@ async function handleDetail(row) {
     console.log(error)
   }
 }
+
+function handelSendNotic(row) {
+  const name = row.grantId ? row.name : row.period
+  const params = row.grantId ? { grantId: row.grantId } : { period: row.period }
+  message.confirm('确认要发送"' + name + '"工资条吗?').then(async () => {
+    try {
+      await SalaryApi.sendSalaryNotice(params)
+      message.success('发送成功！')
+    } catch (error) {
+      message.error(error)
+      console.log(error)
+    }
+  })
+}
 </script>
 
 <style lang="scss" scoped>

src/views/Kpi/Appraise/Components/DialogAppraise.vue

@@ -12,7 +12,7 @@
             <el-date-picker
               v-model="form.effectiveDate"
               type="date"
-              :disabled="form.id"
+              :disabled="!!form.id"
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
               placeholder="选择日期时间"

src/views/OKR/Analysis/index.vue

@@ -0,0 +1,602 @@
+<template>
+  <div>
+    <el-row class="mb-10px flex justify-between items-start">
+      <el-tree-select
+        v-model="searchForm.nodeId"
+        :data="peroidList"
+        :props="defaultProps"
+        :render-after-expand="false"
+        :default-expand-all="false"
+        check-strictly
+        style="width: 300px"
+        @change="nodeChange"
+      />
+      <div class="flex justify-end flex-1">
+        <el-button type="info" @click="handleExport">导出</el-button>
+        <el-popover
+          ref="countRef"
+          placement="left"
+          :title="`${currentNode?.nodeName} 数据汇总`"
+          trigger="click"
+          width="500px"
+          v-model:visible="showCountPop"
+        >
+          <template #reference><el-button>数据汇总</el-button></template>
+          <el-table :data="countInfo" stripe>
+            <el-table-column prop="keyResultShowName" label="项目名称" />
+            <el-table-column prop="currentValue" label="当前值" width="90" />
+            <el-table-column prop="targetValue" label="预期值" width="90" />
+            <el-table-column label="完成度" width="150">
+              <template #default="{ row }">
+                <el-progress
+                  :percentage="parseInt((row.currentValue / row.targetValue) * 100) || 0"
+                  :color="customColors"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-popover>
+        <el-button type="primary" @click="openDrawer(1, currentNode.nodeId, currentNode.nodeName)">
+          节点笔谈
+        </el-button>
+      </div>
+    </el-row>
+
+    <el-table
+      id="okrAnalysisTable"
+      :data="originList"
+      border
+      :span-method="objectSpanMethod"
+      :show-summary="!!tableKeywords"
+      @cell-click="handleClickCell"
+    >
+      <el-table-column prop="objectInfo.objectiveName" label="目标">
+        <template #default="{ row }">
+          {{ row.objectInfo.objectiveName }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="objectiveId" label="占比" width="100px">
+        <template #default> 0 </template>
+      </el-table-column> -->
+      <el-table-column prop="keyResultShowName">
+        <template #header>
+          <div class="flex items-center justify-center">
+            <div class="flex-1 mr-10px">
+              <el-input
+                v-if="showTableSearch"
+                v-model="tableKeywords"
+                placeholder="请输入关键字"
+                size="small"
+                style="width: 100%"
+                clearable
+                @change="handleTableFilter"
+              />
+              <div v-else>关键成果</div>
+            </div>
+            <el-button type="primary" size="small" @click="handleFilterTableClick">
+              {{ showTableSearch ? '取消' : '筛选' }}
+            </el-button>
+          </div>
+        </template>
+        <template #default="{ row }">
+          {{ row.sourceName ? `【${row.sourceName}】` : '' }} {{ row.keyResultShowName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="targetValue" label="目标值" width="100px" />
+      <el-table-column prop="currentValue" label="当前进度" width="100px" />
+      <el-table-column label="开始日期" width="120px">
+        <template #default>
+          {{ currentNode.startTime }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="完成状态" width="100px">
+        <template #default="{ row }">
+          <el-tag v-if="row.currentValue >= row.targetValue" type="success">完成</el-tag>
+          <el-tag v-else type="danger">未完成</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="muis" label="差值" width="100px">
+        <template #default="{ row }">
+          <span
+            :style="{
+              color: row.targetValue >= row.currentValue ? 'red' : '#333',
+              'font-weight': row.targetValue >= row.currentValue ? 'bold' : '500'
+            }"
+          >
+            {{ parseInt(row.targetValue - row.currentValue) }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="complete" label="完成度" width="200px">
+        <template #default="{ row }">
+          <el-progress :percentage="parseInt(row.progress)" :color="customColors" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="endTime" label="结束日期" width="120px">
+        <template #default>
+          {{ currentNode.endTime }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="objectInfo.progress" label="目标完成度" width="100px" align="center">
+        <template #default="{ row }">
+          {{ parseInt(row.objectInfo.progress) }}%
+          <!-- <el-progress :percentage="parseInt(row.objectInfo.progress)" :color="customColors" /> -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-drawer
+      v-if="showDrawer"
+      v-model="showDrawer"
+      :title="drawerTitle"
+      size="60vw"
+      direction="rtl"
+      append-to-body
+      destroy-on-close
+    >
+      <el-tabs v-model="currentType" @tab-click="searchCommentList()">
+        <el-tab-pane
+          v-for="item in commentTypeOptions"
+          :key="item.id"
+          :label="item.label"
+          :name="item.id"
+        >
+          <div v-if="item.id == currentType">
+            <div v-if="addNewComment">
+              <div class="flex justify-between items-center">
+                <div>
+                  <el-button size="small" @click="addNewComment = false"> 取消 </el-button>
+                  <el-button type="primary" size="small" @click="handleSaveComment">
+                    发布
+                  </el-button>
+                </div>
+              </div>
+              <div class="mt-10px" v-if="addNewComment">
+                <Editor
+                  v-model:modelValue="form.commentValue"
+                  height="300px"
+                  :toolbarConfig="toolbarConfig"
+                />
+              </div>
+            </div>
+            <el-button v-else type="primary" size="small" @click="handleInsertComment">
+              新增
+            </el-button>
+            <div
+              v-for="(it, index) in commentList"
+              :key="it.commentId"
+              class="border-b-1"
+              style="padding: 10px 5px"
+            >
+              <div
+                class="flex items-center justify-between overflow-hidden text-16px"
+                style="line-height: 30px"
+              >
+                <div class="flex items-center">
+                  <el-avatar
+                    shape="circle"
+                    style="
+                      background-color: var(--el-color-primary-light-3);
+                      width: 30px;
+                      height: 30px;
+                    "
+                    fit="fill"
+                  >
+                    <span class="text-12px">{{ it.creatorName.slice(-2) }}</span>
+                  </el-avatar>
+                  <div class="ml-10px text-16px">{{ it.creatorName }}</div>
+                </div>
+              </div>
+              <div class="ml-10px" v-dompurify-html="it.content"></div>
+              <div
+                class="ml-10px mt-10px flex items-center justify-between text-12px"
+                style="line-height: 20px; color: #aaa"
+              >
+                <div class="flex items-center">
+                  <div class="flex items-center mr-50px">
+                    <el-button link @click="good(it)">
+                      <Icon
+                        icon="fa:thumbs-o-up"
+                        :size="16"
+                        :color="it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'"
+                      />
+                    </el-button>
+                    <span
+                      class="ml-5px"
+                      :style="{
+                        color: it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'
+                      }"
+                      >{{ it.likeCount }}</span
+                    >
+                  </div>
+                  <div class="flex items-center mr-50px">
+                    <el-button link @click="showChildComment(index)">
+                      <Icon icon="ep:chat-dot-square" :size="16" color="#333" />
+                    </el-button>
+                    <span class="ml-5px" style="color: #333">{{ it.commentCount }}</span>
+                  </div>
+                </div>
+                <div class="ml-10px text-13px text-gray-400">
+                  {{ formatDate(it.createTime, 'YYYY-MM-DD HH:mm') }}
+                </div>
+              </div>
+              <!-- 评论 -->
+              <div
+                v-if="showCommentIndex == index"
+                class="bg-gray-100 pl-10px pr-10px pt-5px pb-5px"
+                style="margin: 10px 10px 0 10px; border-radius: 4px"
+                label="笔谈"
+              >
+                <div
+                  v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
+                  :key="subComment.commentId"
+                  class="text-14px"
+                  style="line-height: 24px"
+                >
+                  <span class="font-bold">{{ subComment.creatorName }}：</span>
+                  <span>
+                    {{ subComment.content }}
+                  </span>
+                </div>
+                <div class="mt-10px relative">
+                  <!-- <el-input
+                        v-model="form.commentValue"
+                        placeholder="请输入评论"
+                        type="textarea"
+                        :autosize="{ minRows: 4 }"
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                      /> -->
+                  <el-mention
+                    v-model="form.commentValue"
+                    type="textarea"
+                    :autosize="{ minRows: 4 }"
+                    :options="employeeOptions"
+                    style="width: 100%"
+                    size="small"
+                    whole
+                    placeholder="请输入内容"
+                    @select="handleMention"
+                  >
+                    <template #label="scope">
+                      <div class="flex items-center justify-between h-full">
+                        <span class="text-14px text-dark-700">{{ scope.item.name }}</span>
+                        <span class="text-12px text-gray-400">{{ scope.item.dept }}</span>
+                      </div>
+                    </template>
+                  </el-mention>
+                  <el-button
+                    type="primary"
+                    size="small"
+                    style="position: absolute; right: 2px; bottom: 2px"
+                    @click="handleSendCommnet(index)"
+                  >
+                    发布
+                  </el-button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-drawer>
+  </div>
+</template>
+
+<script setup name="Analysis">
+import { listToTree, findNode } from '@/utils/tree'
+import { formatDate } from '@/utils/formatTime'
+import { getAllNodeTree, getAllOkrPage, getOkrStatisticsTotal } from '@/api/okr/okr'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+import { cloneDeep } from 'lodash-es'
+import {
+  getCommentTypeOptions,
+  createComment,
+  getCommentPage,
+  likeComment
+} from '@/api/okr/comment'
+import { exportTableWithVue } from '@/utils'
+
+const message = useMessage()
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+const searchForm = ref({
+  nodeId: undefined
+})
+
+const currentNode = ref(undefined)
+const showDrawer = ref(false)
+const drawerTitle = ref('详情')
+
+const customColors = [
+  { color: 'rgb(196, 86.4, 86.4)', percentage: 20 },
+  { color: 'rgb(196, 86.4, 86.4)', percentage: 40 },
+  { color: 'rgb(237.5, 189.9, 118.5)', percentage: 60 },
+  { color: 'rgb(159.5, 206.5, 255)', percentage: 80 },
+  { color: 'rgb(179, 224.5, 156.5)', percentage: 100 }
+]
+
+const peroidList = ref([])
+
+const showTableSearch = ref(false)
+const tableKeywords = ref('')
+
+handleSearchPeroid()
+getOptions()
+
+// 当前是否是叶子节点
+// 如果不是叶子节点，则表格数据不可修改
+const isCurrentLeafNode = ref(false)
+
+function handleSearchPeroid() {
+  getAllNodeTree().then((resp) => {
+    if (resp.nodeId) {
+      peroidList.value = listToTree(resp?.tree || [], {
+        id: 'nodeId',
+        pid: 'parentId',
+        children: 'children'
+      })
+      nodeChange(resp.nodeId)
+      currentNode.value = (resp.tree || []).find((item) => item.nodeId === resp.nodeId)
+    } else {
+      message.warning('请先创建节点数据')
+    }
+  })
+}
+const showCountPop = ref(false)
+function nodeChange(nodeId) {
+  if (nodeId) {
+    showTableSearch.value = false
+    tableKeywords.value = ''
+    searchForm.value.nodeId = nodeId
+    getOkrList()
+    getCountInfo()
+    currentNode.value = findNode(peroidList.value, (node) => {
+      return node.nodeId == nodeId
+    })
+    searchForm.value.creatorId = currentNode.value.creatorId
+    if (!currentNode.value.children || currentNode.value.children.length == 0) {
+      isCurrentLeafNode.value = true
+    } else {
+      isCurrentLeafNode.value = false
+    }
+  }
+}
+
+const originList = ref([])
+const defaultTableList = ref([])
+const spanObj = ref([])
+function getOkrList() {
+  getAllOkrPage(searchForm.value).then((resp) => {
+    originList.value = []
+    spanObj.value = []
+    if (resp && resp.length) {
+      resp.map((o) => {
+        if (o.keyResults && o.keyResults.length) {
+          const arr = o.keyResults.map((k, index) => {
+            spanObj.value.push(index == 0 ? o.keyResults.length : 0)
+            const obj = cloneDeep(o)
+            delete obj.keyResults
+            return {
+              ...k,
+              objectInfo: obj
+            }
+          })
+          originList.value = [...originList.value, ...arr]
+        }
+      })
+      defaultTableList.value = [...originList.value]
+    }
+  })
+}
+
+const countInfo = ref([])
+function getCountInfo() {
+  getOkrStatisticsTotal({ nodeId: searchForm.value.nodeId }).then(async (resp) => {
+    countInfo.value = resp || []
+    // await nextTick(() =)
+    showCountPop.value = true
+  })
+}
+
+function objectSpanMethod({ column, rowIndex }) {
+  if (['目标', '目标完成度'].includes(column.label)) {
+    let _row = spanObj.value[rowIndex]
+    let _col = _row > 0 ? 1 : 0
+    return {
+      rowspan: _row,
+      colspan: _col
+    }
+  }
+}
+
+function handleClickCell(row, column) {
+  if (column.property === 'keyResultShowName') {
+    openDrawer(2, row.keyResultId, `${row.sourceName} ${row.keyResultShowName}`)
+  } else if (column.property === 'objectInfo.objectiveName') {
+    openDrawer(3, row.objectInfo.objectiveId, row.objectInfo.objectiveName)
+  }
+}
+
+const commentTypeOptions = ref([])
+const currentType = ref(1) // 默认评论类型为1
+function getOptions() {
+  getCommentTypeOptions().then((resp) => {
+    commentTypeOptions.value = (resp || []).sort((pre, cur) => pre.sort - cur.sort)
+    currentType.value = resp[0].id
+  })
+  getEmployeeSimpleList({ status: 0 }).then((resp) => {
+    employeeOptions.value = resp.map((item) => ({
+      ...item,
+      label: item.name,
+      value: item.name
+    }))
+  })
+}
+
+const commentList = ref([])
+const commentInfo = ref({
+  businessType: undefined,
+  businessId: undefined,
+  commentType: undefined,
+  pageSize: -1
+})
+function openDrawer(type, id, name) {
+  showDrawer.value = true
+  drawerTitle.value = `【${name}】笔谈`
+  commentInfo.value = {
+    businessType: type,
+    businessId: id,
+    commentType: currentType.value,
+    pageSize: -1
+  }
+  searchCommentList()
+}
+
+function searchCommentList() {
+  commentInfo.value.commentType = currentType.value
+  getCommentPage(commentInfo.value).then((resp) => {
+    // commentList.value = resp.list
+    commentList.value = listToTree(resp.list, {
+      id: 'commentId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+}
+
+const showCommentIndex = ref(-1)
+function showChildComment(index) {
+  showCommentIndex.value = showCommentIndex.value == index ? -1 : index
+}
+
+function good(item) {
+  likeComment(item.commentId).then(() => {
+    message.success('点赞成功')
+    searchCommentList()
+  })
+}
+
+const form = ref({
+  commentValue: '',
+  mentionedUserIdList: []
+})
+const employeeOptions = ref([])
+
+function handleMention(item) {
+  form.value.mentionedUserIdList.push(item.id)
+}
+
+function handleSendCommnet(idx) {
+  try {
+    // 过滤掉删除的用户，方式为遍历mentionedUserIdList，查找评论中是否有对应的用户名
+    const userList = [...form.value.mentionedUserIdList]
+    const arr = []
+    userList.map((item) => {
+      if (form.value.commentValue.indexOf(`@${item.name}`) != -1) {
+        arr.push(item.id)
+        // 然后移除对应的用户名，防止有多个
+        form.value.commentValue = form.value.commentValue.replace(`@${item.name}`, '')
+      }
+    })
+    const data = {
+      businessType: commentInfo.value.businessType,
+      businessId: commentInfo.value.businessId,
+      commentType: currentType.value,
+      content: form.value.commentValue,
+      mentionedUserIdList: arr,
+      parentId: commentList.value[idx].commentId
+    }
+    createComment(data)
+      .then(() => {
+        message.success('创建成功')
+        searchCommentList()
+      })
+      .finally(() => {
+        form.value.commentValue = ''
+      })
+  } catch (error) {
+    console.log(error)
+    message.error('创建失败')
+  }
+}
+
+const addNewComment = ref(false)
+function handleInsertComment() {
+  addNewComment.value = true
+  form.value.commentValue = commentTypeOptions.value.find(
+    (item) => item.id == currentType.value
+  ).remark
+}
+
+const toolbarConfig = {
+  toolbarKeys: [
+    'bold', // 加粗
+    'underline', // 下划线
+    'italic', // 斜体
+    'color', // 文字颜色
+    'bgColor', // 背景色
+    'fontSize', // 字号
+    'bulletedList', // 无序列表
+    'numberedList', // 有序列表
+    'insertTable', // 插入表格
+    'insertLink', // 插入链接
+    'undo' // 撤销
+  ]
+}
+
+function handleSaveComment() {
+  addNewComment.value = false
+  try {
+    const data = {
+      businessType: commentInfo.value.businessType,
+      businessId: commentInfo.value.businessId,
+      commentType: currentType.value,
+      content: form.value.commentValue,
+      mentionedUserIdList: form.value.mentionedUserIdList
+    }
+    createComment(data)
+      .then(() => {
+        message.success('创建成功')
+        searchCommentList()
+      })
+      .finally(() => {
+        form.value.commentValue = ''
+      })
+  } catch (error) {
+    message.error('创建失败')
+  }
+}
+
+function handleExport() {
+  exportTableWithVue('#okrAnalysisTable', `OKR分析报表-${currentNode.value.nodeName}`)
+}
+
+function handleTableFilter() {
+  console.log('tableKeywords', tableKeywords.value)
+
+  if (tableKeywords.value) {
+    originList.value = defaultTableList.value.filter(
+      (item) =>
+        item.keyResultShowName.includes(tableKeywords.value) ||
+        item.sourceName.includes(tableKeywords.value)
+    )
+  } else {
+    originList.value = [...defaultTableList.value]
+  }
+}
+
+function handleFilterTableClick() {
+  showTableSearch.value = !showTableSearch.value
+  if (!showTableSearch.value) {
+    tableKeywords.value = ''
+    originList.value = [...defaultTableList.value]
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/OKR/Management/Components/AllTarget.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="flex flex-col w-full h-full p-4 bg-white rounded-lg shadow-md overflow-hidden">
     <div class="flex items-center justify-between">
       <el-row>
         <el-tree-select
@@ -31,7 +31,6 @@
         >
       </el-row>
     </div>
-
     <OkrTable ref="okrTableRef" :canEdit="isCurrentLeafNode" />
     <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
     <DialogOkrInfo ref="dialogOkrInfo" @success="handleSearchPeroid" />
@@ -72,34 +71,46 @@ const isCurrentLeafNode = ref(false)
 
 function handleSearchPeroid() {
   getAllNodeTree().then((resp) => {
-    peroidList.value = listToTree(resp.tree, {
-      id: 'nodeId',
-      pid: 'parentId',
-      children: 'children'
-    })
-    nodeChange(resp.nodeId)
+    if (resp.nodeId) {
+      peroidList.value = listToTree(resp?.tree || [], {
+        id: 'nodeId',
+        pid: 'parentId',
+        children: 'children'
+      })
+      nodeChange(resp.nodeId)
+    } else {
+      message.warning('请先创建节点数据')
+    }
   })
 }
 
 function nodeChange(nodeId) {
-  searchForm.value.nodeId = nodeId
-  getOkrList()
-  const currentNode = findNode(peroidList.value, (node) => {
-    return node.nodeId == nodeId
-  })
-  if (!currentNode.children || currentNode.children.length == 0) {
-    isCurrentLeafNode.value = true
-  } else {
-    isCurrentLeafNode.value = false
+  if (nodeId) {
+    searchForm.value.nodeId = nodeId
+    getOkrList()
+    const currentNode = findNode(peroidList.value, (node) => {
+      return node.nodeId == nodeId
+    })
+    searchForm.value.creatorId = currentNode.creatorId
+    if (!currentNode.children || currentNode.children.length == 0) {
+      isCurrentLeafNode.value = true
+    } else {
+      isCurrentLeafNode.value = false
+    }
   }
 }
 
 function getOkrList() {
   getAllOkrPage(searchForm.value).then((resp) => {
     const list = resp
-    nextTick(() => {
-      okrTableRef.value.prepareData(list)
-    })
+    if (list && list.length > 0) {
+      nextTick(() => {
+        okrTableRef.value.prepareData(list)
+      })
+    } else {
+      // 如果没有数据，清空表格
+      okrTableRef.value.prepareData([])
+    }
   })
 }
 
@@ -108,9 +119,9 @@ function handleAddNode() {
   dialogOkrInfo.value.open('create', null)
 }
 
-function handleEditOkr() {
+function handleEditOkr(nodeId = undefined) {
   dialogOkr.value.close()
-  dialogOkrInfo.value.open('update', searchForm.value.nodeId)
+  dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
 }
 
 function handleUpdateProcess() {
@@ -124,7 +135,8 @@ const dialogOkr = ref(null)
 function handleShowOkr(id) {
   dialogOkr.value.open({
     nodeId: id,
-    canEdit: isCurrentLeafNode.value
+    canEdit: isCurrentLeafNode.value,
+    queryType: 2
   })
 }
 </script>

src/views/OKR/Management/Components/DialogOkr.vue

@@ -18,11 +18,31 @@
           <span class="text-14px ml-0.25">ork落地</span>
           <div class="ml-20px text-14px">
             <span>【节点】</span>
-            <span>{{ nodeInfo.allNodeName }}</span>
+            <span
+              v-for="(item, index) in nodeInfo.parentNodes"
+              :key="item.nodeId"
+              @click="handleChildItem(item)"
+            >
+              <span
+                class="cursor-pointer"
+                :style="{
+                  color: index < nodeInfo.parentNodes.length - 1 ? '#409eff' : '#333',
+                  borderBottom:
+                    index < nodeInfo.parentNodes.length - 1 ? '1px solid #409eff' : 'none'
+                }"
+              >
+                {{ item.nodeName }}
+              </span>
+              <span v-if="index != nodeInfo.parentNodes.length - 1"> -> </span>
+            </span>
           </div>
         </div>
         <div class="flex items-center">
-          <el-button v-if="nodeInfo.creatorId == currentUserId" link @click="emit('edit')">
+          <el-button
+            v-if="nodeInfo.creatorId == currentUserId"
+            link
+            @click="emit('edit', nodeInfo.nodeId)"
+          >
             <el-tooltip content="编辑" placement="top" effect="dark">
               <Icon icon="ep:edit" :size="16" />
             </el-tooltip>
@@ -79,7 +99,7 @@
         </div>
         <div class="dialog-okr-side pl-10px">
           <el-tabs v-model="sideIndex" style="flex: 1; height: 100%">
-            <el-tab-pane label="子节点" name="subNode">
+            <el-tab-pane label="子节点" name="subNode" key=" ">
               <div class="overflow-y-auto" style="height: calc(100% - 50px)">
                 <div
                   v-for="item in childNodeList"
@@ -123,42 +143,43 @@
                 </div>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="评论" name="conclusion">
+            <el-tab-pane label="笔谈" name="conclusion" key="conclusion">
               <div class="relative overflow-y-auto" style="height: calc(100% - 50px)">
-                <div class="flex justify-between items-center">
-                  <el-select
-                    v-if="addNewComment"
-                    v-model="form.commentType"
-                    filterable
-                    size="small"
-                    style="width: 120px"
-                    @change="getCommentTemplate"
-                  >
-                    <el-option
-                      v-for="it in commentTypeOptions"
-                      :label="it.label"
-                      :value="it.id"
-                      :key="it.id"
-                    />
-                  </el-select>
+                <div v-if="addNewComment">
+                  <div class="flex justify-between items-center">
+                    <el-select
+                      v-model="form.commentType"
+                      filterable
+                      size="small"
+                      style="width: 120px"
+                      @change="getCommentTemplate"
+                    >
+                      <el-option
+                        v-for="it in commentTypeOptions"
+                        :label="it.label"
+                        :value="it.id"
+                        :key="it.id"
+                      />
+                    </el-select>
 
-                  <div v-if="addNewComment">
-                    <el-button size="small" @click="addNewComment = false"> 取消 </el-button>
-                    <el-button type="primary" size="small" @click="handleSaveComment">
-                      发布
-                    </el-button>
+                    <div>
+                      <el-button size="small" @click="addNewComment = false"> 取消 </el-button>
+                      <el-button type="primary" size="small" @click="handleSaveComment">
+                        发布
+                      </el-button>
+                    </div>
+                  </div>
+                  <div class="mt-10px" v-if="addNewComment">
+                    <Editor
+                      v-model:modelValue="form.commentValue"
+                      height="300px"
+                      :toolbarConfig="toolbarConfig"
+                    />
                   </div>
-                  <el-button v-else type="primary" size="small" @click="handleInsertComment">
-                    新增评论
-                  </el-button>
-                </div>
-                <div class="mt-10px" v-if="addNewComment">
-                  <Editor
-                    v-model:modelValue="form.commentValue"
-                    height="300px"
-                    :toolbarConfig="toolbarConfig"
-                  />
                 </div>
+                <el-button v-else type="primary" size="small" @click="handleInsertComment">
+                  新增笔谈
+                </el-button>
                 <div
                   v-for="(it, index) in commentList"
                   :key="it.commentId"
@@ -222,7 +243,7 @@
                     v-if="showCommentIndex == index"
                     class="bg-gray-100 pl-10px pr-10px pt-5px pb-5px"
                     style="margin: 10px 10px 0 10px; border-radius: 4px"
-                    label="评论"
+                    label="笔谈"
                   >
                     <div
                       v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
@@ -253,7 +274,7 @@
                         style="width: 100%"
                         size="small"
                         whole
-                        placeholder="请输入评论"
+                        placeholder="请输入笔谈"
                         @select="handleMention"
                       >
                         <template #label="{ item }">
@@ -276,7 +297,7 @@
                 </div>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="进度历史" name="history">
+            <el-tab-pane label="进度历史" name="history" key="history">
               <div class="overflow-y-auto pl-15px" style="height: calc(100% - 50px)">
                 <el-timeline class="ml-10px">
                   <el-timeline-item
@@ -319,9 +340,19 @@ import { useUserStore } from '@/store/modules/user'
 const message = useMessage()
 const userStore = useUserStore()
 const currentUserId = userStore.getUser.id
-const emit = defineEmits(['edit'])
+const emit = defineEmits(['edit', 'close'])
 
 const show = ref(false)
+
+watch(
+  () => show.value,
+  (newValue, oldValue) => {
+    if (oldValue && !newValue) {
+      emit('close', nodeInfo.value)
+    }
+  }
+)
+
 const canEdit = ref(false)
 
 const toolbarConfig = {
@@ -351,9 +382,11 @@ const nodeInfo = ref({})
 const nodeRecords = ref([])
 const commentTypeOptions = ref([])
 
+const queryType = ref(1)
 function open(curNode) {
   canEdit.value = curNode.canEdit
   nodeInfo.value.nodeId = curNode.nodeId
+  queryType.value = curNode.queryType
   // 获取数据详情
   searchInfo(curNode)
   show.value = true
@@ -363,13 +396,12 @@ const employeeOptions = ref([])
 
 function searchInfo(curNode) {
   try {
-    getOkrNodeDetail(curNode.nodeId).then((resp) => {
+    getOkrNodeDetail({ nodeId: curNode.nodeId, queryType: queryType.value }).then((resp) => {
       nodeInfo.value = {
         ...resp,
         executor: resp.executor || []
       }
-      canEdit.value =
-        canEdit.value && currentUserId == nodeInfo.value.executor.includes(currentUserId)
+      canEdit.value = canEdit.value && nodeInfo.value.executor.includes(currentUserId + '')
       if (resp.objectives) {
         okrList.value = resp.objectives.map((item) => ({
           ...item,
@@ -414,7 +446,7 @@ function handleMention(item) {
 function handleSaveProcess() {
   okrTableRef.value.updateProcess(nodeInfo.value.nodeId).then(() => {
     message.success('更新成功')
-    searchInfo()
+    searchInfo({ nodeId: nodeInfo.value.nodeId })
   })
 }
 
@@ -460,19 +492,20 @@ function handleSaveComment() {
       businessType: 1,
       businessId: nodeInfo.value.nodeId,
       contentType: 1,
+      commentType: form.value.commentType,
       content: form.value.commentValue,
       mentionedUserIdList: form.value.mentionedUserIdList
     }
     createComment(data)
       .then(() => {
-        message.success('评论成功')
+        message.success('笔谈成功')
         searchCommentList()
       })
       .finally(() => {
         form.value.commentValue = ''
       })
   } catch (error) {
-    message.error('评论失败')
+    message.error('笔谈失败')
   }
 }
 const commentList = ref([])
@@ -520,20 +553,22 @@ function handleSendCommnet(idx) {
       businessType: 1,
       businessId: nodeInfo.value.nodeId,
       contentType: 1,
+      commentType: form.value.commentType,
       content: form.value.commentValue,
       mentionedUserIdList: arr,
       parentId: commentList.value[idx].commentId
     }
     createComment(data)
       .then(() => {
-        message.success('评论成功')
+        message.success('创建成功')
         searchCommentList()
       })
       .finally(() => {
         form.value.commentValue = ''
       })
   } catch (error) {
-    message.error('评论失败')
+    console.log(error)
+    message.error('创建失败')
   }
 }
 </script>
@@ -618,8 +653,9 @@ function handleSendCommnet(idx) {
         }
       }
       .content-wrap {
-        overflow-y: auto;
-        max-height: calc(100% - 70px);
+        display: flex;
+        flex-direction: column;
+        height: calc(100% - 15px);
       }
     }
     .dialog-okr-side {

src/views/OKR/Management/Components/DialogOkrInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-model="show"
-    width="900px"
+    width="88vw"
     class="dialog-okr"
     :show-close="false"
     :close-on-click-modal="false"
@@ -120,10 +120,20 @@
                   class="flex items-center w-full"
                   v-for="(item, i) in objectList"
                   :key="item.objectiveId"
+                  style="padding-bottom: 5px"
                 >
                   <div class="flex-1 w-100px">
                     <div class="flex items-center">
-                      <el-tag type="success" class="mr-10px">O{{ i + 1 }}</el-tag>
+                      <el-tooltip content="点击可折叠/展开目标" placement="top" effect="dark">
+                        <el-tag
+                          type="success"
+                          class="mr-10px"
+                          @click="item.hideChild = !item.hideChild"
+                        >
+                          O{{ i + 1 }}
+                        </el-tag>
+                      </el-tooltip>
+
                       <el-input
                         v-model="item.objectiveName"
                         placeholder="目标名称"
@@ -135,6 +145,7 @@
                         placeholder="选择执行人，可多选"
                         multiple
                         clearable
+                        collapse-tags
                         filterable
                         style="width: 240px; margin-left: 10px"
                       >
@@ -161,7 +172,7 @@
                         <el-button type="danger" text @click="removeObj(i)">删除目标</el-button>
                       </div>
                     </div>
-                    <div style="background: #f0f3fa; padding-bottom: 15px">
+                    <div v-if="!item.hideChild" style="background: #f0f3fa; padding-bottom: 10px">
                       <div
                         class="ml-50px"
                         v-for="(kr, index) in item.keyResults"
@@ -192,7 +203,7 @@
                         </div>
                         <div class="mt-5px flex items-center">
                           <el-tree-select
-                            v-model="kr.sourceId"
+                            v-model="kr.source"
                             :data="sourceOptions"
                             :props="defaultProps"
                             check-strictly
@@ -202,10 +213,10 @@
                             node-key="sourceId"
                             placeholder="请选择渠道"
                           />
-                          <el-radio-group v-model="kr.resultType" class="ml-10px">
+                          <!-- <el-radio-group v-model="kr.resultType" class="ml-10px">
                             <el-radio-button :value="1">目标值</el-radio-button>
                             <el-radio-button :value="2">是/否</el-radio-button>
-                          </el-radio-group>
+                          </el-radio-group> -->
 
                           <el-input
                             v-if="kr.resultType == 1"
@@ -244,6 +255,10 @@
                             <el-option label="公开" :value="1" />
                             <el-option label="仅上级可见" :value="2" />
                           </el-select>
+                          <el-radio-group v-model="kr.isCount" class="ml-10px">
+                            <el-radio :label="true" :value="true">参与统计</el-radio>
+                            <el-radio :label="false" :value="false">不参与统计</el-radio>
+                          </el-radio-group>
                         </div>
                       </div>
                     </div>
@@ -332,7 +347,8 @@ import {
   createOkrNode,
   updateOkrNode,
   getAllOkrPage,
-  getDefaultOkrOptions
+  getDefaultOkrOptions,
+  getChannelOptions
 } from '@/api/okr/okr'
 import { listToTree } from '@/utils/tree'
 import { getEmployeeSimpleList } from '@/api/pers/employee'
@@ -378,7 +394,7 @@ const defaultProps = {
 }
 const sourceOptions = ref([])
 const objectList = ref([])
-function open(type, val) {
+function open(type, val, queryType) {
   show.value = true
   title.value = type == 'update' ? '修改Okr' : '新增Okr'
   formType.value = type
@@ -396,10 +412,20 @@ function open(type, val) {
   getDefaultOkrOptions().then((resp) => {
     krOptions.value = resp
   })
+  getChannelOptions().then((resp) => {
+    sourceOptions.value = listToTree(resp, {
+      id: 'sourceId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
   if (val) {
     formLoading.value = true
     try {
-      getOkrNodeDetail(val).then((resp) => {
+      getOkrNodeDetail({
+        nodeId: val,
+        queryType
+      }).then((resp) => {
         form.value = resp
         if (resp.objectives) {
           objectList.value = resp.objectives.map((item) => ({
@@ -423,7 +449,7 @@ function resetForm() {
     startTime: undefined,
     endTime: undefined,
     executor: [],
-    dataScope: 1
+    dataScope: 2
   }
 }
 
@@ -436,9 +462,9 @@ const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于
 function addObjective() {
   objectList.value.push({
     objectiveName: '',
-    executor: [],
+    executor: form.value.executor || [],
     keyResults: [],
-    dataScope: 1
+    dataScope: form.value.dataScope || 2
   })
 }
 
@@ -455,7 +481,8 @@ function AddKR(idx) {
     process: undefined,
     currentValue: undefined,
     executor: obj.executor,
-    dataScope: obj.dataScope
+    dataScope: obj.dataScope,
+    isCount: false
   })
 }
 
@@ -468,7 +495,7 @@ function removeKR(oIdx, krIdx) {
 }
 
 function addChildNode() {
-  childNodeList.value.push({})
+  childNodeList.value.push({ dataScope: 2 })
 }
 
 function removeChildNode(idx) {
@@ -509,9 +536,32 @@ async function handleSave() {
   if (!formRef.value) return
   const valid = await formRef.value.validate()
   if (!valid) return
+
+  form.value.executor = form.value.executor || []
+  if (form.value.executor.length > 1) {
+    message
+      .confirm('是否按照当前节点所选的多个执行人自动新增对应的员工节点？', {
+        type: 'warning',
+        showCancelButton: true,
+        cancelButtonText: '不新增员工节点',
+        confirmButtonText: '新增员工节点'
+      })
+      .then(() => {
+        saveOkrData(true)
+      })
+      .catch(() => {
+        saveOkrData(false)
+      })
+  } else {
+    saveOkrData(false)
+  }
+}
+
+async function saveOkrData(isAutoAddChild = false) {
   // 提交请求
   formLoading.value = true
   try {
+    form.value.isAutoAddChild = isAutoAddChild
     form.value.objectives = objectList.value
     form.value.children = childNodeList.value
     if (formType.value === 'create') {
@@ -527,24 +577,34 @@ async function handleSave() {
                 2,
                 '0'
               )}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
-              children: [
-                {
-                  nodeName: `${month + 1}月第1周`,
-                  children: []
-                },
-                {
-                  nodeName: `${month + 1}月第2周`,
-                  children: []
-                },
-                {
-                  nodeName: `${month + 1}月第3周`,
-                  children: []
-                },
-                {
-                  nodeName: `${month + 1}月第4周`,
-                  children: []
-                }
-              ]
+              dataScope: form.value.dataScope,
+              executor: form.value.executor
+              // children: [
+              //   {
+              //     nodeName: `${month + 1}月第1周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第2周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第3周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第4周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   }
+              // ]
             })
           }
         }

src/views/OKR/Management/Components/MyDuty.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="h-full flex flex-col">
     <div class="flex items-center justify-between">
       <el-row>
         <el-tree-select
@@ -53,7 +53,7 @@ handleSearchPeroid()
 
 function handleSearchPeroid() {
   getMyNodeTree().then((resp) => {
-    peroidList.value = listToTree(resp.tree, {
+    peroidList.value = listToTree(resp?.tree || [], {
       id: 'nodeId',
       pid: 'parentId',
       children: 'children'
@@ -66,9 +66,14 @@ function handleSearchPeroid() {
 function getOkrList() {
   getMyOkrPage(searchForm.value).then((resp) => {
     const list = resp
-    nextTick(() => {
-      okrTableRef.value.prepareData(list)
-    })
+    if (list && list.length > 0) {
+      nextTick(() => {
+        okrTableRef.value.prepareData(list)
+      })
+    } else {
+      // 如果没有数据，清空表格
+      okrTableRef.value.prepareData([])
+    }
   })
 }
 
@@ -77,9 +82,9 @@ const dialogOkrInfo = ref(null)
 //   dialogOkrInfo.value.open('create', null)
 // }
 
-function handleEditOkr() {
+function handleEditOkr(nodeId = undefined) {
   dialogOkr.value.close()
-  dialogOkrInfo.value.open('update', 1)
+  dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 1)
 }
 
 function handleUpdateProcess() {
@@ -93,7 +98,8 @@ const dialogOkr = ref(null)
 function handleShowOkr(id) {
   dialogOkr.value.open({
     nodeId: id,
-    canEdit: true
+    canEdit: true,
+    queryType: 1
   })
 }
 </script>

src/views/OKR/Management/Components/MySon.vue

@@ -0,0 +1,125 @@
+<template>
+  <div class="h-full flex flex-col">
+    <div class="flex items-center justify-between">
+      <el-row>
+        <el-tree-select
+          v-model="searchForm.nodeId"
+          :data="peroidList"
+          :props="defaultProps"
+          :render-after-expand="false"
+          :default-expand-all="false"
+          style="width: 400px"
+          @change="nodeChange"
+        />
+      </el-row>
+      <el-row>
+        <el-button type="info" @click="handleShowOkr(searchForm.nodeId)"> 节点详情 </el-button>
+        <el-button
+          type="warning"
+          v-if="currentUserId == searchForm.creatorId"
+          @click="handleEditOkr(searchForm.nodeId)"
+        >
+          修改当前节点
+        </el-button>
+      </el-row>
+    </div>
+
+    <OkrTable ref="okrTableRef" canEdit />
+    <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
+    <DialogOkrInfo ref="dialogOkrInfo" @success="handleSearchPeroid" />
+  </div>
+</template>
+
+<script setup name="MySon">
+import OkrTable from './OkrTable.vue'
+import DialogOkr from './DialogOkr.vue'
+import DialogOkrInfo from './DialogOkrInfo.vue'
+import { listToTree, findNode } from '@/utils/tree'
+import { useUserStore } from '@/store/modules/user'
+
+import { getMySonNodeTree, getMySonOkrPage } from '@/api/okr/okr'
+
+const props = defineProps({
+  userId: {
+    type: Number,
+    default: undefined
+  }
+})
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const userStore = useUserStore()
+const currentUserId = userStore.getUser.id
+
+const okrTableRef = ref(null)
+const searchForm = ref({
+  nodeId: undefined
+})
+
+const peroidList = ref([])
+
+handleSearchPeroid()
+
+function handleSearchPeroid() {
+  getMySonNodeTree({ userId: props.userId }).then((resp) => {
+    peroidList.value = listToTree(resp?.tree || [], {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+    nodeChange(resp.nodeId)
+  })
+}
+
+function getOkrList() {
+  getMySonOkrPage({
+    ...searchForm.value,
+    userId: props.userId
+  }).then((resp) => {
+    if (resp && resp.length > 0) {
+      nextTick(() => {
+        okrTableRef.value.prepareData(resp)
+      })
+    } else {
+      // 如果没有数据，清空表格
+      okrTableRef.value.prepareData([])
+    }
+  })
+}
+
+function nodeChange(nodeId) {
+  searchForm.value.nodeId = nodeId
+  getOkrList()
+  const currentNode = findNode(peroidList.value, (node) => {
+    return node.nodeId == nodeId
+  })
+  searchForm.value.creatorId = currentNode.creatorId
+}
+
+const dialogOkr = ref(null)
+function handleShowOkr(id) {
+  dialogOkr.value.open({
+    nodeId: id,
+    canEdit: true,
+    queryType: 2
+  })
+}
+
+const dialogOkrInfo = ref(null)
+function handleEditOkr(nodeId = undefined) {
+  dialogOkr.value.close()
+  dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-overlay-dialog) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

src/views/OKR/Management/Components/ObjectList.vue

@@ -30,9 +30,11 @@
     </div>
 
     <vue3-tree-org
+      ref="treeOrgRef"
       :data="dataList"
       center
       collapsable
+      :default-expand-keys="lastExpendKeys"
       :props="treeProps"
       @on-node-click="handleClickNode"
     >
@@ -74,7 +76,7 @@
       </template>
     </vue3-tree-org>
     <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
-    <DialogOkrInfo ref="dialogOkrInfo" @close="openOkr" />
+    <DialogOkrInfo ref="dialogOkrInfo" @close="openOkr" @success="resetTreeData" />
   </div>
 </template>
 
@@ -89,6 +91,7 @@ import { listToTree } from '@/utils/tree'
 
 const dataList = ref({})
 const helpDataList = ref([])
+const lastExpendKeys = ref([])
 const treeProps = {
   children: 'children',
   label: 'nodeName',
@@ -106,6 +109,7 @@ const peroidList = ref([])
 handleSearchPeroid()
 
 function handleSearchPeroid() {
+  lastExpendKeys.value = []
   getOkrRelationTree().then((resp) => {
     peroidList.value = resp
     if (resp && resp.length && !searchForm.value.nodeId) {
@@ -116,6 +120,43 @@ function handleSearchPeroid() {
   })
 }
 
+const treeOrgRef = ref(null)
+function resetTreeData() {
+  if (treeOrgRef.value) {
+    lastExpendKeys.value = treeOrgRef.value.getExpandKeys()
+  }
+
+  // 重新获取tree数据
+  getOkrRelationTree().then((resp) => {
+    peroidList.value = resp
+    if (resp && resp.length) {
+      if (!searchForm.value.nodeId) {
+        searchForm.value.nodeId = resp[0].nodeId
+        searchForm.value.nodeName = resp[0].nodeName
+      }
+      getOkrRelationTreeChildren({
+        nodeId: searchForm.value.nodeId
+      }).then((resp) => {
+        const tree = listToTree(resp, {
+          id: 'nodeId',
+          pid: 'parentId',
+          children: 'children'
+        })
+        // // 设置展开的keys
+        // if (treeOrgRef.value) {
+        //   treeOrgRef.value.setExpandKeys(lastExpendKeys.value)
+        // }
+        helpDataList.value = resp
+        if (tree && tree.length) {
+          dataList.value = tree[0]
+        } else {
+          dataList.value = {}
+        }
+      })
+    }
+  })
+}
+
 function getOkrList() {
   getOkrRelationTreeChildren({
     nodeId: searchForm.value.nodeId
@@ -178,6 +219,7 @@ function openOkr() {
   clickNode.value &&
     dialogOkr.value.open({
       nodeId: clickNode.value.nodeId,
+      queryType: 2,
       canEdit: !clickNode.value.children || clickNode.value.children.length == 0
     })
 }
@@ -188,9 +230,9 @@ function handleAddNode() {
   dialogOkrInfo.value.open('create', null)
 }
 
-function handleEditOkr() {
+function handleEditOkr(nodeId = undefined) {
   dialogOkr.value.close()
-  dialogOkrInfo.value.open('update', 1)
+  dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
 }
 </script>
 

src/views/OKR/Management/Components/OkrTable.vue

@@ -1,11 +1,12 @@
 <template>
-  <div>
+  <div class="flex-1 h-200px overflow-hidden">
     <el-table
       ref="tableRef"
       :data="okrList"
       default-expand-all
       row-key="id"
       size="large"
+      height="100%"
       @row-click="handleRowClick"
       @expand-change="handleExpand"
     >
@@ -19,11 +20,18 @@
               height: getHeight(row, $index)
             }"
           ></span>
-          <span v-if="row.type == '目标'">【目标】{{ row.name }}</span>
+          <span v-if="row.type == '目标'">
+            <el-tag type="success" size="small">目标</el-tag>
+            {{ row.name }}
+          </span>
           <template v-else>
             <span class="line2"></span>
             <span>
-              【关键成果】{{ row.channelName }} {{ row.name }}
+              <el-tag type="primary" size="small">关键成果</el-tag>
+              <span class="font-bold text-black" v-if="row.sourceName">
+                【{{ row.sourceName }}】
+              </span>
+              <span>{{ row.name }}</span>
               <span v-if="row.resultType == 1">达 {{ row.targetValue }}</span>
             </span>
             <div class="flex items-center mt-10px ml-50px">
@@ -74,6 +82,10 @@ const okrList = ref([])
 const helpList = ref([])
 
 function prepareData(list) {
+  if (!list || !Array.isArray(list) || list.length === 0) {
+    okrList.value = []
+    return
+  }
   helpList.value = []
   expandedRows.value = {}
   okrList.value = list.map((item) => {
@@ -94,13 +106,14 @@ function prepareData(list) {
           nodeId: child.nodeId,
           isSys: child.isSys,
           processId: child.id,
-          name: child.keyResultName,
+          name: child.keyResultShowName,
           progress: child.progress,
           executorName: child.executorName,
           type: '关键成果',
           resultType: child.resultType,
           targetValue: child.targetValue,
-          currentValue: Number(child.currentValue)
+          currentValue: Number(child.currentValue),
+          sourceName: child.sourceName
         }
         helpList.value.push(kr)
         return kr

src/views/OKR/Management/index.vue

@@ -11,16 +11,16 @@
       <el-tab-pane label="我负责的" name="0">
         <MyDuty v-if="tabIndex == 0" />
       </el-tab-pane>
-      <el-tab-pane label="待办事项" name="1">
+      <!-- <el-tab-pane label="待办事项" name="1">
         <WaitTarget v-if="tabIndex == 1" />
-      </el-tab-pane>
+      </el-tab-pane> -->
       <el-tab-pane label="全部目标" name="2">
         <AllTarget v-if="tabIndex == 2" />
       </el-tab-pane>
       <el-tab-pane label="目标关系树" name="3">
         <ObjectList v-if="tabIndex == 3" />
       </el-tab-pane>
-      <el-tab-pane disabled>
+      <el-tab-pane disabled v-if="employeeList.length > 0">
         <template #label>
           <div class="w-full">
             <el-divider
@@ -31,9 +31,14 @@
           </div>
         </template>
       </el-tab-pane>
-      <el-tab-pane label="张三">张三</el-tab-pane>
-      <el-tab-pane label="李四">李四</el-tab-pane>
-      <el-tab-pane label="王二">王二</el-tab-pane>
+      <el-tab-pane
+        v-for="item in employeeList"
+        :key="item.userId"
+        :label="item.userName"
+        :name="item.userId"
+      >
+        <MySon v-if="tabIndex == item.userId" :userId="item.userId" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -41,11 +46,21 @@
 <script setup name="OkrManagement">
 import AllTarget from './Components/AllTarget.vue'
 import MyDuty from './Components/MyDuty.vue'
+import MySon from './Components/MySon.vue'
 import ObjectList from './Components/ObjectList.vue'
-import WaitTarget from './Components/WaitTarget.vue'
+// import WaitTarget from './Components/WaitTarget.vue'
+
+import { getMyMemberList } from '@/api/okr/okr'
 
 const tabIndex = ref('0')
 const height = ref(innerHeight - 115)
+
+const employeeList = ref([])
+onMounted(() => {
+  getMyMemberList().then((res) => {
+    employeeList.value = res
+  })
+})
 </script>
 
 <style lang="scss" scoped>

src/views/OKR/Meeting/MeetingInfo.vue

@@ -0,0 +1,305 @@
+<template>
+  <div>
+    <!-- <el-affix postion="top" :offset="95" v-if="!isDetail"> -->
+    <div class="flex justify-between mb-4 bg-white" v-if="!isDetail">
+      <b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
+      <el-button type="success" @click="submit()">保存</el-button>
+    </div>
+    <!-- </el-affix> -->
+    <el-form
+      :model="form"
+      ref="formRef"
+      :rules="rules"
+      label-width="120px"
+      v-loading="loading"
+      :disabled="!!isDetail"
+    >
+      <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="请输入会议主题" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <el-form-item label="okr节点" prop="nodeId">
+            <el-tree-select
+              v-model="form.nodeId"
+              :data="peroidList"
+              :props="defaultProps"
+              :render-after-expand="false"
+              :default-expand-all="false"
+              check-strictly
+              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">
+            <el-date-picker
+              v-model="form.startTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              placeholder="请选择会议开始时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="预计结束时间" prop="expectEndTime">
+            <el-date-picker
+              v-model="form.expectEndTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              placeholder="请选择预计结束时间"
+            />
+          </el-form-item>
+        </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="请输入会议地点" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="会议状态" prop="status">
+            <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>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="预约参会人员" prop="expectUsers">
+            <el-select
+              v-model="form.expectUsers"
+              placeholder="选择参会人员"
+              clearable
+              filterable
+              style="width: 100%"
+              multiple
+              @change="handleUserChange"
+            >
+              <el-option
+                v-for="item in userOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.status == 1"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0" v-if="form.meetingId">
+          <el-form-item label="实际参会人员" prop="actualUsers">
+            <el-checkbox-group v-model="form.actualUsers">
+              <el-checkbox
+                v-for="item in expectUserOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0" v-if="!isAllActived">
+          <el-form-item label="缺席原因" prop="absentReason">
+            <el-input v-model="form.absentReason" placeholder="请输入缺席原因" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24">
+          <el-form-item label="会议内容" prop="meetingContent">
+            <div v-if="!!isDetail" v-dompurify-html="form.meetingContent" class="w-full"></div>
+            <Editor v-else v-model="form.meetingContent" height="500px" style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" v-if="!!form.meetingId">
+          <el-form-item label="会议纪要" prop="meetingSummary" label-width="80px">
+            <!-- <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
+            <Editor v-else v-model="form.meetingSummary" height="500px" /> -->
+            <div v-if="!!isDetail" class="w-full">{{ form.meetingSummary }}</div>
+            <el-input
+              v-else
+              v-model="form.meetingSummary"
+              type="textarea"
+              placeholder="请输入会议纪要"
+              :maxlength="-1"
+              :show-word-limit="false"
+              :autosize="{ minRows: 20 }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script setup name="MeetingInfo">
+import { listToTree } from '@/utils/tree'
+import { getAllNodeTree } from '@/api/okr/okr'
+import * as MeetingApi from '@/api/okr/meeting'
+import { formatDate } from '@/utils/formatTime'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+
+const route = useRoute()
+const message = useMessage()
+const tagsViewStore = useTagsViewStore()
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const isDetail = route.query.isDetail
+
+onMounted(async () => {
+  await getOptions()
+  if (route.params.id && route.params.id != 0) {
+    // 这里可以调用API获取会议详情数据
+    getMeetingInfo(route.params.id)
+  } else {
+    console.error('会议不存在')
+  }
+})
+
+const peroidList = ref([])
+function getOptions() {
+  return Promise.all([getAllNodeTree(), getEmployeeSimpleList()])
+    .then(([okrResp, employeeResp]) => {
+      peroidList.value = listToTree(okrResp?.tree || [], {
+        id: 'nodeId',
+        pid: 'parentId',
+        children: 'children'
+      })
+      userOptions.value = employeeResp.map((it) => ({ ...it, id: it.id + '' }))
+      // handleUserChange()
+    })
+    .catch((error) => {
+      console.error('获取数据失败:', error)
+    })
+  // // 获取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({
+  meetingId: undefined,
+  meetingSubject: '',
+  startTime: '',
+  meetingRoom: '',
+  expectEndTime: '',
+  expectUsers: [],
+  actualUsers: [],
+  okrNodeName: '',
+  status: '1',
+  meetingContent: '',
+  meetingSummary: '',
+  absentReason: ''
+})
+const rules = {
+  meetingSubject: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
+  startTime: [{ required: true, message: '请选择会议开始时间', trigger: 'change' }],
+  expectEndTime: [{ required: true, message: '请选择预计结束时间', trigger: 'change' }],
+  meetingRoom: [{ required: true, message: '请输入会议地点', trigger: 'blur' }],
+  expectUsers: [{ required: true, message: '请选择参会人员', trigger: 'change' }]
+}
+
+const formRef = ref(null)
+const userOptions = ref([])
+const expectUserOptions = ref([])
+
+const isAllActived = computed(() => {
+  // 判断实际参会人员是否包含所有预约参会人员
+  return form.value.expectUsers.every((item) => form.value.actualUsers.includes(item))
+})
+
+const loading = ref(false)
+// 获取详情
+const getMeetingInfo = async (meetingId) => {
+  try {
+    loading.value = true
+    // 调用API获取会议详情
+    const resp = await MeetingApi.getMeetingDetail({ meetingId })
+    loading.value = false
+    if (resp) {
+      form.value = {
+        ...form.value,
+        ...resp,
+        startTime: formatDate(resp.startTime, 'YYYY-MM-DD HH:mm'),
+        expectEndTime: formatDate(resp.expectEndTime, 'YYYY-MM-DD HH:mm'),
+        expectUsers: resp.expectUsers || [],
+        actualUsers: resp.actualUsers || []
+      }
+      handleUserChange()
+    }
+  } catch (error) {
+    loading.value = false
+    console.error('获取会议详情失败:', error)
+  }
+}
+
+function handleUserChange() {
+  // 当预约参会人员变化时，更新实际参会人员选项
+  expectUserOptions.value = userOptions.value.filter((user) =>
+    form.value.expectUsers.some((it) => it == user.id)
+  )
+  if (!isDetail) {
+    form.value.actualUsers = [...form.value.expectUsers]
+  }
+}
+
+const router = useRouter()
+async function submit() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  try {
+    // 提交表单数据
+    if (form.value.meetingId) {
+      if (form.value.status == 2 && !form.value.meetingSummary) {
+        message.error('会议结束时，会议纪要不能为空')
+        return
+      }
+      // 更新会议
+      await MeetingApi.updateMeeting(form.value)
+      message.success('会议更新成功')
+    } else {
+      if (form.value.status == 1 && !form.value.meetingContent) {
+        message.error('预约会议时，会议内容不能为空')
+        return
+      }
+      form.value.actualUsers = []
+      // 新增会议
+      await MeetingApi.createMeeting(form.value)
+      message.success('会议创建成功')
+    }
+    tagsViewStore.delView(route)
+    const visitedViews = tagsViewStore.getVisitedViews
+    const latestView = visitedViews.slice(-1)[0]
+    router.push(latestView)
+  } catch (error) {
+    console.error('保存会议数据失败:', error)
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/OKR/Meeting/index.vue

@@ -0,0 +1,219 @@
+<template>
+  <div>
+    <!-- 搜索条件：主题、会议状态、会议时间（时间段）、选择OKR节点 -->
+    <el-form :model="searchForm" inline label-width="0">
+      <el-form-item>
+        <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"
+          @change="handleSearch"
+        >
+          <el-option label="未开始" value="1" />
+          <el-option label="已结束" value="2" />
+          <el-option label="已取消" value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.dateRange"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="会议时间"
+          end-placeholder="会议时间"
+          @change="handleSearch"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-tree-select
+          v-model="searchForm.nodeId"
+          :data="peroidList"
+          :props="defaultProps"
+          :render-after-expand="false"
+          :default-expand-all="false"
+          check-strictly
+          placeholder="选择OKR节点"
+          style="width: 300px"
+          clearable
+          @change="handleSearch"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button type="primary" @click="handleAdd">预约会议</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table :data="tableList" v-loading="loading" border stripe>
+      <el-table-column prop="meetingSubject" label="会议主题" />
+      <el-table-column prop="startTime" label="会议时间" width="170px" />
+      <el-table-column prop="meetingRoom" label="会议地点" width="140px" />
+      <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节点" width="150px" />
+      <el-table-column prop="status" label="会议状态" width="100px">
+        <template #default="{ row }">
+          <el-tag :type="['', 'info', 'success', 'warning'][row.status]" size="small">
+            {{ ['', '未开始', '已结束', '已取消'][row.status] }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" width="140">
+        <template #default="{ row }">
+          <template v-if="row.status == 1 && row.creator == currentUserId">
+            <el-button type="primary" style="padding: 0" text @click="handleEdit(row.meetingId)">
+              修改
+            </el-button>
+            <el-button type="danger" text style="padding: 0" @click="handleCancel(row)">
+              取消
+            </el-button>
+          </template>
+          <el-button
+            v-else
+            type="primary"
+            style="padding: 0"
+            text
+            @click="handleDetail(row.meetingId)"
+          >
+            详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="Meeting">
+import { listToTree } from '@/utils/tree'
+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',
+  children: 'children'
+}
+const message = useMessage()
+
+const searchForm = ref({
+  meetingSubject: undefined,
+  status: '1',
+  dateRange: [],
+  nodeId: undefined,
+  pageNo: 1,
+  pageSize: 50
+})
+const total = ref(0)
+
+onMounted(() => {
+  getOptions()
+  handleSearch()
+})
+
+const peroidList = ref([])
+function getOptions() {
+  // 获取OKR节点数据
+  getAllNodeTree().then((resp) => {
+    peroidList.value = listToTree(resp?.tree || [], {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+}
+
+const loading = ref(false)
+const tableList = ref([])
+const handleSearch = () => {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  // 获取会议列表
+  try {
+    const params = { ...searchForm.value }
+    if (params.dateRange && params.dateRange.length) {
+      params.startTime = params.dateRange[0] + ' 00:00:00'
+      params.endTime = params.dateRange[1] + ' 23:59:59'
+      delete params.dateRange
+    } else {
+      delete params.startTime
+      delete params.endTime
+    }
+    MeetingApi.getMeetingPage(params)
+      .then((resp) => {
+        tableList.value = resp.list || []
+        total.value = resp.total || 0
+      })
+      .finally(() => {
+        loading.value = false
+      })
+  } catch (error) {
+    console.error('获取会议列表失败:', error)
+    loading.value = false
+  }
+}
+
+const router = useRouter()
+
+const handleAdd = () => {
+  router.push({ name: 'MeetingInfo', params: { id: 0 } })
+}
+
+const handleEdit = (id) => {
+  router.push({
+    name: `MeetingInfo`,
+    params: {
+      id
+    }
+  })
+}
+
+const handleDetail = (id) => {
+  router.push({
+    name: `MeetingInfo`,
+    params: {
+      id
+    },
+    query: {
+      isDetail: 1
+    }
+  })
+}
+
+const handleCancel = async (row) => {
+  try {
+    await message.confirm('是否确认取消该会议？')
+    // 取消会议操作
+    await MeetingApi.cancelMeeting({ meetingId: row.meetingId })
+    message.success('会议取消成功')
+    getList() // 刷新列表
+  } catch (error) {
+    console.log('取消操作被用户拒绝', error)
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/OKR/Wait/index.vue

@@ -63,7 +63,7 @@
           </el-badge>
         </template>
       </el-tab-pane>
-      <el-tab-pane :name="4">
+      <!-- <el-tab-pane :name="4">
         <template #label>
           <el-badge :value="tabCount.notifyNum" :max="99" :show-zero="false">
             <el-tooltip content="特指OKR中@我的消息" placement="top" effect="dark">
@@ -85,7 +85,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
 
     <el-table v-if="tabIndex != 4" :data="tableList">
@@ -165,10 +165,11 @@
 <script setup name="WaitTarget">
 import { useUserStore } from '@/store/modules/user'
 import { dateFormatter } from '@/utils/formatTime'
-import DialogWait from './DialogWait.vue'
+import DialogWait from './Components/DialogWait.vue'
 
 import { getWaitPage, deleteWait, getWaitCount, urgeWait } from '@/api/okr/wait'
 
+const route = useRoute()
 const userStore = useUserStore()
 const currentUserId = userStore.getUser.id
 
@@ -212,6 +213,11 @@ const priorityNameFilter = (priority) => {
 const tabIndex = ref(1)
 
 onMounted(() => {
+  if (route?.query?.type) {
+    tabIndex.value = Number(route.query.type)
+  } else {
+    tabIndex.value = 1
+  }
   searchList()
 })
 
@@ -237,7 +243,7 @@ function getTabCount() {
 
 const loading = ref(false)
 const tableList = ref([])
-const mentionedList = ref([])
+// const mentionedList = ref([])
 const total = ref(0)
 function getList() {
   loading.value = true
@@ -275,19 +281,17 @@ function handleDelete(row) {
 }
 
 function handleNotice(row) {
-  console.log(row)
-
   message.confirm('即将发送微信通知提醒执行人，是否继续？').then(() => {
-    urgeWait({ workId: row.workId }).then(() => {
+    urgeWait(row.workId).then(() => {
       message.success('发送成功')
     })
   })
 }
 
-function handleShow(row) {
-  console.log(row)
-  message.success('打开okr详情页')
-}
+// function handleShow(row) {
+//   console.log(row)
+//   message.success('打开okr详情页')
+// }
 </script>
 
 <style lang="scss" scoped></style>

src/views/Pers/Employee/Comp/DialogEmployee.vue

@@ -25,7 +25,14 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织部门" prop="dept">
-            <el-input v-model="formData.dept" placeholder="请输入部门" />
+            <el-tree-select
+              v-model="formData.deptId"
+              :data="deptList"
+              :props="defaultProps"
+              check-strictly
+              node-key="id"
+              placeholder="请选择部门"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -189,8 +196,10 @@
 <script name="DialogEmployee" setup>
 import { CommonStatusEnum } from '@/utils/constants'
 import { formatDate } from '@/utils/formatTime'
+import { defaultProps, handleTree } from '@/utils/tree'
 import { getPlanSimpleList } from '@/api/pers/attendancePlan'
 import { getSimpleAppList } from '@/api/system/app'
+import * as DeptApi from '@/api/system/dept'
 
 import * as EmployeeApi from '@/api/pers/employee'
 
@@ -219,6 +228,8 @@ const attendanceSettingIdOptions = ref([])
 const instanceIdsOptions = ref([])
 const employeeOptions = ref([])
 
+const deptList = ref([])
+
 /** 打开弹窗 */
 const open = async (type, id) => {
   dialogVisible.value = true
@@ -234,6 +245,7 @@ const open = async (type, id) => {
       formLoading.value = false
     }
   }
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList({ allFlag: true }))
   getOptions()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗