部门修改

.env.base

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

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "i18n-ally.localesPaths": [
+        "src/locales"
+    ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ss-oa-manage",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "莳松oa管理系统",
   "author": "ss",
   "private": false,
@@ -51,7 +51,7 @@
     "diagram-js": "^11.6.0",
     "echarts": "^5.4.2",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "2.3.4",
+    "element-plus": "2.9.4",
     "fast-xml-parser": "^4.2.2",
     "highlight.js": "^11.8.0",
     "intro.js": "^7.0.1",

src/api/okr/comment.js

@@ -0,0 +1,38 @@
+import request from '@/config/axios'
+
+// 创建
+export const createComment = (data) => {
+  return request.post({
+    url: '/admin-api/okr/comments/create',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 分页
+export const getCommentPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/comments/page',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取评论类型
+export const getCommentTypeOptions = () => {
+  return request.get({
+    url: '/admin-api/okr/dict-data/get-by-type',
+    params: { dictType: 'comment_type' }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 点赞评论
+export const likeComment = (commentId) => {
+  return request.put({
+    url: '/admin-api/okr/comments-likes/update',
+    data: { commentId }
+    // headers: { 'instance-id': 1016 }
+  })
+}

src/api/okr/okr.js

@@ -0,0 +1,110 @@
+import request from '@/config/axios'
+
+// 创建
+export const createOkrNode = (data) => {
+  return request.post({
+    url: '/admin-api/okr/node/add',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 修改
+export const updateOkrNode = (data) => {
+  return request.put({
+    url: '/admin-api/okr/node/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 查询详情
+export const getOkrNodeDetail = (nodeId) => {
+  return request.get({
+    url: '/admin-api/okr/node/get',
+    params: { nodeId }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 我负责的 - 节点树
+export const getMyNodeTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/my/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 我负责的 - okr列表
+export const getMyOkrPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/my/object/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 全部目标 - 节点树
+export const getAllNodeTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/all/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 全部目标 - okr列表
+export const getAllOkrPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/all/object/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取节点操作历史
+export const getOkrNodeHistory = (nodeId) => {
+  return request.get({
+    url: '/admin-api/okr/record/list',
+    params: { nodeId }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取系统默认的关键成果内容
+export const getDefaultOkrOptions = () => {
+  return request.get({
+    url: '/admin-api/okr/dict-data/get-by-type',
+    params: { dictType: 'key_result_source' }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 更新OKR进度
+export const updateOkrProgress = (data) => {
+  return request.put({
+    url: '/admin-api/okr/node/progress/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取目标关系树一级节点
+export const getOkrRelationTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/first-node',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取目标关系树下级节点数据
+export const getOkrRelationTreeChildren = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/node-tree',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}

src/api/okr/wait.js

@@ -0,0 +1,83 @@
+import request from '@/config/axios'
+
+// 创建
+export const createWait = (data) => {
+  return request.post({
+    url: '/admin-api/okr/agent-work/create',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 修改
+export const updateWait = (data) => {
+  return request.put({
+    url: '/admin-api/okr/agent-work/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 分页
+export const getWaitPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/page',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 详情
+export const getWaitDetail = (id) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/get',
+    params: { id }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 删除
+export const deleteWait = (id) => {
+  return request.delete({
+    url: '/admin-api/okr/agent-work/delete',
+    params: { id }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 催办
+export const urgeWait = (workId) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/urge',
+    params: { workId }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 跟进待办
+export const followWait = (data) => {
+  return request.post({
+    url: '/admin-api/okr/agent-work-follow/create',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 查询跟进记录
+export const getFollowWaitPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work-follow/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+export const getWaitCount = (params) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/getAgentWorkNum',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}

src/components/Crontab/src/Crontab.vue

@@ -542,10 +542,10 @@ const submit = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.second.type">
-                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.second.type == '1'" label="范围">
@@ -601,10 +601,10 @@ const submit = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.minute.type">
-                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.minute.type == '1'" label="范围">
@@ -660,10 +660,10 @@ const submit = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.hour.type">
-                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.hour.type == '1'" label="范围">
@@ -719,12 +719,12 @@ const submit = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.day.type">
-                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
-                <el-radio-button label="4">本月最后一天</el-radio-button>
+                <el-radio-button value="4">本月最后一天</el-radio-button>
-                <el-radio-button label="5">不指定</el-radio-button>
+                <el-radio-button value="5">不指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.day.type == '1'" label="范围">
@@ -780,10 +780,10 @@ const submit = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.month.type">
-                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.month.type == '1'" label="范围">
@@ -840,12 +840,12 @@ const submit = () => {
             <el-form>
               <el-form-item label="类型">
                 <el-radio-group v-model="cronValue.week.type">
-                  <el-radio-button label="0">任意值</el-radio-button>
+                  <el-radio-button value="0">任意值</el-radio-button>
-                  <el-radio-button label="1">范围</el-radio-button>
+                  <el-radio-button value="1">范围</el-radio-button>
-                  <el-radio-button label="2">间隔</el-radio-button>
+                  <el-radio-button value="2">间隔</el-radio-button>
-                  <el-radio-button label="3">指定</el-radio-button>
+                  <el-radio-button value="3">指定</el-radio-button>
-                  <el-radio-button label="4">本月最后一周</el-radio-button>
+                  <el-radio-button value="4">本月最后一周</el-radio-button>
-                  <el-radio-button label="5">不指定</el-radio-button>
+                  <el-radio-button value="5">不指定</el-radio-button>
                 </el-radio-group>
               </el-form-item>
               <el-form-item v-if="cronValue.week.type == '1'" label="范围">
@@ -919,11 +919,11 @@ const submit = () => {
           <el-form>
             <el-form-item label="类型">
               <el-radio-group v-model="cronValue.year.type">
-                <el-radio-button label="-1">忽略</el-radio-button>
+                <el-radio-button value="-1">忽略</el-radio-button>
-                <el-radio-button label="0">任意值</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item v-if="cronValue.year.type == '1'" label="范围">

src/components/Pagination/index.vue

@@ -4,7 +4,6 @@
     v-show="total > 0"
     v-model:current-page="currentPage"
     v-model:page-size="pageSize"
-    :small="small"
     :background="true"
     :page-sizes="[10, 20, 50, 100, 200]"
     :pager-count="pagerCount"
@@ -43,10 +42,6 @@ const props = defineProps({
   layout: {
     type: String,
     default: 'total, sizes, prev, pager, next, jumper'
-  },
-  small: {
-    type: Boolean,
-    default: false
   }
 })
 

src/config/axios/index.ts

@@ -5,7 +5,7 @@ import { config } from './config'
 const { default_headers } = config
 
 const request = (option: any) => {
-  const { url, method, params, data, headersType, responseType, isSubmitForm } = option
+  const { url, method, params, data, headersType, responseType, isSubmitForm, headers } = option
   return service({
     url: url,
     method,
@@ -14,7 +14,8 @@ const request = (option: any) => {
     data,
     responseType: responseType,
     headers: {
-      'Content-Type': headersType || default_headers
+      'Content-Type': headersType || default_headers,
+      ...headers
     }
   })
 }

src/config/axios/service.ts

@@ -66,7 +66,8 @@ service.interceptors.request.use(
 
     // 设置实例
     const appId = getAppId()
-    if (appId) (config as Recordable).headers['instance-id'] = appId
+    if (appId && !(config as Recordable).headers['instance-id'])
+      (config as Recordable).headers['instance-id'] = appId
 
     const params = config.params || {}
     const data = config.data || false

src/styles/index.scss

@@ -69,3 +69,32 @@
     width: 100%;
   }
 }
+
+
+.dialog-okr {
+  width: 94vw;
+  height: 94vh;
+  max-width: 1800px;
+  max-height: 1000px;
+  margin: 0;
+}
+.dialog-okr .el-dialog__header {
+  padding: 0 !important;
+}
+.okr-info-dialog {
+  .el-dialog__body {
+    padding-top: 0;
+  }
+}
+
+/* 去除 Chrome、Safari、Edge、Opera 中的指示器 */
+.el-input__inner::-webkit-outer-spin-button,
+.el-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* 去除 Firefox 中的指示器 */
+.el-input__inner[type='number'] {
+  -moz-appearance: textfield;
+}

src/views/Basic/Dept/DeptForm.vue

@@ -32,9 +32,10 @@
           <el-form-item label="负责人" prop="leaderUserId">
             <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
               <el-option
-                v-for="item in userList"
+                v-for="item in employeeOptions"
                 :key="item.id"
-                :label="item.nickname"
+                :disabled="item.status == 1"
+                :label="item.name"
                 :value="item.id"
               />
             </el-select>
@@ -43,8 +44,8 @@
         <el-col :span="12" :offset="0">
           <el-form-item label="状态" prop="status">
             <el-radio-group v-model="formData.status">
-              <el-radio :label="0"> 启用 </el-radio>
+              <el-radio :value="0"> 启用 </el-radio>
-              <el-radio :label="1"> 禁用 </el-radio>
+              <el-radio :value="1"> 禁用 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -55,6 +56,26 @@
             <el-input-number v-model="formData.sort" :min="0" />
           </el-form-item>
         </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="开通系统" prop="instanceIds">
+            <el-select
+              v-model="formData.instanceIds"
+              placeholder="选择开通系统"
+              multiple
+              collapse-tags
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in instanceIdsOptions"
+                :key="item.instanceId"
+                :label="item.instanceName"
+                :disabled="item.status == 1"
+                :value="item.instanceId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24" :offset="0">
@@ -73,8 +94,9 @@
 <script lang="ts" name="SystemDeptForm" setup>
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
-import * as UserApi from '@/api/system/user'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
 import { CommonStatusEnum } from '@/utils/constants'
+import { getSimpleAppList } from '@/api/system/app'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -90,7 +112,8 @@ const formData = ref({
   sort: 1,
   leaderUserId: undefined,
   status: CommonStatusEnum.ENABLE,
-  remark: undefined
+  remark: undefined,
+  instanceIds: undefined
 })
 const formRules = reactive<any>({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
@@ -104,7 +127,8 @@ const formRules = reactive<any>({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const employeeOptions = ref<any>([]) // 用户列表
+const instanceIdsOptions = ref<any>([]) // 实例ids
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -122,7 +146,13 @@ const open = async (type: string, id?: number) => {
     }
   }
   // 获得用户列表
-  userList.value = await UserApi.getSimpleUserList()
+  getEmployeeSimpleList().then((data) => {
+    employeeOptions.value = data
+  })
+  //实例
+  getSimpleAppList().then((data) => {
+    instanceIdsOptions.value = data
+  })
   // 获得部门树
   await getTree()
 }
@@ -163,7 +193,8 @@ const resetForm = () => {
     sort: 1,
     leaderUserId: undefined,
     status: CommonStatusEnum.ENABLE,
-    remark: undefined
+    remark: undefined,
+    instanceIds: undefined
   }
   formRef.value?.resetFields()
 }

src/views/Basic/Dept/index.vue

@@ -22,8 +22,15 @@
   <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="sort" label="排序" width="200" />
+    <el-table-column prop="instanceNames" label="业务系统" width="200" />
-    <el-table-column prop="status" label="状态" width="100" />
+    <el-table-column prop="sort" label="排序" width="80" />
+    <el-table-column prop="status" label="状态" width="100">
+      <template #default="scope">
+        <el-tag :type="scope.row.status == 0 ? 'success' : 'danger'">
+          {{ scope.row.status == 0 ? '正常' : '停用' }}
+        </el-tag>
+      </template>
+    </el-table-column>
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
     <el-table-column label="操作" class-name="fixed-width" width="160">
       <template #default="scope">

src/views/Basic/Menu/MenuForm.vue

@@ -32,9 +32,9 @@
       </el-form-item>
       <el-form-item label="菜单类型" prop="type">
         <el-radio-group v-model="formData.type">
-          <el-radio-button :label="1"> 目录 </el-radio-button>
+          <el-radio-button :value="1"> 目录 </el-radio-button>
-          <el-radio-button :label="2"> 菜单 </el-radio-button>
+          <el-radio-button :value="2"> 菜单 </el-radio-button>
-          <el-radio-button :label="3"> 按钮 </el-radio-button>
+          <el-radio-button :value="3"> 按钮 </el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="formData.type !== 3" label="菜单图标">
@@ -69,8 +69,8 @@
       </el-form-item>
       <el-form-item label="菜单状态" prop="status">
         <el-radio-group v-model="formData.status">
-          <el-radio :label="0"> 启用 </el-radio>
+          <el-radio :value="0"> 启用 </el-radio>
-          <el-radio :label="1"> 禁用 </el-radio>
+          <el-radio :value="1"> 禁用 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="formData.type !== 3" label="显示状态" prop="visible">

src/views/Basic/User/UserForm.vue

@@ -16,8 +16,8 @@
         <el-col :span="12">
           <el-form-item label="用户性别">
             <el-radio-group v-model="formData.sex">
-              <el-radio :label="1"> 男 </el-radio>
+              <el-radio :value="1"> 男 </el-radio>
-              <el-radio :label="2"> 女 </el-radio>
+              <el-radio :value="2"> 女 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

src/views/Finance/Commission/Comp/DialogPlan.vue

@@ -17,10 +17,10 @@
         <el-col :span="12" :offset="0">
           <el-form-item label="结算方式">
             <el-radio-group v-model="formData.percentageType">
-              <el-radio :label="1">
+              <el-radio :value="1">
                 <Tooltip message="可配置多级，命中某档位后，按照档位分级结算" />阶梯结算
               </el-radio>
-              <el-radio :label="2">
+              <el-radio :value="2">
                 <Tooltip message="可配置多级，命中某档位后所有金额全部按照该档位结算" />常规结算
               </el-radio>
             </el-radio-group>
@@ -164,8 +164,8 @@
         <el-col :span="8" :offset="0">
           <el-form-item label="包含区域提成" labelWidth="150px">
             <el-radio-group v-model="formData.isAreaPercentage">
-              <el-radio :label="true"> 是 </el-radio>
+              <el-radio :value="true"> 是 </el-radio>
-              <el-radio :label="false"> 否 </el-radio>
+              <el-radio :value="false"> 否 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -174,24 +174,24 @@
         <el-col :span="8" :offset="0">
           <el-form-item label="是否关联成交率" labelWidth="150px">
             <el-radio-group v-model="formData.isRelateSignRate">
-              <el-radio :label="true"> 是 </el-radio>
+              <el-radio :value="true"> 是 </el-radio>
-              <el-radio :label="false"> 否 </el-radio>
+              <el-radio :value="false"> 否 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="0">
           <el-form-item label="是否扣除其他支出" labelWidth="150px">
             <el-radio-group v-model="formData.isDeductExtraPay">
-              <el-radio :label="true"> 是 </el-radio>
+              <el-radio :value="true"> 是 </el-radio>
-              <el-radio :label="false"> 否 </el-radio>
+              <el-radio :value="false"> 否 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="0">
           <el-form-item label="是否扣除售后" labelWidth="150px">
             <el-radio-group v-model="formData.isDeductAfterSale">
-              <el-radio :label="true"> 是 </el-radio>
+              <el-radio :value="true"> 是 </el-radio>
-              <el-radio :label="false"> 否 </el-radio>
+              <el-radio :value="false"> 否 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

src/views/Finance/Salary/index.vue

@@ -11,8 +11,8 @@
       </el-form-item>
       <el-form-item>
         <el-radio-group v-model="searchForm.status" @change="handleQuery">
-          <el-radio :label="0"> 在职 </el-radio>
+          <el-radio :value="0"> 在职 </el-radio>
-          <el-radio :label="1"> 离职 </el-radio>
+          <el-radio :value="1"> 离职 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item>

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

@@ -0,0 +1,138 @@
+<template>
+  <div>
+    <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"
+          check-strictly
+          style="width: 400px"
+          @change="nodeChange"
+        />
+        <el-button class="ml-10px" type="primary" @click="handleAddNode">新建节点</el-button>
+      </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-button
+          type="success"
+          v-if="searchForm.executor?.includes(currentUserId)"
+          @click="handleUpdateProcess"
+          >更新进度</el-button
+        >
+      </el-row>
+    </div>
+
+    <OkrTable ref="okrTableRef" :canEdit="isCurrentLeafNode" />
+    <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
+    <DialogOkrInfo ref="dialogOkrInfo" @success="handleSearchPeroid" />
+  </div>
+</template>
+
+<script setup name="AllTarget">
+import OkrTable from './OkrTable.vue'
+import DialogOkrInfo from './DialogOkrInfo.vue'
+import DialogOkr from './DialogOkr.vue'
+
+import { getAllNodeTree, getAllOkrPage } from '@/api/okr/okr'
+import { listToTree, findNode } from '@/utils/tree'
+import { useUserStore } from '@/store/modules/user'
+
+const message = useMessage()
+const userStore = useUserStore()
+const currentUserId = userStore.getUser.id
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const okrTableRef = ref(null)
+const searchForm = ref({
+  nodeId: undefined
+})
+
+const peroidList = ref([])
+
+handleSearchPeroid()
+
+// 当前是否是叶子节点
+// 如果不是叶子节点，则表格数据不可修改
+const isCurrentLeafNode = ref(false)
+
+function handleSearchPeroid() {
+  getAllNodeTree().then((resp) => {
+    peroidList.value = listToTree(resp.tree, {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+    nodeChange(resp.nodeId)
+  })
+}
+
+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
+  }
+}
+
+function getOkrList() {
+  getAllOkrPage(searchForm.value).then((resp) => {
+    const list = resp
+    nextTick(() => {
+      okrTableRef.value.prepareData(list)
+    })
+  })
+}
+
+const dialogOkrInfo = ref(null)
+function handleAddNode() {
+  dialogOkrInfo.value.open('create', null)
+}
+
+function handleEditOkr() {
+  dialogOkr.value.close()
+  dialogOkrInfo.value.open('update', searchForm.value.nodeId)
+}
+
+function handleUpdateProcess() {
+  okrTableRef.value.updateProcess(searchForm.value.nodeId).then(() => {
+    message.success('更新成功')
+    getOkrList()
+  })
+}
+
+const dialogOkr = ref(null)
+function handleShowOkr(id) {
+  dialogOkr.value.open({
+    nodeId: id,
+    canEdit: isCurrentLeafNode.value
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-overlay-dialog) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

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

@@ -18,11 +18,11 @@
           <span class="text-14px ml-0.25">ork落地</span>
           <div class="ml-20px text-14px">
             <span>【节点】</span>
-            <span>寻驾全年目标 -> 1月</span>
+            <span>{{ nodeInfo.allNodeName }}</span>
           </div>
         </div>
         <div class="flex items-center">
-          <el-button link @click="emit('edit')">
+          <el-button v-if="nodeInfo.creatorId == currentUserId" link @click="emit('edit')">
             <el-tooltip content="编辑" placement="top" effect="dark">
               <Icon icon="ep:edit" :size="16" />
             </el-tooltip>
@@ -43,73 +43,36 @@
             <div class="detail-basic-title">
               <div class="basic-title-item">
                 <div class="basic-title-label">创建人</div>
-                <div class="basic-title-value">张三</div>
+                <div class="basic-title-value">{{ nodeInfo.creator }}</div>
               </div>
               <div class="basic-title-item">
                 <div class="basic-title-label">执行人</div>
-                <div class="basic-title-value">张三、李四</div>
+                <div class="basic-title-value">{{ nodeInfo.executorName || '无' }}</div>
               </div>
               <div class="basic-title-item">
                 <div class="basic-title-label">目标数</div>
-                <div class="basic-title-value">3</div>
+                <div class="basic-title-value">{{ okrList.length }}</div>
               </div>
               <div class="basic-title-item" style="min-width: 200px">
                 <div class="basic-title-label">总体进度</div>
-                <el-progress :percentage="60" :stroke-width="8" />
+                <el-progress :percentage="parseInt(nodeInfo.progress) || 0" :stroke-width="8" />
               </div>
             </div>
             <div class="flex detail-basic-info">
-              <span>开始日期：2025-01-01</span>
+              <span>开始日期：{{ nodeInfo.startTime }}</span>
-              <span>截止日期：2025-01-31</span>
+              <span>截止日期：{{ nodeInfo.endTime }}</span>
-              <span>最新更新时间：2025-01-15</span>
+              <span>最新更新时间：{{ nodeInfo.updateTime }}</span>
             </div>
           </div>
           <div class="flex" style="position: relative; flex: 1; height: 100px">
             <el-tabs v-model="workIndex" style="flex: 1">
               <el-tab-pane label="目标/关键成果" name="okr">
                 <div class="content-wrap">
-                  <el-table :data="okrList" default-expand-all row-key="id" size="large">
+                  <OkrTable ref="okrTableRef" :canEdit="canEdit" />
-                    <el-table-column label="目标/关键成果">
-                      <template #default="{ row }">
-                        <span v-if="row.type === 'object'">【目标】{{ row.name }}</span>
-                        <template v-else>
-                          <span>
-                            【关键成果】{{ row.channelName }} {{ row.target }}
-                            <span v-if="row.targetType == 'value'">{{ row.targetNum }}</span>
-                          </span>
-                          <div class="flex items-center mt-10px ml-50px">
-                            <span>当前进度：</span>
-                            <span v-if="row.isSystem">{{ row.currentNum }}</span>
-                            <el-input
-                              v-else-if="row.targetType == 'value'"
-                              v-model="row.currentNum"
-                              clearable
-                              size="small"
-                              style="width: 200px"
-                            />
-                            <el-radio-group
-                              v-else-if="row.targetType == 'radio'"
-                              v-model="row.currentValue"
-                              size="small"
-                            >
-                              <el-radio :label="true">是</el-radio>
-                              <el-radio :label="false">否</el-radio>
-                            </el-radio-group>
-                          </div>
-                        </template>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="process" label="进度" width="200px">
-                      <template #default="{ row }">
-                        <el-progress :percentage="row.process" />
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="users" label="执行人" width="200px" />
-                  </el-table>
                 </div>
               </el-tab-pane>
             </el-tabs>
-            <el-button class="sav-btn" type="primary" @click="handleSaveProcess">
+            <el-button v-if="canEdit" class="sav-btn" type="primary" @click="handleSaveProcess">
               保存并更新
             </el-button>
           </div>
@@ -119,43 +82,43 @@
             <el-tab-pane label="子节点" name="subNode">
               <div class="overflow-y-auto" style="height: calc(100% - 50px)">
                 <div
-                  v-for="index in 12"
+                  v-for="item in childNodeList"
-                  :key="index"
+                  :key="item.nodeId"
                   class="border-b-1 child-item"
                   style="padding: 10px 5px; cursor: pointer"
-                  @click="handleChildItem"
+                  @click="handleChildItem(item)"
                 >
                   <div
                     class="flex justify-between items-center overflow-hidden text-16px"
                     style="line-height: 30px"
                   >
-                    <div class="child-label">【节点】子节点{{ index }}</div>
+                    <div class="child-label">【节点】{{ item.nodeName }}</div>
                     <el-progress
                       type="line"
-                      :percentage="0"
+                      :percentage="parseInt(item.progress) || 0"
                       :stroke-width="6"
                       style="width: 120px"
                     />
                   </div>
                   <div class="ml-10px flex items-center text-13px" style="line-height: 30px">
                     <span>目标数：</span>
-                    <span style="color: #aaa">4</span>
+                    <span style="color: #aaa">{{ item.objectiveNum }}</span>
                     <el-divider direction="vertical" style="margin: 0 20px" />
                     <div
                       class="flex-1 overflow-hidden h-30px"
                       style="text-overflow: ellipsis; white-space: nowrap"
                     >
                       <span>执行人：</span>
-                      <span style="color: #aaa">张三、李四、王二</span>
+                      <span style="color: #aaa">{{ item.executorName || '无' }}</span>
                     </div>
                   </div>
                   <div
                     class="ml-10px flex items-center text-12px"
                     style="line-height: 20px; color: #aaa"
                   >
-                    <span>开始日期：2025-01-01</span>
+                    <span>开始日期：{{ item.startTime }}</span>
                     <el-divider direction="vertical" style="margin: 0 20px" />
-                    <span>截止日期：2025-01-31</span>
+                    <span>截止日期：{{ item.endTime }}</span>
                   </div>
                 </div>
               </div>
@@ -171,11 +134,12 @@
                     style="width: 120px"
                     @change="getCommentTemplate"
                   >
-                    <el-option label="总结" :value="1" />
+                    <el-option
-                    <el-option label="日报" :value="2" />
+                      v-for="it in commentTypeOptions"
-                    <el-option label="周报" :value="3" />
+                      :label="it.label"
-                    <el-option label="月报" :value="4" />
+                      :value="it.id"
-                    <!-- <el-option label="评论" :value="5" disabled /> -->
+                      :key="it.id"
+                    />
                   </el-select>
 
                   <div v-if="addNewComment">
@@ -195,7 +159,12 @@
                     :toolbarConfig="toolbarConfig"
                   />
                 </div>
-                <div v-for="index in 12" :key="index" class="border-b-1" style="padding: 10px 5px">
+                <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"
@@ -210,28 +179,42 @@
                         "
                         fit="fill"
                       >
-                        <span class="text-12px">门庆</span>
+                        <span class="text-12px">{{ it.creatorName.slice(-2) }}</span>
                       </el-avatar>
-                      <div class="ml-10px text-16px">西门庆</div>
+                      <div class="ml-10px text-16px">{{ it.creatorName }}</div>
                     </div>
-                    <div class="ml-10px text-13px text-gray-400">01-01 12:15</div>
                   </div>
-                  <div class="ml-10px" v-dompurify-html="commentListVal"></div>
+                  <div class="ml-10px" v-dompurify-html="it.content"></div>
                   <div
-                    class="ml-10px mt-10px flex items-center text-12px"
+                    class="ml-10px mt-10px flex items-center justify-between text-12px"
                     style="line-height: 20px; color: #aaa"
                   >
-                    <div class="flex items-center mr-50px">
+                    <div class="flex items-center">
-                      <el-button link @click="good(index)">
+                      <div class="flex items-center mr-50px">
-                        <Icon icon="fa:thumbs-o-up" :size="16" />
+                        <el-button link @click="good(it)">
-                      </el-button>
+                          <Icon
-                      <span class="ml-5px">6</span>
+                            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="showComment(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="flex items-center mr-50px">
+                    <div class="ml-10px text-13px text-gray-400">
-                      <el-button link @click="showComment(index)">
+                      {{ formatDate(it.createTime, 'YYYY-MM-DD HH:mm') }}
-                        <Icon icon="ep:chat-dot-square" :size="16" />
-                      </el-button>
-                      <span class="ml-5px">1</span>
                     </div>
                   </div>
                   <!-- 评论 -->
@@ -241,22 +224,19 @@
                     style="margin: 10px 10px 0 10px; border-radius: 4px"
                     label="评论"
                   >
-                    <div class="text-14px" style="line-height: 24px">
+                    <div
-                      <span class="font-bold">武大郎：</span>
+                      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="text-14px" style="line-height: 24px">
-                      <span class="font-bold">潘金莲：</span>
-                      <span>西门大官人，我要给你生猴子❥(^_-)</span>
-                    </div>
-                    <div class="text-14px" style="line-height: 24px">
-                      <span class="font-bold">武二郎：</span>
-                      <span>如同天上降魔主，真乃人间太岁</span>
-                    </div>
                     <div class="mt-10px relative">
-                      <el-input
+                      <!-- <el-input
                         v-model="form.commentValue"
                         placeholder="请输入评论"
                         type="textarea"
@@ -264,12 +244,30 @@
                         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="{ item }">
+                          <div class="flex items-center justify-between h-full">
+                            <span class="text-14px text-dark-700">{{ item.name }}</span>
+                            <span class="text-12px text-gray-400">{{ item.dept }}</span>
+                          </div>
+                        </template>
+                      </el-mention>
                       <el-button
                         type="primary"
                         size="small"
                         style="position: absolute; right: 2px; bottom: 2px"
-                        @click="handleSendCommnet"
+                        @click="handleSendCommnet(index)"
                       >
                         发布
                       </el-button>
@@ -281,23 +279,16 @@
             <el-tab-pane label="进度历史" name="history">
               <div class="overflow-y-auto pl-15px" style="height: calc(100% - 50px)">
                 <el-timeline class="ml-10px">
-                  <el-timeline-item placement="bottom" timestamp="2025-01-20" color="#30d1fc">
+                  <el-timeline-item
-                    <div>张三</div>
+                    v-for="item in nodeRecords"
+                    :key="item.recordId"
+                    placement="bottom"
+                    :timestamp="formatDate(item.createTime, 'YYYY-MM-DD HH:mm:ss')"
+                    color="#30d1fc"
+                  >
+                    <div>{{ item.creator }}</div>
                     <div class="mt-10px text-14px" style="line-height: 24px; color: #666">
-                      进度变化：40% -> 60%
+                      {{ item.content }}
-                      （节点进度是读取目标进度计算的，目标进度根据关键成果计算，关键成果在提交跟新时会有）
-                    </div>
-                  </el-timeline-item>
-                  <el-timeline-item placement="bottom" timestamp="2025-01-15" color="#30d1fc">
-                    <div>张三</div>
-                    <div class="mt-10px text-14px" style="line-height: 24px; color: #666">
-                      更新节点
-                    </div>
-                  </el-timeline-item>
-                  <el-timeline-item placement="bottom" timestamp="2025-01-01" color="#30d1fc">
-                    <div>张三</div>
-                    <div class="mt-10px text-14px" style="line-height: 24px; color: #666">
-                      创建节点
                     </div>
                   </el-timeline-item>
                 </el-timeline>
@@ -311,9 +302,27 @@
 </template>
 
 <script setup name="DialogOkr">
+import { formatDate } from '@/utils/formatTime'
+import OkrTable from './OkrTable.vue'
+
+import { getOkrNodeDetail, getOkrNodeHistory } from '@/api/okr/okr'
+import {
+  getCommentTypeOptions,
+  createComment,
+  getCommentPage,
+  likeComment
+} from '@/api/okr/comment'
+import { listToTree } from '@/utils/tree'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+import { useUserStore } from '@/store/modules/user'
+
+const message = useMessage()
+const userStore = useUserStore()
+const currentUserId = userStore.getUser.id
 const emit = defineEmits(['edit'])
 
 const show = ref(false)
+const canEdit = ref(false)
 
 const toolbarConfig = {
   toolbarKeys: [
@@ -333,118 +342,63 @@ const toolbarConfig = {
 
 const workIndex = ref('okr')
 const okrList = ref([])
+const childNodeList = ref([])
 const sideIndex = ref('subNode')
 
-async function open(id) {
+const okrTableRef = ref(null)
-  show.value = true
+const nodeInfo = ref({})
+
+const nodeRecords = ref([])
+const commentTypeOptions = ref([])
+
+function open(curNode) {
+  canEdit.value = curNode.canEdit
+  nodeInfo.value.nodeId = curNode.nodeId
   // 获取数据详情
-  console.log(id)
+  searchInfo(curNode)
-  okrList.value = [
+  show.value = true
-    {
+}
-      id: 1,
+
-      name: '销售成交额达到1000万，总体成交率15%',
+const employeeOptions = ref([])
-      process: 60,
+
-      type: 'object',
+function searchInfo(curNode) {
-      children: [
+  try {
-        {
+    getOkrNodeDetail(curNode.nodeId).then((resp) => {
-          id: 11,
+      nodeInfo.value = {
-          type: 'keyresult',
+        ...resp,
-          channelName: '抖音',
+        executor: resp.executor || []
-          target: '线索目标',
+      }
-          targetType: 'value',
+      canEdit.value =
-          isSystem: true,
+        canEdit.value && currentUserId == nodeInfo.value.executor.includes(currentUserId)
-          targetNum: 10000,
+      if (resp.objectives) {
-          targetValue: false,
+        okrList.value = resp.objectives.map((item) => ({
-          currentNum: 5000,
+          ...item,
-          currentValue: false,
+          keyResults: item.keyResults || []
-          process: 60,
+        }))
-          users: '张三、李四'
+      } else {
-        },
+        okrList.value = []
-        {
+      }
-          id: 12,
+      childNodeList.value = [...resp.children]
-          type: 'keyresult',
+      nextTick(() => {
-          channelName: '抖音',
+        okrTableRef.value.prepareData(okrList.value)
-          target: '成交数',
+      })
-          isSystem: true,
+    })
-          targetType: 'value',
+    getOkrNodeHistory(curNode.nodeId).then((resp) => {
-          targetNum: 2500,
+      nodeRecords.value = resp
-          targetValue: false,
+    })
-          currentNum: 500,
+    getEmployeeSimpleList({ status: 0 }).then((resp) => {
-          currentValue: false,
+      employeeOptions.value = resp.map((item) => ({
-          process: 60,
+        ...item,
-          users: '张三、李四'
+        label: item.name,
-        }
+        value: item.name
-      ]
+      }))
-    },
+    })
-    {
+    getCommentTypeOptions().then((resp) => {
-      id: 2,
+      commentTypeOptions.value = resp
-      name: '运营消耗预算控制在20万以内，获得10万条线索',
+    })
-      process: 80,
+    searchCommentList()
-      type: 'object',
+  } finally {
-      children: [
+  }
-        {
-          id: 21,
-          type: 'keyresult',
-          target: '本月抖音运营投入相较上月少10%',
-          targetType: 'radio',
-          isSystem: false,
-          targetNum: 0,
-          targetValue: false,
-          currentNum: 0,
-          currentValue: false,
-          process: 0,
-          users: ''
-        },
-        {
-          id: 22,
-          type: 'keyresult',
-          target: '累计输出作品',
-          process: 15,
-          users: '',
-          isSystem: false,
-          targetType: 'value',
-          targetNum: 200,
-          targetValue: false,
-          currentNum: 30,
-          currentValue: false
-        }
-      ]
-    },
-    {
-      id: 3,
-      name: '目标3',
-      process: 40,
-      type: 'object',
-      children: [
-        {
-          id: 31,
-          type: 'keyresult',
-          target: '关键成果1',
-          process: 100,
-          users: '',
-          isSystem: false,
-          targetType: 'radio',
-          targetNum: 0,
-          targetValue: false,
-          currentNum: 0,
-          currentValue: true
-        },
-        {
-          id: 22,
-          type: 'keyresult',
-          target: '关键成果2',
-          process: 15,
-          users: '',
-          isSystem: false,
-          targetType: 'value',
-          targetNum: 200,
-          targetValue: false,
-          currentNum: 30,
-          currentValue: false
-        }
-      ]
-    }
-  ]
 }
 
 function close() {
@@ -453,42 +407,96 @@ function close() {
 
 defineExpose({ open, close })
 
-function handleSaveProcess() {
+function handleMention(item) {
-  console.log(okrList.value)
+  form.value.mentionedUserIdList.push(item.id)
 }
 
-function handleChildItem() {
+function handleSaveProcess() {
-  console.log('handleChildItem')
+  okrTableRef.value.updateProcess(nodeInfo.value.nodeId).then(() => {
+    message.success('更新成功')
+    searchInfo()
+  })
+}
+
+function handleChildItem(item) {
+  const arr = item.executor || []
+  const isExecutor = arr.includes(currentUserId)
+  canEdit.value = isExecutor && (!item.children || item.children.length == 0)
+  searchInfo(item)
 }
 
 const addNewComment = ref(false)
 const form = ref({
   commentValue: '',
-  commentType: 1
+  commentType: undefined,
+  mentionedUserIdList: []
 })
 function handleInsertComment() {
   addNewComment.value = true
-  form.value = {
+  const defaultComment = commentTypeOptions.value[0]
-    commentValue: '',
+  if (defaultComment) {
-    commentType: 1
+    form.value = {
+      commentType: defaultComment.id,
+      mentionedUserIdList: []
+    }
   }
   getCommentTemplate()
 }
 
 function getCommentTemplate() {
-  form.value.commentValue = `<h2 style=\"text-align: start;\">一、工作概况</h2><p> &nbsp; &nbsp;</p><h2 style=\"text-align: start;\">二、数据统计</h2><ol><li>呼出电话数：</li><li>有效沟通数：</li><li>销售成果</li></ol><h2 style=\"text-align: start;\">三、问题与改进方案</h2><p><br></p>`
+  if (form.value.commentType) {
+    form.value.commentValue = commentTypeOptions.value.find(
+      (item) => item.id == form.value.commentType
+    ).remark
+  } else {
+    form.value.commentValue = `<h2 style=\"text-align: start;\">一、工作概况</h2><p> &nbsp; &nbsp;</p><h2 style=\"text-align: start;\">二、数据统计</h2><ol><li>呼出电话数：</li><li>有效沟通数：</li><li>销售成果</li></ol><h2 style=\"text-align: start;\">三、问题与改进方案</h2><p><br></p>`
+  }
 }
 
 function handleSaveComment() {
   addNewComment.value = false
+  try {
+    const data = {
+      businessType: 1,
+      businessId: nodeInfo.value.nodeId,
+      contentType: 1,
+      content: form.value.commentValue,
+      mentionedUserIdList: form.value.mentionedUserIdList
+    }
+    createComment(data)
+      .then(() => {
+        message.success('评论成功')
+        searchCommentList()
+      })
+      .finally(() => {
+        form.value.commentValue = ''
+      })
+  } catch (error) {
+    message.error('评论失败')
+  }
+}
+const commentList = ref([])
+
+function searchCommentList() {
+  getCommentPage({
+    businessType: 1,
+    businessId: nodeInfo.value.nodeId,
+    pageNum: 1,
+    pageSize: -1
+  }).then((resp) => {
+    commentList.value = listToTree(resp.list, {
+      id: 'commentId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
 }
 
-const commentListVal = ref(
+function good(item) {
-  `<h2 style=\"text-align: start;\">一、工作概况</h2><p> &nbsp; 刷牙洗脸吃饭穿鞋出门开车上班捣台球&nbsp;</p><h2 style=\"text-align: start;\">二、数据统计</h2><ol><li>呼出电话数：666</li><li>有效沟通数：123</li><li>销售成果：今日成交20，本月成交120，距离目标还差888</li></ol><h2 style=\"text-align: start;\">三、问题与改进方案</h2><p>无<br></p>`
+  likeComment(item.commentId).then(() => {
-)
+    message.success('点赞成功')
-
+    searchCommentList()
-function good(index) {
+  })
-  console.log(index)
 }
 
 const showCommentIndex = ref(-1)
@@ -496,8 +504,37 @@ function showComment(index) {
   showCommentIndex.value = showCommentIndex.value == index ? -1 : index
 }
 
-function handleSendCommnet() {
+function handleSendCommnet(idx) {
-  console.log(form.value.commentValue)
+  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: 1,
+      businessId: nodeInfo.value.nodeId,
+      contentType: 1,
+      content: form.value.commentValue,
+      mentionedUserIdList: arr,
+      parentId: commentList.value[idx].commentId
+    }
+    createComment(data)
+      .then(() => {
+        message.success('评论成功')
+        searchCommentList()
+      })
+      .finally(() => {
+        form.value.commentValue = ''
+      })
+  } catch (error) {
+    message.error('评论失败')
+  }
 }
 </script>
 

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

@@ -1,6 +1,5 @@
 <template>
   <el-dialog
-    v-if="show"
     v-model="show"
     width="900px"
     class="dialog-okr"
@@ -19,7 +18,7 @@
       </div>
     </template>
     <template #default>
-      <div class="dialog-okr-body">
+      <div class="dialog-okr-body" v-loading="formLoading">
         <el-form :model="form" ref="formRef" :rules="rules" label-width="0">
           <el-row :gutter="10">
             <el-col :span="4" :offset="0">
@@ -28,21 +27,24 @@
                   v-model="form.parentId"
                   :data="parentNodeList"
                   check-strictly
-                  :props="{ value: 'id', label: 'label', children: 'children' }"
+                  :props="{ value: 'nodeId', label: 'nodeName', children: 'children' }"
                   :render-after-expand="false"
                   placeholder="父节点"
+                  clearable
+                  :disabled="!!form.nodeId"
+                  @change="handleChangeParent"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="4" :offset="0">
-              <el-form-item prop="name">
+              <el-form-item prop="nodeName">
-                <el-input v-model="form.name" placeholder="请输入节点名称" />
+                <el-input v-model="form.nodeName" placeholder="请输入节点名称" />
               </el-form-item>
             </el-col>
             <el-col :span="4" :offset="0">
-              <el-form-item prop="createTime">
+              <el-form-item prop="startTime">
                 <el-date-picker
-                  v-model="form.createTime"
+                  v-model="form.startTime"
                   type="date"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
@@ -67,6 +69,8 @@
                   v-model="form.executor"
                   placeholder="选择执行人，可多选"
                   multiple
+                  collapse-tags
+                  collapse-tags-tooltip
                   clearable
                   filterable
                 >
@@ -74,16 +78,17 @@
                     v-for="item in userOptions"
                     :key="item.id"
                     :label="item.name"
-                    :value="item.id"
+                    :value="item.id + ''"
+                    :disabled="item.status == 1"
                   />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4" :offset="0">
-              <el-form-item prop="persission">
+              <el-form-item prop="dataScope">
-                <el-select v-model="form.persission" placeholder="选择权限" clearable filterable>
+                <el-select v-model="form.dataScope" placeholder="选择权限" clearable filterable>
-                  <el-option label="公开" :value="0" />
+                  <el-option label="公开" :value="1" />
-                  <el-option label="仅上级可见" :value="1" />
+                  <el-option label="仅上级可见" :value="2" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -91,8 +96,8 @@
         </el-form>
         <div class="relative">
           <el-button
-            v-if="okrKey === 'okr'"
+            v-if="okrKey == 'okr'"
-            style="position: absolute; right: 10px; top: 10px"
+            style="position: absolute; right: 10px; top: 10px; z-index: 9"
             type="primary"
             size="small"
             @click="addObjective"
@@ -100,8 +105,8 @@
             添加目标
           </el-button>
           <el-button
-            v-else-if="okrKey === 'childNode'"
+            v-else-if="okrKey == 'childNode'"
-            style="position: absolute; right: 10px; top: 10px"
+            style="position: absolute; right: 10px; top: 10px; z-index: 9"
             type="primary"
             size="small"
             @click="addChildNode"
@@ -114,63 +119,76 @@
                 <div
                   class="flex items-center w-full"
                   v-for="(item, i) in objectList"
-                  :key="item.id"
+                  :key="item.objectiveId"
                 >
                   <div class="flex-1 w-100px">
                     <div class="flex items-center">
                       <el-tag type="success" class="mr-10px">O{{ i + 1 }}</el-tag>
-                      <el-input v-model="item.name" placeholder="目标名称" class="flex-1 w-150px" />
+                      <el-input
+                        v-model="item.objectiveName"
+                        placeholder="目标名称"
+                        class="flex-1 w-150px"
+                        :disabled="!!item.objectiveId"
+                      />
                       <el-select
-                        v-model="item.objExecutor"
+                        v-model="item.executor"
                         placeholder="选择执行人，可多选"
                         multiple
                         clearable
                         filterable
-                        style="min-width: 240px; margin-left: 10px"
+                        style="width: 240px; margin-left: 10px"
                       >
                         <el-option
                           v-for="it in userOptions"
                           :key="it.id"
                           :label="it.name"
-                          :value="it.id"
+                          :value="it.id + ''"
+                          :disabled="it.status == 1"
                         />
                       </el-select>
                       <el-select
-                        v-model="item.persission"
+                        v-model="item.dataScope"
                         placeholder="选择权限"
                         clearable
                         filterable
                         style="width: 120px; margin-left: 10px"
                       >
-                        <el-option label="公开" :value="0" />
+                        <el-option label="公开" :value="1" />
-                        <el-option label="仅上级可见" :value="1" />
+                        <el-option label="仅上级可见" :value="2" />
                       </el-select>
                       <div class="ml-10px">
-                        <el-button type="primary" text @click="AddKR">新增关键成果</el-button>
+                        <el-button type="primary" text @click="AddKR(i)">新增关键成果</el-button>
-                        <el-button type="danger" text @click="removeObj">删除目标</el-button>
+                        <el-button type="danger" text @click="removeObj(i)">删除目标</el-button>
                       </div>
                     </div>
                     <div style="background: #f0f3fa; padding-bottom: 15px">
-                      <div class="ml-50px" v-for="(kr, index) in item.children" :key="kr.id">
+                      <div
+                        class="ml-50px"
+                        v-for="(kr, index) in item.keyResults"
+                        :key="kr.keyResultId"
+                      >
                         <div class="flex flex-1 items-center pb-5px pt-5px">
                           <el-tag class="mr-10px">KR{{ index + 1 }}</el-tag>
                           <el-select
-                            v-model="kr.id"
+                            v-model="kr.keyResultName"
-                            placeholder="选择或输入"
+                            placeholder="选择或输入关键成果"
                             filterable
-                            :props="{ value: 'id', label: 'name' }"
+                            :props="{ value: 'keyResultId', label: 'keyResultName' }"
                             allow-create
                             :reserve-keyword="false"
                             class="flex-1 w-150px"
+                            @change="krChange(i, index)"
                           >
                             <el-option
-                              v-for="it in item.children"
+                              v-for="it in krOptions"
-                              :key="it.id"
+                              :key="it.value"
-                              :label="it.name"
+                              :label="it.label"
-                              :value="it.id"
+                              :value="it.value"
                             />
                           </el-select>
-                          <el-button type="danger" text @click="removeKR">删除关键成果</el-button>
+                          <el-button type="danger" text @click="removeKR(i, index)">
+                            删除关键成果
+                          </el-button>
                         </div>
                         <div class="mt-5px flex items-center">
                           <el-tree-select
@@ -180,47 +198,51 @@
                             check-strictly
                             clearable
                             filterable
+                            style="width: 200px"
                             node-key="sourceId"
                             placeholder="请选择渠道"
                           />
-                          <el-radio-group v-model="kr.targetType" class="ml-10px">
+                          <el-radio-group v-model="kr.resultType" class="ml-10px">
-                            <el-radio-button label="value">目标值</el-radio-button>
+                            <el-radio-button :value="1">目标值</el-radio-button>
-                            <el-radio-button label="radio">是/否</el-radio-button>
+                            <el-radio-button :value="2">是/否</el-radio-button>
                           </el-radio-group>
 
                           <el-input
-                            v-if="kr.targetType === 'value'"
+                            v-if="kr.resultType == 1"
-                            v-model="kr.targetNum"
+                            v-model="kr.targetValue"
                             type="number"
                             placeholder="目标值"
                             class="ml-10px"
-                            style="width: 100px"
+                            style="width: 120px"
                           />
 
                           <el-select
-                            v-model="kr.objExecutor"
+                            v-model="kr.executor"
                             placeholder="选择执行人，可多选"
                             multiple
                             clearable
                             filterable
-                            style="min-width: 240px; margin-left: 10px"
+                            collapse-tags
+                            collapse-tags-tooltip
+                            style="width: 240px; margin-left: 10px"
                           >
                             <el-option
                               v-for="it in userOptions"
                               :key="it.id"
                               :label="it.name"
-                              :value="it.id"
+                              :value="it.id + ''"
+                              :disabled="it.status == 1"
                             />
                           </el-select>
                           <el-select
-                            v-model="kr.persission"
+                            v-model="kr.dataScope"
                             placeholder="选择权限"
                             clearable
                             filterable
                             style="width: 120px; margin-left: 10px"
                           >
-                            <el-option label="公开" :value="0" />
+                            <el-option label="公开" :value="1" />
-                            <el-option label="仅上级可见" :value="1" />
+                            <el-option label="仅上级可见" :value="2" />
                           </el-select>
                         </div>
                       </div>
@@ -234,13 +256,13 @@
               <el-table :data="childNodeList">
                 <el-table-column label="名称">
                   <template #default="{ row }">
-                    <el-input v-model="row.name" placeholder="子节点名称" />
+                    <el-input v-model="row.nodeName" placeholder="子节点名称" />
                   </template>
                 </el-table-column>
                 <el-table-column label="开始日期" width="160px">
                   <template #default="{ row }">
                     <el-date-picker
-                      v-model="row.createTime"
+                      v-model="row.startTime"
                       type="date"
                       format="YYYY-MM-DD"
                       value-format="YYYY-MM-DD"
@@ -263,9 +285,9 @@
                 </el-table-column>
                 <el-table-column label="权限" width="160px">
                   <template #default="{ row }">
-                    <el-select v-model="row.permission" placeholder="请选择" style="width: 130px">
+                    <el-select v-model="row.dataScope" placeholder="请选择" style="width: 130px">
-                      <el-option label="公开" :value="0" />
+                      <el-option label="公开" :value="1" />
-                      <el-option label="仅上级可见" :value="1" />
+                      <el-option label="仅上级可见" :value="2" />
                     </el-select>
                   </template>
                 </el-table-column>
@@ -283,7 +305,8 @@
                         v-for="item in userOptions"
                         :key="item.id"
                         :label="item.name"
-                        :value="item.id"
+                        :value="item.id + ''"
+                        :disabled="item.status == 1"
                       />
                     </el-select>
                   </template>
@@ -303,6 +326,17 @@
 </template>
 
 <script setup name="DialogOkrInfo">
+import {
+  getAllNodeTree,
+  getOkrNodeDetail,
+  createOkrNode,
+  updateOkrNode,
+  getAllOkrPage,
+  getDefaultOkrOptions
+} from '@/api/okr/okr'
+import { listToTree } from '@/utils/tree'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -322,39 +356,20 @@ const formType = ref('create')
 
 const form = ref({})
 const formLoading = ref(false)
-const rules = ref({})
+const rules = ref({
+  nodeName: { required: true, message: '节点名称不可为空', trigger: 'blur' },
+  startTime: { required: true, message: '开始日期不可为空', trigger: 'change' },
+  endTime: { required: true, message: '截止日期不可为空', trigger: 'change' }
+})
 
 const okrKey = ref('okr')
 
-const parentNodeList = ref([
+const parentNodeList = ref([])
-  {
-    id: 1,
-    label: '寻驾全年目标',
-    children: [
-      { id: 2, label: '1月' },
-      { id: 3, label: '2月' },
-      { id: 4, label: '3月' },
-      { id: 5, label: '4月' },
-      { id: 6, label: '5月' },
-      { id: 7, label: '6月' },
-      { id: 8, label: '7月' },
-      { id: 9, label: '8月' },
-      { id: 10, label: '9月' },
-      { id: 11, label: '10月' },
-      { id: 12, label: '11月' },
-      { id: 13, label: '12月' }
-    ]
-  }
-])
 
-const childNodeList = ref([{}])
+const childNodeList = ref([])
 
-const userOptions = ref([
+const userOptions = ref([])
-  { id: 1, name: '张三' },
+const krOptions = ref([])
-  { id: 2, name: '李四' },
-  { id: 3, name: '王五' },
-  { id: 4, name: '赵六' }
-])
 const defaultProps = {
   children: 'children',
   label: 'sourceName',
@@ -362,151 +377,53 @@ const defaultProps = {
   isLeaf: 'leaf'
 }
 const sourceOptions = ref([])
-const objectList = ref([
+const objectList = ref([])
-  {
+function open(type, val) {
-    nodeId: 2,
-    name: '1月销售任务概述，例：销售额100万，成交率15%',
-    objExecutor: [1, 2],
-    id: 'a1',
-    children: [
-      {
-        id: 'a1-1',
-        name: '销售额',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a1-2',
-        name: '成交数',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a1-3',
-        name: '成交率',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a1-4',
-        name: '本月抖音运营投入相较上月少10%',
-        isSystem: false,
-        targetNum: 0,
-        targetValue: false,
-        targetType: 'radio'
-      }
-    ]
-  },
-  {
-    nodeId: 3,
-    name: '1月运营目标',
-    objExecutor: [1, 2],
-    id: 'a2',
-    children: [
-      {
-        id: 'a2-1',
-        name: '销售额',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a2-2',
-        name: '成交数',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a1-3',
-        name: '成交率',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a1-4',
-        name: '本月抖音运营投入相较上月少10%',
-        isSystem: false,
-        targetNum: 0,
-        targetValue: false,
-        targetType: 'radio'
-      }
-    ]
-  },
-  {
-    nodeId: 4,
-    name: '1月主播任务',
-    objExecutor: [1, 2],
-    id: 'a3',
-    children: [
-      {
-        id: 'a3-1',
-        name: '销售额',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a3-2',
-        name: '成交数',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a3-3',
-        name: '成交率',
-        isSystem: true,
-        targetNum: 10000,
-        targetValue: false,
-        targetType: 'value'
-      },
-      {
-        id: 'a3-4',
-        name: '本月抖音运营投入相较上月少10%',
-        isSystem: false,
-        targetNum: 0,
-        targetValue: false,
-        targetType: 'radio'
-      }
-    ]
-  }
-])
-
-async function open(type, val) {
   show.value = true
   title.value = type == 'update' ? '修改Okr' : '新增Okr'
   formType.value = type
   resetForm()
+  getEmployeeSimpleList().then((data) => {
+    userOptions.value = data
+  })
+  getAllNodeTree().then((resp) => {
+    parentNodeList.value = listToTree(resp.tree, {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+  getDefaultOkrOptions().then((resp) => {
+    krOptions.value = resp
+  })
   if (val) {
     formLoading.value = true
     try {
-      // form.value = await KpiApi.getKpiDetail(val)
+      getOkrNodeDetail(val).then((resp) => {
+        form.value = resp
+        if (resp.objectives) {
+          objectList.value = resp.objectives.map((item) => ({
+            ...item,
+            keyResults: item.keyResults || []
+          }))
+        } else {
+          objectList.value = []
+        }
+        childNodeList.value = [...resp.children]
+      })
     } finally {
       formLoading.value = false
     }
   }
-  // getOptions()
 }
 function resetForm() {
   form.value = {
-    parentId: '',
+    parentId: undefined,
-    name: '',
+    nodeName: undefined,
-    createTime: '',
+    startTime: undefined,
-    endTime: '',
+    endTime: undefined,
-    executor: []
+    executor: [],
+    dataScope: 1
   }
 }
 
@@ -518,26 +435,36 @@ const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于
 
 function addObjective() {
   objectList.value.push({
-    name: '',
+    objectiveName: '',
-    objExecutor: [],
+    executor: [],
-    children: []
+    keyResults: [],
+    dataScope: 1
   })
 }
 
-function AddKR() {
+function AddKR(idx) {
-  objectList.value.push({
+  if (!objectList.value[idx].keyResults) {
-    name: '',
+    objectList.value[idx].keyResults = []
-    objExecutor: [],
+  }
-    children: []
+  const obj = objectList.value[idx]
+  objectList.value[idx].keyResults.push({
+    keyResultName: undefined,
+    resultType: 1,
+    source: undefined,
+    targetValue: undefined,
+    process: undefined,
+    currentValue: undefined,
+    executor: obj.executor,
+    dataScope: obj.dataScope
   })
 }
 
-function removeObj() {
+function removeObj(idx) {
-  objectList.value.pop()
+  objectList.value.splice(idx, 1)
 }
 
-function removeKR() {
+function removeKR(oIdx, krIdx) {
-  objectList.value.pop()
+  objectList.value[oIdx].keyResults.splice(krIdx, 1)
 }
 
 function addChildNode() {
@@ -548,6 +475,35 @@ function removeChildNode(idx) {
   childNodeList.value.splice(idx, 1)
 }
 
+// 读取父节点的OKR，并展示出来
+function handleChangeParent() {
+  // 通过父节点Id,查询父节点的okr，需要继承
+  if (form.value.parentId) {
+    getAllOkrPage({ nodeId: form.value.parentId }).then((resp) => {
+      objectList.value = resp
+    })
+  }
+}
+
+function getLastDayOfMonth(year, month) {
+  // 创建一个日期对象，将月份设置为指定月份的下一个月，日期设置为 0
+  const date = new Date(year, month + 1, 0)
+  // 返回该日期对象的日期部分，即指定年月的最后一天
+  return date.getDate()
+}
+
+function krChange(idx, krIdx) {
+  const kr = objectList.value[idx].keyResults[krIdx]
+  if (kr.keyResultName) {
+    const obj = krOptions.value.find((item) => item.value == kr.keyResultName)
+    if (obj) {
+      kr.isSys = true
+    } else {
+      kr.isSys = false
+    }
+  }
+}
+
 async function handleSave() {
   // 校验表单
   if (!formRef.value) return
@@ -556,11 +512,47 @@ async function handleSave() {
   // 提交请求
   formLoading.value = true
   try {
+    form.value.objectives = objectList.value
+    form.value.children = childNodeList.value
     if (formType.value === 'create') {
-      // await KpiApi.createKpi(form.value)
+      // 创建的是一级节点,且子节点为空时，自动新增12个月子节点，并且每月添加4周的周子节点
+      if (!form.value.parentId) {
+        if (form.value.children.length == 0) {
+          const defaultTime = new Date(form.value.startTime)
+          for (let month = 0; month < 12; month++) {
+            form.value.children.push({
+              nodeName: `${month + 1}月`,
+              startTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart(2, '0')}-01`,
+              endTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart(
+                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: []
+                }
+              ]
+            })
+          }
+        }
+      }
+      await createOkrNode(form.value)
       message.success(t('common.createSuccess'))
     } else {
-      // await KpiApi.updateKpi(form.value)
+      await updateOkrNode(form.value)
       message.success(t('common.updateSuccess'))
     }
     show.value = false

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

@@ -0,0 +1,347 @@
+<template>
+  <Dialog :title="title" v-model="show" :width="formType == 'create' ? '750px' : '1100px'">
+    <div class="flex items-baseline">
+      <el-form
+        :model="form"
+        ref="formRef"
+        :disabled="formType == 'do'"
+        :rules="rules"
+        label-width="80px"
+        class="flex-1"
+      >
+        <el-row :gutter="20">
+          <el-col :span="24" :offset="0">
+            <el-form-item label="标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入待办标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="内容" prop="content">
+              <Editor
+                v-model:modelValue="form.content"
+                height="400px"
+                :disabled="formType == 'do'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="优先级" prop="priority">
+              <el-select v-model="form.priority" placeholder="选择优先级" filterable>
+                <el-option
+                  v-for="item in props.priorityOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="完成状态" prop="completeStatus">
+              <el-select v-model="form.completeStatus" placeholder="选择完成状态" filterable>
+                <el-option
+                  v-for="item in props.statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="截止日期" prop="endDate">
+              <el-date-picker
+                v-model="form.endDate"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期时间"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="执行人" prop="userList">
+              <el-select
+                v-model="form.userList"
+                placeholder="选择执行人，可多选"
+                multiple
+                clearable
+                filterable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in employeeOptions"
+                  :key="item.id"
+                  :disabled="item.status == 1"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="0">
+          <el-col :span="8" :offset="0">
+            <el-form-item prop="notifyType">
+              <template #label>
+                <el-tooltip
+                  content="新增待办时会立刻发送消息通知执行人，若后续无需再次提醒，频率可选择“不提醒”"
+                  placement="top"
+                  effect="dark"
+                >
+                  <Icon icon="ep:info-filled" :size="12" />
+                </el-tooltip>
+                <span>提醒频率</span>
+              </template>
+              <el-select v-model="form.notifyType" placeholder="选择提醒频率">
+                <el-option label="不提醒" value="1" />
+                <el-option label="单次提醒" value="2" />
+                <el-option label="循环提醒" value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :offset="0" v-if="form.notifyType != 1">
+            <el-form-item label="提醒时间" prop="remindTime" class="wait-form">
+              <el-input
+                v-if="form.notifyType == 2"
+                v-model="form.notifyBeforeTime"
+                placeholder="输入小时数"
+                min="0"
+                type="number"
+              >
+                <template #prepend>
+                  <span>提前</span>
+                </template>
+                <template #append> 小时 </template>
+              </el-input>
+              <el-input
+                v-else-if="form.notifyType == 3"
+                v-model="form.intervalTime"
+                placeholder="输入小时数"
+                min="0"
+                type="number"
+              >
+                <template #prepend>
+                  <span>每</span>
+                </template>
+                <template #append> 小时 </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :offset="0" v-if="form.notifyType == 3">
+            <el-form-item label="首次提醒" prop="firstNotifyTime">
+              <el-time-picker
+                v-model="form.firstNotifyTime"
+                format="HH:mm"
+                value-format="HH:mm"
+                style="width: 100%"
+                :picker-options="enableTimeRange"
+                placeholder="选择时间点"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div v-if="formType != 'create'" class="w-350px ml-10px h-full">
+        <div class="mb-10px" v-if="formType == 'do'">
+          <Editor
+            v-model:modelValue="form.followUpContent"
+            height="150px"
+            :toolbarConfig="toolbarConfig"
+          />
+          <el-button class="absolute" style="right: 20px; top: 195px" type="primary" @click="addDo">
+            更新进度
+          </el-button>
+        </div>
+        <div class="overflow-y-auto pl-15px" style="height: calc(100% - 50px)">
+          <el-timeline class="ml-10px">
+            <el-timeline-item
+              v-for="item in followList"
+              :key="item.followId"
+              placement="bottom"
+              :timestamp="formatDate(item.createTime, 'YYYY-MM-DD HH:mm:ss')"
+              color="#30d1fc"
+            >
+              <div class="font-bold" style="font-size: 16px">{{ item.followUserName }}</div>
+              <div v-dompurify-html="item.content"></div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </div>
+    </div>
+
+    <template #footer v-if="formType != 'do'">
+      <span>
+        <el-button @click="show = false">取 消</el-button>
+        <el-button type="primary" :disabled="formLoading" @click="handleSave">保 存</el-button>
+      </span>
+    </template>
+  </Dialog>
+</template>
+
+<script setup name="DialogWait">
+import {
+  createWait,
+  updateWait,
+  getWaitDetail,
+  getFollowWaitPage,
+  followWait
+} from '@/api/okr/wait'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+import { formatDate } from '@/utils/formatTime'
+
+const props = defineProps({
+  priorityOptions: {
+    type: Array,
+    default: () => [
+      { label: '高', value: '1' },
+      { label: '中', value: '2' },
+      { label: '低', value: '3' }
+    ]
+  },
+  statusOptions: {
+    type: Array,
+    default: () => [
+      { label: '未完成', value: '1', tagType: 'warning' },
+      { label: '已关闭', value: '2', tagType: 'success' }
+    ]
+  }
+})
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const toolbarConfig = {
+  toolbarKeys: []
+}
+
+const enableTimeRange = {
+  selectableRange: '07:00 - 22:00'
+}
+
+const show = ref(false)
+const title = ref('')
+const formType = ref('create')
+
+const form = ref({})
+const formLoading = ref(false)
+const rules = ref({
+  title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
+  endDate: [{ required: true, message: '请选择截止日期', trigger: 'change' }],
+  userList: [{ required: true, message: '请选择执行人', trigger: 'change' }]
+})
+
+const followList = ref([])
+
+function open(type, id) {
+  show.value = true
+  title.value = { create: '新增待办', update: '修改待办', do: '更新待办进度' }[type]
+  formType.value = type
+  resetForm()
+  if (id) {
+    formLoading.value = true
+    try {
+      // 表单数据
+      getWaitDetail(id).then((info) => {
+        form.value = {
+          ...info,
+          endDate: formatDate(info.endDate, 'YYYY-MM-DD'),
+          userList: info.userIdList
+        }
+      })
+      getFollowList(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  getOptions()
+}
+
+function getFollowList(id) {
+  // 跟进数据
+  getFollowWaitPage({
+    workId: id
+  }).then((data) => {
+    followList.value = data
+  })
+}
+
+function getOptions() {
+  getEmployeeSimpleList().then((data) => {
+    employeeOptions.value = data
+  })
+}
+
+function resetForm() {
+  form.value = {
+    title: undefined,
+    content: undefined,
+    priority: '1',
+    completeStatus: '1',
+    endDate: undefined,
+    userList: [],
+    notifyType: '3',
+    remindTime: 12,
+    firstNotifyTime: '09:00'
+  }
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+const formRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+async function handleSave() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    if (formType.value === 'create') {
+      await createWait(form.value)
+      message.success(t('common.createSuccess'))
+    } else {
+      await updateWait(form.value)
+      message.success(t('common.updateSuccess'))
+    }
+    show.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const employeeOptions = ref([])
+
+function addDo() {
+  followWait({
+    workId: form.value.workId,
+    content: form.value.followUpContent
+  }).then(() => {
+    message.success('跟进成功')
+    getFollowList(form.value.workId)
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.wait-form {
+  :deep(.el-input-group__prepend) {
+    padding: 0 10px;
+  }
+  :deep(.el-input-group__append) {
+    padding: 0 10px;
+  }
+  :deep(.el-input__inner) {
+    text-align: center;
+  }
+}
+</style>

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

@@ -0,0 +1,107 @@
+<template>
+  <div>
+    <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="getOkrList"
+        />
+      </el-row>
+      <el-row>
+        <el-button type="info" @click="handleShowOkr(searchForm.nodeId)"> 节点详情 </el-button>
+        <el-button type="success" @click="handleUpdateProcess">更新进度</el-button>
+      </el-row>
+    </div>
+
+    <OkrTable ref="okrTableRef" canEdit />
+    <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
+    <DialogOkrInfo ref="dialogOkrInfo" />
+  </div>
+</template>
+
+<script setup name="MyDuty">
+import OkrTable from './OkrTable.vue'
+import DialogOkrInfo from './DialogOkrInfo.vue'
+import DialogOkr from './DialogOkr.vue'
+import { listToTree } from '@/utils/tree'
+
+import { getMyNodeTree, getMyOkrPage } from '@/api/okr/okr'
+
+const message = useMessage()
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const okrTableRef = ref(null)
+const searchForm = ref({
+  nodeId: undefined
+})
+
+const peroidList = ref([])
+
+// onMounted(() => {
+handleSearchPeroid()
+// })
+
+function handleSearchPeroid() {
+  getMyNodeTree().then((resp) => {
+    peroidList.value = listToTree(resp.tree, {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+    searchForm.value.nodeId = resp.nodeId
+    getOkrList()
+  })
+}
+
+function getOkrList() {
+  getMyOkrPage(searchForm.value).then((resp) => {
+    const list = resp
+    nextTick(() => {
+      okrTableRef.value.prepareData(list)
+    })
+  })
+}
+
+const dialogOkrInfo = ref(null)
+// function handleAddNode() {
+//   dialogOkrInfo.value.open('create', null)
+// }
+
+function handleEditOkr() {
+  dialogOkr.value.close()
+  dialogOkrInfo.value.open('update', 1)
+}
+
+function handleUpdateProcess() {
+  okrTableRef.value.updateProcess(searchForm.value.nodeId).then(() => {
+    message.success('更新成功')
+    getOkrList()
+  })
+}
+
+const dialogOkr = ref(null)
+function handleShowOkr(id) {
+  dialogOkr.value.open({
+    nodeId: id,
+    canEdit: true
+  })
+}
+</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

@@ -1,60 +1,41 @@
 <template>
   <div style="height: 100vh">
     <div class="flex items-center">
-      <el-popover placement="bottom" width="500px" trigger="click">
+      <el-popover placement="bottom" width="500px" trigger="click" @show="handleSearchPeroid">
         <template #reference>
           <div class="flex items-center border-1px w-300px h-32px p-10px peroid-select">
             <Icon icon="ep:calendar" style="color: #aaa" />
             <span class="text-14px ml-10px" style="color: #aaa">
-              {{ searchForm.peroidName ? searchForm.peroidName : '选择周期' }}
+              {{ searchForm.nodeName ? searchForm.nodeName : '选择周期' }}
             </span>
           </div>
         </template>
         <div>
-          <el-date-picker
-            v-model="searchForm.year"
-            type="year"
-            format="YYYY"
-            value-format="YYYY"
-            :clearable="false"
-            style="width: 100%"
-          />
           <div class="mt-10px" style="height: 400px">
-            <div class="flex items-center border-bottom-1" style="line-height: 32px">
+            <el-table :data="peroidList" @row-click="handleSelectPeroid">
-              <div class="flex-1">节点名称</div>
+              <el-table-column label="节点名称">
-              <div class="w-120px">开始日期</div>
+                <template #default="{ row }">
-              <div class="w-120px">截止日期</div>
+                  <el-radio v-model="searchForm.nodeId" :label="row.nodeId">{{
-            </div>
+                    row.nodeName
-            <el-radio-group
+                  }}</el-radio>
-              v-model="searchForm.peroidId"
+                </template>
-              @change="peroidChange"
+              </el-table-column>
-              style="width: 100%"
+              <el-table-column label="开始日期" prop="startTime" width="120" />
-            >
+              <el-table-column label="截止日期" prop="endTime" width="120" />
-              <el-radio
+            </el-table>
-                v-for="item in peroidList"
-                :key="item.id"
-                :label="item.id"
-                class="h-44px"
-                style="width: 100%"
-              >
-                <div
-                  class="flex items-center border-bottom-1"
-                  style="width: 100%; line-height: 44px"
-                >
-                  <div class="flex-1">{{ item.name }}</div>
-                  <div class="w-120px">{{ item.startDate }}</div>
-                  <div class="w-120px">{{ item.endDate }}</div>
-                </div>
-              </el-radio>
-            </el-radio-group>
           </div>
         </div>
       </el-popover>
-
       <el-button class="ml-10px" type="primary" @click="handleAddNode">新建节点</el-button>
     </div>
 
-    <vue3-tree-org :data="dataList" center collapsable @on-node-click="handleClickNode">
+    <vue3-tree-org
+      :data="dataList"
+      center
+      collapsable
+      :props="treeProps"
+      @on-node-click="handleClickNode"
+    >
       <template #default="{ node }">
         <div style="cursor: pointer">
           <div class="tree-org-node__text node-label">
@@ -62,15 +43,19 @@
               <template #reference>
                 <div>
                   <div style="max-height: 40px; overflow: hidden">{{ node.label }}</div>
-                  <div class="tip"> 目标数： 3</div>
+                  <div class="tip"> 目标数： {{ getNodePropData(node.id, 'objectiveNum') }}</div>
+                  <!-- 执行人 -->
+                  <div class="tip">
+                    执行人： {{ getNodePropData(node.id, 'executorName') || '无' }}
+                  </div>
                 </div>
               </template>
               <template #default>
                 <div style="font-size: 0.875rem; line-height: 1.5">
-                  <div v-for="i in 3" :key="i" class="mt-5">
+                  <div v-for="i in getNodePropData(node.id, 'objectives')" :key="i.id" class="mt-5">
-                    <span style="color: #aaa">0%</span>
+                    <span style="color: #aaa">{{ parseInt(i.progress) }}%</span>
                     <span style="margin-left: 0.5rem">
-                      成交数达到10个，且订单的利润不能低于成交价的30%
+                      {{ i.objectiveName }}
                     </span>
                   </div>
                 </div>
@@ -78,7 +63,12 @@
             </el-popover>
           </div>
           <div class="p-5px">
-            <el-progress type="line" :percentage="80" text-inside :stroke-width="12" />
+            <el-progress
+              type="line"
+              :percentage="parseInt(getNodePropData(node.id, 'progress')) || 0"
+              text-inside
+              :stroke-width="12"
+            />
           </div>
         </div>
       </template>
@@ -94,77 +84,69 @@ import 'vue3-tree-org/lib/vue3-tree-org.css'
 import DialogOkr from './DialogOkr.vue'
 import DialogOkrInfo from './DialogOkrInfo.vue'
 
-const dataList = ref({
+import { getOkrRelationTree, getOkrRelationTreeChildren } from '@/api/okr/okr'
-  id: 1,
+import { listToTree } from '@/utils/tree'
-  label: '寻驾全年目标',
+
-  noDragging: true,
+const dataList = ref({})
-  disabled: true,
+const helpDataList = ref([])
-  children: [
+const treeProps = {
-    {
+  children: 'children',
-      id: 2,
+  label: 'nodeName',
-      pid: 1,
+  id: 'nodeId',
-      label: '1月',
+  pid: 'parentId'
-      noDragging: true,
+}
-      disabled: true,
-      children: [
-        { id: 6, pid: 2, label: '第一周', noDragging: true, disabled: true },
-        { id: 8, pid: 2, label: '第二周', noDragging: true, disabled: true },
-        { id: 10, pid: 2, label: '第三周', noDragging: true, disabled: true },
-        { id: 10, pid: 2, label: '第四周', noDragging: true, disabled: true }
-      ]
-    },
-    {
-      id: 3,
-      pid: 1,
-      label: '2月',
-      noDragging: true,
-      disabled: true,
-      children: [
-        { id: 6, pid: 2, label: '第一周', noDragging: true, disabled: true },
-        { id: 8, pid: 2, label: '第二周', noDragging: true, disabled: true },
-        { id: 10, pid: 2, label: '第三周', noDragging: true, disabled: true },
-        { id: 10, pid: 2, label: '第四周', noDragging: true, disabled: true }
-      ]
-    },
-    {
-      id: 4,
-      pid: 1,
-      label: '3月',
-      noDragging: true,
-      disabled: true,
-      children: [
-        { id: 6, pid: 2, label: '第一周', noDragging: true, disabled: true },
-        { id: 8, pid: 2, label: '第二周', noDragging: true, disabled: true },
-        { id: 10, pid: 2, label: '第三周', noDragging: true, disabled: true },
-        { id: 10, pid: 2, label: '第四周', noDragging: true, disabled: true }
-      ]
-    }
-  ]
-})
 
 const searchForm = ref({
-  peroidName: '',
+  nodeName: '',
-  peroidId: null,
+  nodeId: null
-  year: new Date().getFullYear()
 })
 
-const peroidList = ref([
+const peroidList = ref([])
-  {
-    id: 1,
-    name: '1月',
-    startDate: '2022-01-01',
-    endDate: '2022-01-31'
-  },
-  {
-    id: 2,
-    name: '2月',
-    startDate: '2022-02-01',
-    endDate: '2022-02-28'
-  }
-])
 
-function peroidChange(val) {
+handleSearchPeroid()
-  searchForm.value.peroidName = peroidList.value.find((it) => it.id == val).name
+
+function handleSearchPeroid() {
+  getOkrRelationTree().then((resp) => {
+    peroidList.value = resp
+    if (resp && resp.length && !searchForm.value.nodeId) {
+      searchForm.value.nodeId = resp[0].nodeId
+      searchForm.value.nodeName = resp[0].nodeName
+      getOkrList()
+    }
+  })
+}
+
+function getOkrList() {
+  getOkrRelationTreeChildren({
+    nodeId: searchForm.value.nodeId
+  }).then((resp) => {
+    const tree = listToTree(resp, {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+    helpDataList.value = resp
+    if (tree && tree.length) {
+      dataList.value = tree[0]
+    } else {
+      dataList.value = {}
+    }
+  })
+}
+
+function handleSelectPeroid(row) {
+  searchForm.value.nodeName = row.nodeName
+  searchForm.value.nodeId = row.nodeId
+  getOkrList()
+}
+
+function getNodePropData(nodeId, prop) {
+  const nodeData = helpDataList.value.find((it) => it.nodeId == nodeId)
+  if (nodeData) {
+    return nodeData[prop]
+  } else {
+    return ''
+  }
 }
 
 function toggleExpand(data, val) {
@@ -186,22 +168,26 @@ function toggleExpand(data, val) {
 toggleExpand(dataList.value, true)
 
 const dialogOkr = ref(null)
-const okrId = ref(null)
+const clickNode = ref(null)
 function handleClickNode(node, data) {
-  okrId.value = data.id
+  clickNode.value = data
   openOkr()
 }
 
 function openOkr() {
-  okrId.value && dialogOkr.value.open(okrId.value)
+  clickNode.value &&
-}
+    dialogOkr.value.open({
-
+      nodeId: clickNode.value.nodeId,
-function handleAddNode() {
+      canEdit: !clickNode.value.children || clickNode.value.children.length == 0
-  okrId.value = null
+    })
-  dialogOkrInfo.value.open('create', null)
 }
 
 const dialogOkrInfo = ref(null)
+function handleAddNode() {
+  clickNode.value = null
+  dialogOkrInfo.value.open('create', null)
+}
+
 function handleEditOkr() {
   dialogOkr.value.close()
   dialogOkrInfo.value.open('update', 1)
@@ -239,19 +225,4 @@ function handleEditOkr() {
   justify-content: center;
   align-items: center;
 }
-:deep(.dialog-okr) {
-  width: 94vw;
-  height: 94vh;
-  max-width: 1800px;
-  max-height: 1000px;
-  margin: 0;
-}
-:deep(.dialog-okr .el-dialog__header) {
-  padding: 0 !important;
-}
-:deep(.okr-info-dialog) {
-  .el-dialog__body {
-    padding-top: 0;
-  }
-}
 </style>

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

@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <el-table
+      ref="tableRef"
+      :data="okrList"
+      default-expand-all
+      row-key="id"
+      size="large"
+      @row-click="handleRowClick"
+      @expand-change="handleExpand"
+    >
+      <el-table-column label="目标/关键成果">
+        <template #default="{ row, $index }">
+          <span
+            v-if="!expandedRows[row.id]"
+            class="line1"
+            :style="{
+              top: row.type == '目标' ? '30px' : 0,
+              height: getHeight(row, $index)
+            }"
+          ></span>
+          <span v-if="row.type == '目标'">【目标】{{ row.name }}</span>
+          <template v-else>
+            <span class="line2"></span>
+            <span>
+              【关键成果】{{ row.channelName }} {{ row.name }}
+              <span v-if="row.resultType == 1">达 {{ row.targetValue }}</span>
+            </span>
+            <div class="flex items-center mt-10px ml-50px">
+              <span>当前进度：</span>
+              <span v-if="row.isSys || !props.canEdit">{{ row.currentValue }}</span>
+              <el-input
+                v-else-if="row.resultType == 1"
+                v-model="row.currentValue"
+                clearable
+                size="small"
+                style="width: 200px"
+              />
+              <el-radio-group
+                v-else-if="row.resultType == 2"
+                v-model="row.currentValue"
+                size="small"
+              >
+                <el-radio :value="1">是</el-radio>
+                <el-radio :value="0">否</el-radio>
+              </el-radio-group>
+            </div>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column prop="progress" label="进度" width="200px">
+        <template #default="{ row }">
+          <el-progress :percentage="parseInt(row.progress) || 0" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="executorName" label="执行人" width="200px" />
+    </el-table>
+  </div>
+</template>
+
+<script setup name="OkrTable">
+import { updateOkrProgress } from '@/api/okr/okr'
+
+const emit = defineEmits(['rowClick'])
+
+const props = defineProps({
+  canEdit: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const okrList = ref([])
+const helpList = ref([])
+
+function prepareData(list) {
+  helpList.value = []
+  expandedRows.value = {}
+  okrList.value = list.map((item) => {
+    let obj = {
+      id: item.objectiveId,
+      name: item.objectiveName,
+      progress: item.progress,
+      executorName: item.executorName,
+      type: '目标'
+    }
+    helpList.value.push(obj)
+    if (item.keyResults) {
+      obj.children = item.keyResults.map((child) => {
+        let kr = {
+          id: child.keyResultId,
+          keyResultId: child.keyResultId,
+          objectiveId: child.objectiveId,
+          nodeId: child.nodeId,
+          isSys: child.isSys,
+          processId: child.id,
+          name: child.keyResultName,
+          progress: child.progress,
+          executorName: child.executorName,
+          type: '关键成果',
+          resultType: child.resultType,
+          targetValue: child.targetValue,
+          currentValue: Number(child.currentValue)
+        }
+        helpList.value.push(kr)
+        return kr
+      })
+    }
+    return obj
+  })
+}
+
+defineExpose({
+  prepareData,
+  updateProcess
+})
+function getHeight(row, index) {
+  if (helpList.value.length - 1 == index || helpList.value[index + 1].type == '目标') {
+    return '22px'
+  } else {
+    return '100%'
+  }
+}
+
+const expandedRows = ref({})
+function handleExpand(row, expanded) {
+  expandedRows.value[row.id] = !expanded
+}
+
+function updateProcess(nodeId) {
+  return new Promise((resolve, reject) => {
+    try {
+      let arr = []
+      okrList.value.map((item) => {
+        arr = [...arr, ...(item.children || []).map((it) => ({ ...it, id: it.processId }))]
+      })
+      updateOkrProgress({
+        nodeId,
+        keyResultProgressList: arr
+      }).then((resp) => {
+        resolve(resp)
+      })
+    } catch (error) {
+      reject(error)
+    }
+  })
+}
+
+function handleRowClick(row) {
+  emit('rowClick', row)
+}
+</script>
+
+<style lang="scss" scoped>
+.line1 {
+  position: absolute;
+  width: 1px;
+  left: 21px;
+  border-left: 1px dashed #ccc;
+}
+.line2 {
+  position: absolute;
+  width: 26px;
+  height: 1px;
+  left: 21px;
+  top: 22px;
+  border-bottom: 1px dashed #ccc;
+  &::after {
+    position: absolute;
+    left: 25px;
+    top: -3px;
+    display: block;
+    width: 6px;
+    height: 6px;
+    border-radius: 6px;
+    margin: 0 auto;
+    border: 1px solid #ddd;
+    content: '';
+  }
+}
+</style>

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

@@ -0,0 +1,293 @@
+<template>
+  <div>
+    <el-form :model="searchForm" inline label-width="0" @submit.prevent="searchList">
+      <el-form-item>
+        <el-input v-model="searchForm.title" placeholder="输入标题" />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.priority" placeholder="选择优先级" clearable filterable>
+          <el-option
+            v-for="item in priorityOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-select
+          v-model="searchForm.completeStatus"
+          placeholder="选择完成状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item> -->
+      <el-form-item>
+        <el-button @click="searchList"> 搜索</el-button>
+        <el-button type="primary" @click="handleAdd"> 新增</el-button>
+      </el-form-item>
+    </el-form>
+    <el-tabs v-model="tabIndex" @tab-change="searchList">
+      <el-tab-pane :name="1">
+        <template #label>
+          <el-badge :value="tabCount.dayEndAgentWorkNum" :max="99" :show-zero="false">
+            <el-tooltip content="截止日在今日及之前的未关闭事项" placement="top" effect="dark">
+              <Icon icon="ep:question-filled" />
+            </el-tooltip>
+            <span>今日截止</span>
+          </el-badge>
+        </template>
+      </el-tab-pane>
+      <el-tab-pane :name="2">
+        <template #label>
+          <el-tooltip content="需要我执行的全部事项" placement="top" effect="dark">
+            <Icon icon="ep:question-filled" />
+          </el-tooltip>
+          <span>我的待办</span>
+        </template>
+      </el-tab-pane>
+      <el-tab-pane :name="3">
+        <template #label>
+          <el-badge :value="tabCount.urgeAgentWorkNum" :max="99" :show-zero="false">
+            <el-tooltip content="指派他人去办的事项" placement="top" effect="dark">
+              <Icon icon="ep:question-filled" />
+            </el-tooltip>
+            <span>催办事项</span>
+          </el-badge>
+        </template>
+      </el-tab-pane>
+      <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">
+              <Icon icon="ep:question-filled" />
+            </el-tooltip>
+            <span>通知我的</span>
+          </el-badge>
+        </template>
+        <el-table :data="mentionedList">
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="content" label="okr标题" />
+          <el-table-column prop="createUserName" label="创建人" />
+          <el-table-column prop="createDate" label="创建日期" />
+          <el-table-column fixed="right" label="操作" width="140">
+            <template #default="{ row }">
+              <el-button style="padding: 0" type="primary" text @click="handleShow(row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-table v-if="tabIndex != 4" :data="tableList">
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="title" label="标题" />
+      <el-table-column prop="priority" label="优先级">
+        <template #default="{ row }">
+          <el-tag :type="priorityFilter(row.priority)">
+            {{ priorityNameFilter(row.priority) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="creatorName" label="创建人" />
+      <el-table-column prop="createTime" label="创建日期" :formatter="dateFormatter" />
+      <el-table-column prop="userNameStr" label="执行人" />
+      <el-table-column prop="endDate" label="截止日期" :formatter="dateFormatter" />
+      <el-table-column label="状态">
+        <template #default="{ row }">
+          <el-tag :type="statusFilter(row.completeStatus)">{{
+            statusNameFilter(row.completeStatus)
+          }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="completedDate" label="关闭日期" :formatter="dateFormatter" />
+      <el-table-column fixed="right" label="操作" width="140">
+        <template #default="{ row }">
+          <el-button
+            v-if="row.userIdList.includes(currentUserId) && row.completeStatus == 1"
+            style="padding: 0; margin-right: 10px"
+            type="primary"
+            text
+            @click="handleDo(row)"
+          >
+            跟进
+          </el-button>
+          <el-button
+            v-if="!row.userIdList.includes(currentUserId) && row.completeStatus == 1"
+            style="padding: 0; margin-right: 10px; margin-left: 0"
+            type="primary"
+            text
+            @click="handleNotice(row)"
+          >
+            催办
+          </el-button>
+          <el-button
+            v-if="row.creator == currentUserId && row.completeStatus == 1"
+            style="padding: 0; margin-right: 10px; margin-left: 0"
+            type="primary"
+            text
+            @click="handleEdit(row)"
+          >
+            修改
+          </el-button>
+          <el-button
+            v-if="row.creator == currentUserId && row.completeStatus == 1"
+            style="padding: 0; margin-right: 10px; margin-left: 0"
+            type="danger"
+            text
+            @click="handleDelete(row)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+
+    <DialogWait ref="waitDialogRef" @success="getList" />
+  </div>
+</template>
+
+<script setup name="WaitTarget">
+import { useUserStore } from '@/store/modules/user'
+import { dateFormatter } from '@/utils/formatTime'
+import DialogWait from './DialogWait.vue'
+
+import { getWaitPage, deleteWait, getWaitCount, urgeWait } from '@/api/okr/wait'
+
+const userStore = useUserStore()
+const currentUserId = userStore.getUser.id
+
+const message = useMessage()
+
+const searchForm = ref({
+  title: undefined,
+  completeStatus: undefined,
+  priority: undefined,
+  pageNo: 1,
+  pageSize: 50
+})
+
+const statusOptions = [
+  { label: '未完成', value: 1, tagType: 'warning' },
+  { label: '已关闭', value: 2, tagType: 'success' }
+]
+
+const statusFilter = (status) => {
+  return statusOptions.find((item) => item.value == status)?.tagType
+}
+
+const statusNameFilter = (status) => {
+  return statusOptions.find((item) => item.value == status)?.label
+}
+
+const priorityOptions = [
+  { label: '高', value: '1', tagType: 'danger' },
+  { label: '中', value: '2', tagType: 'warning' },
+  { label: '低', value: '3', tagType: 'info' }
+]
+
+const priorityFilter = (priority) => {
+  return priorityOptions.find((item) => item.value == priority)?.tagType
+}
+
+const priorityNameFilter = (priority) => {
+  return priorityOptions.find((item) => item.value == priority)?.label
+}
+
+const tabIndex = ref(1)
+
+onMounted(() => {
+  searchList()
+})
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+const tabCount = ref({
+  dayEndAgentWorkNum: 0,
+  myAgentWorkNum: 0,
+  urgeAgentWorkNum: 0,
+  notifyNum: 0
+})
+function getTabCount() {
+  getWaitCount({
+    title: searchForm.value.title,
+    priority: searchForm.value.priority
+  }).then((res) => {
+    tabCount.value = res
+  })
+}
+
+const loading = ref(false)
+const tableList = ref([])
+const mentionedList = ref([])
+const total = ref(0)
+function getList() {
+  loading.value = true
+  try {
+    searchForm.value.queryType = tabIndex.value
+    getWaitPage(searchForm.value).then((res) => {
+      tableList.value = res.list
+      total.value = res.total
+      loading.value = false
+    })
+    getTabCount()
+  } catch (error) {}
+}
+
+function handleDo(row) {
+  waitDialogRef.value.open('do', row.workId)
+}
+
+const waitDialogRef = ref()
+function handleAdd() {
+  waitDialogRef.value.open('create')
+}
+
+function handleEdit(row) {
+  waitDialogRef.value.open('update', row.workId)
+}
+
+function handleDelete(row) {
+  message.confirm('确定删除待办事项吗？').then(() => {
+    deleteWait(row.workId).then(() => {
+      message.success('删除成功')
+      getList()
+    })
+  })
+}
+
+function handleNotice(row) {
+  console.log(row)
+
+  message.confirm('即将发送微信通知提醒执行人，是否继续？').then(() => {
+    urgeWait({ workId: row.workId }).then(() => {
+      message.success('发送成功')
+    })
+  })
+}
+
+function handleShow(row) {
+  console.log(row)
+  message.success('打开okr详情页')
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/OKR/Management/index.vue

@@ -8,9 +8,15 @@
           </div>
         </template>
       </el-tab-pane>
-      <el-tab-pane label="我负责的" name="0">我负责的</el-tab-pane>
+      <el-tab-pane label="我负责的" name="0">
-      <el-tab-pane label="我的待办" name="1">我的待办</el-tab-pane>
+        <MyDuty v-if="tabIndex == 0" />
-      <el-tab-pane label="全部目标" name="2">全部目标</el-tab-pane>
+      </el-tab-pane>
+      <el-tab-pane label="待办事项" name="1">
+        <WaitTarget v-if="tabIndex == 1" />
+      </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>
@@ -33,7 +39,10 @@
 </template>
 
 <script setup name="OkrManagement">
+import AllTarget from './Components/AllTarget.vue'
+import MyDuty from './Components/MyDuty.vue'
 import ObjectList from './Components/ObjectList.vue'
+import WaitTarget from './Components/WaitTarget.vue'
 
 const tabIndex = ref('0')
 const height = ref(innerHeight - 115)

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

@@ -16,8 +16,8 @@
         <el-col :span="12">
           <el-form-item label="用户性别">
             <el-radio-group v-model="formData.sex">
-              <el-radio :label="1"> 男 </el-radio>
+              <el-radio :value="1"> 男 </el-radio>
-              <el-radio :label="2"> 女 </el-radio>
+              <el-radio :value="2"> 女 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

src/views/Pers/Employee/index.vue

@@ -11,8 +11,8 @@
       </el-form-item>
       <el-form-item>
         <el-radio-group v-model="searchForm.status" @change="handleQuery">
-          <el-radio :label="0"> 在职 </el-radio>
+          <el-radio :value="0"> 在职 </el-radio>
-          <el-radio :label="1"> 离职 </el-radio>
+          <el-radio :value="1"> 离职 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item>

src/views/Profile/components/BasicInfo.vue

@@ -2,8 +2,8 @@
   <Form ref="formRef" :labelWidth="80" :rules="rules" :schema="schema">
     <template #sex="form">
       <el-radio-group v-model="form['sex']">
-        <el-radio :label="1">{{ t('profile.user.man') }}</el-radio>
+        <el-radio :value="1">{{ t('profile.user.man') }}</el-radio>
-        <el-radio :label="2">{{ t('profile.user.woman') }}</el-radio>
+        <el-radio :value="2">{{ t('profile.user.woman') }}</el-radio>
       </el-radio-group>
     </template>
   </Form>

yarn.lock

@@ -1227,7 +1227,7 @@
   resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31"
   integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==
 
-"@element-plus/icons-vue@^2.0.6", "@element-plus/icons-vue@^2.1.0":
+"@element-plus/icons-vue@^2.1.0", "@element-plus/icons-vue@^2.3.1":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz#1f635ad5fdd5c85ed936481525570e82b5a8307a"
   integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==
@@ -1374,25 +1374,25 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@floating-ui/core@^1.0.0":
+"@floating-ui/core@^1.6.0":
-  version "1.6.0"
+  version "1.6.9"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.0.tgz#fa41b87812a16bf123122bf945946bae3fdf7fc1"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.9.tgz#64d1da251433019dafa091de9b2886ff35ec14e6"
-  integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==
+  integrity sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==
   dependencies:
-    "@floating-ui/utils" "^0.2.1"
+    "@floating-ui/utils" "^0.2.9"
 
 "@floating-ui/dom@^1.0.1":
-  version "1.6.3"
+  version "1.6.13"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.3.tgz#954e46c1dd3ad48e49db9ada7218b0985cee75ef"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.13.tgz#a8a938532aea27a95121ec16e667a7cbe8c59e34"
-  integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==
+  integrity sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==
   dependencies:
-    "@floating-ui/core" "^1.0.0"
+    "@floating-ui/core" "^1.6.0"
-    "@floating-ui/utils" "^0.2.0"
+    "@floating-ui/utils" "^0.2.9"
 
-"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1":
+"@floating-ui/utils@^0.2.9":
-  version "0.2.1"
+  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.9.tgz#50dea3616bc8191fb8e112283b49eaff03e78429"
-  integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==
+  integrity sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==
 
 "@form-create/component-elm-checkbox@^3.1.29":
   version "3.1.29"
@@ -1901,9 +1901,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.182":
-  version "4.17.0"
+  version "4.17.16"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.16.tgz#94ae78fab4a38d73086e962d0b65c30d816bfb0a"
-  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
+  integrity sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==
 
 "@types/minimist@^1.2.0", "@types/minimist@^1.2.2":
   version "1.2.5"
@@ -3520,7 +3520,12 @@ data-view-byte-offset@^1.0.0:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
-dayjs@^1.11.3, dayjs@^1.11.7:
+dayjs@^1.11.13:
+  version "1.11.13"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
+  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
+
+dayjs@^1.11.7:
   version "1.11.10"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
   integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
@@ -3832,20 +3837,20 @@ electron-to-chromium@^1.4.668:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.736.tgz#ecb4348f4d5c70fb1e31c347e5bad6b751066416"
   integrity sha512-Rer6wc3ynLelKNM4lOCg7/zPQj8tPOCB2hzD32PX9wd3hgRRi9MxEbmkFCokzcEhRVMiOVLjnL9ig9cefJ+6+Q==
 
-element-plus@2.3.4:
+element-plus@2.9.4:
-  version "2.3.4"
+  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.3.4.tgz#4319f6b0a1096cfac9c53b69da2fe23ac5aea63e"
+  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.9.4.tgz#e4b75055f0f1b1c1f33186321eb3d7a6424051e5"
-  integrity sha512-SQr0J9z7N4z48WYk/l9NE2tizl8Q7j2OhqlpTc42k4pGncry3+rVX6dsmcsglFynn6vt3NzYxWJqmLFyDKQq+g==
+  integrity sha512-sGnW0wd9zf6lEGixXV2gfwx3X6VTMkP52qTkX7zbURJ2oariyslrKTBh2txt1sdn1pUvj2l0KY3OfSXoZGmDOw==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
-    "@element-plus/icons-vue" "^2.0.6"
+    "@element-plus/icons-vue" "^2.3.1"
     "@floating-ui/dom" "^1.0.1"
     "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7"
     "@types/lodash" "^4.14.182"
     "@types/lodash-es" "^4.17.6"
     "@vueuse/core" "^9.1.0"
     async-validator "^4.2.5"
-    dayjs "^1.11.3"
+    dayjs "^1.11.13"
     escape-html "^1.0.3"
     lodash "^4.17.21"
     lodash-es "^4.17.21"
@@ -8154,7 +8159,12 @@ vue-amap@^0.5.10:
   dependencies:
     uppercamelcase "^1.1.0"
 
-vue-demi@*, vue-demi@>=0.14.5, vue-demi@>=0.14.7:
+vue-demi@*:
+  version "0.14.10"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04"
+  integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==
+
+vue-demi@>=0.14.5, vue-demi@>=0.14.7:
   version "0.14.7"
   resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.7.tgz#8317536b3ef74c5b09f268f7782e70194567d8f2"
   integrity sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==