Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl

# Conflicts:
#	.env.base
#	yarn.lock

.env.base

@@ -4,10 +4,10 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
+#VITE_BASE_URL='http://118.31.23.45:48080'
+# VITE_BASE_URL='http://114.55.169.15:48080'
 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_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'

.env.dev

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

.vscode/settings.json

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

src/api/okr/comment.js

@@ -1,38 +0,0 @@
-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

@@ -5,8 +5,8 @@ export const createOkrNode = (data) => {
   return request.post({
     url: '/admin-api/okr/node/add',
     data,
-    isSubmitForm: true
-    // headers: { 'instance-id': 1016 }
+    isSubmitForm: true,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -14,8 +14,8 @@ export const createOkrNode = (data) => {
 export const updateOkrNode = (data) => {
   return request.put({
     url: '/admin-api/okr/node/update',
-    data
-    // headers: { 'instance-id': 1016 }
+    data,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -23,8 +23,8 @@ export const updateOkrNode = (data) => {
 export const getOkrNodeDetail = (nodeId) => {
   return request.get({
     url: '/admin-api/okr/node/get',
-    params: { nodeId }
-    // headers: { 'instance-id': 1016 }
+    params: { nodeId },
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -32,8 +32,8 @@ export const getOkrNodeDetail = (nodeId) => {
 export const getMyNodeTree = (params) => {
   return request.get({
     url: '/admin-api/okr/node/my/list',
-    params
-    // headers: { 'instance-id': 1016 }
+    params,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -41,8 +41,8 @@ export const getMyNodeTree = (params) => {
 export const getMyOkrPage = (params) => {
   return request.get({
     url: '/admin-api/okr/node/my/object/list',
-    params
-    // headers: { 'instance-id': 1016 }
+    params,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -50,8 +50,8 @@ export const getMyOkrPage = (params) => {
 export const getAllNodeTree = (params) => {
   return request.get({
     url: '/admin-api/okr/node/all/list',
-    params
-    // headers: { 'instance-id': 1016 }
+    params,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -59,8 +59,8 @@ export const getAllNodeTree = (params) => {
 export const getAllOkrPage = (params) => {
   return request.get({
     url: '/admin-api/okr/node/all/object/list',
-    params
-    // headers: { 'instance-id': 1016 }
+    params,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -68,8 +68,8 @@ export const getAllOkrPage = (params) => {
 export const getOkrNodeHistory = (nodeId) => {
   return request.get({
     url: '/admin-api/okr/record/list',
-    params: { nodeId }
-    // headers: { 'instance-id': 1016 }
+    params: { nodeId },
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -77,34 +77,7 @@ export const getOkrNodeHistory = (nodeId) => {
 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 }
+    params: { dictType: 'key_result_source' },
+    headers: { 'instance-id': 1016 }
   })
 }

src/api/okr/wait.js

@@ -5,8 +5,8 @@ export const createWait = (data) => {
   return request.post({
     url: '/admin-api/okr/agent-work/create',
     data,
-    isSubmitForm: true
-    // headers: { 'instance-id': 1016 }
+    isSubmitForm: true,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -14,8 +14,8 @@ export const createWait = (data) => {
 export const updateWait = (data) => {
   return request.put({
     url: '/admin-api/okr/agent-work/update',
-    data
-    // headers: { 'instance-id': 1016 }
+    data,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -23,8 +23,8 @@ export const updateWait = (data) => {
 export const getWaitPage = (params) => {
   return request.get({
     url: '/admin-api/okr/agent-work/page',
-    params
-    // headers: { 'instance-id': 1016 }
+    params,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -32,8 +32,8 @@ export const getWaitPage = (params) => {
 export const getWaitDetail = (id) => {
   return request.get({
     url: '/admin-api/okr/agent-work/get',
-    params: { id }
-    // headers: { 'instance-id': 1016 }
+    params: { id },
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -41,8 +41,8 @@ export const getWaitDetail = (id) => {
 export const deleteWait = (id) => {
   return request.delete({
     url: '/admin-api/okr/agent-work/delete',
-    params: { id }
-    // headers: { 'instance-id': 1016 }
+    params: { id },
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -50,8 +50,8 @@ export const deleteWait = (id) => {
 export const urgeWait = (workId) => {
   return request.get({
     url: '/admin-api/okr/agent-work/urge',
-    params: { workId }
-    // headers: { 'instance-id': 1016 }
+    params: { workId },
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -60,8 +60,8 @@ export const followWait = (data) => {
   return request.post({
     url: '/admin-api/okr/agent-work-follow/create',
     data,
-    isSubmitForm: true
-    // headers: { 'instance-id': 1016 }
+    isSubmitForm: true,
+    headers: { 'instance-id': 1016 }
   })
 }
 
@@ -69,15 +69,15 @@ export const followWait = (data) => {
 export const getFollowWaitPage = (params) => {
   return request.get({
     url: '/admin-api/okr/agent-work-follow/list',
-    params
-    // headers: { 'instance-id': 1016 }
+    params,
+    headers: { 'instance-id': 1016 }
   })
 }
 
 export const getWaitCount = (params) => {
   return request.get({
     url: '/admin-api/okr/agent-work/getAgentWorkNum',
-    params
-    // headers: { 'instance-id': 1016 }
+    params,
+    headers: { 'instance-id': 1016 }
   })
 }

src/views/Basic/Dept/DeptForm.vue

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

src/views/Basic/Dept/index.vue

@@ -22,15 +22,8 @@
   <el-table v-loading="loading" :data="list" row-key="id" default-expand-all border>
     <el-table-column prop="name" label="部门名称" />
     <el-table-column prop="leaderUserName" label="负责人" width="120" />
-    <el-table-column prop="instanceNames" label="业务系统" width="200" />
-    <el-table-column prop="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 prop="sort" label="排序" width="200" />
+    <el-table-column prop="status" label="状态" width="100" />
     <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/OKR/Management/Components/AllTarget.vue

@@ -10,29 +10,20 @@
           :default-expand-all="false"
           check-strictly
           style="width: 400px"
-          @change="nodeChange"
+          @change="getOkrList"
         />
         <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 type="warning" @click="handleEditOkr(searchForm.nodeId)">
           修改当前节点
         </el-button>
-        <el-button
-          type="success"
-          v-if="searchForm.executor?.includes(currentUserId)"
-          @click="handleUpdateProcess"
-          >更新进度</el-button
-        >
+        <el-button type="success" @click="handleUpdateProcess">更新进度</el-button>
       </el-row>
     </div>
 
-    <OkrTable ref="okrTableRef" :canEdit="isCurrentLeafNode" />
+    <OkrTable ref="okrTableRef" />
     <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
     <DialogOkrInfo ref="dialogOkrInfo" @success="handleSearchPeroid" />
   </div>
@@ -44,12 +35,9 @@ 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'
+import { listToTree } from '@/utils/tree'
 
 const message = useMessage()
-const userStore = useUserStore()
-const currentUserId = userStore.getUser.id
 
 const defaultProps = {
   value: 'nodeId',
@@ -64,11 +52,9 @@ const searchForm = ref({
 
 const peroidList = ref([])
 
-handleSearchPeroid()
-
-// 当前是否是叶子节点
-// 如果不是叶子节点，则表格数据不可修改
-const isCurrentLeafNode = ref(false)
+onMounted(() => {
+  handleSearchPeroid()
+})
 
 function handleSearchPeroid() {
   getAllNodeTree().then((resp) => {
@@ -77,21 +63,9 @@ function handleSearchPeroid() {
       pid: 'parentId',
       children: 'children'
     })
-    nodeChange(resp.nodeId)
-  })
-}
-
-function nodeChange(nodeId) {
-  searchForm.value.nodeId = nodeId
+    searchForm.value.nodeId = resp.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() {
@@ -114,18 +88,13 @@ function handleEditOkr() {
 }
 
 function handleUpdateProcess() {
-  okrTableRef.value.updateProcess(searchForm.value.nodeId).then(() => {
-    message.success('更新成功')
+  message.success('更新进度成功')
   getOkrList()
-  })
 }
 
 const dialogOkr = ref(null)
 function handleShowOkr(id) {
-  dialogOkr.value.open({
-    nodeId: id,
-    canEdit: isCurrentLeafNode.value
-  })
+  dialogOkr.value.open(id)
 }
 </script>
 

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>{{ nodeInfo.allNodeName }}</span>
+            <span>{{ nodeInfo.nodeName }}</span>
           </div>
         </div>
         <div class="flex items-center">
-          <el-button v-if="nodeInfo.creatorId == currentUserId" link @click="emit('edit')">
+          <el-button link @click="emit('edit')">
             <el-tooltip content="编辑" placement="top" effect="dark">
               <Icon icon="ep:edit" :size="16" />
             </el-tooltip>
@@ -47,7 +47,7 @@
               </div>
               <div class="basic-title-item">
                 <div class="basic-title-label">执行人</div>
-                <div class="basic-title-value">{{ nodeInfo.executorName || '无' }}</div>
+                <div class="basic-title-value">{{ nodeInfo.executorName }}</div>
               </div>
               <div class="basic-title-item">
                 <div class="basic-title-label">目标数</div>
@@ -55,7 +55,7 @@
               </div>
               <div class="basic-title-item" style="min-width: 200px">
                 <div class="basic-title-label">总体进度</div>
-                <el-progress :percentage="parseInt(nodeInfo.progress) || 0" :stroke-width="8" />
+                <el-progress :percentage="nodeInfo.progress || 0" :stroke-width="8" />
               </div>
             </div>
             <div class="flex detail-basic-info">
@@ -68,11 +68,11 @@
             <el-tabs v-model="workIndex" style="flex: 1">
               <el-tab-pane label="目标/关键成果" name="okr">
                 <div class="content-wrap">
-                  <OkrTable ref="okrTableRef" :canEdit="canEdit" />
+                  <OkrTable ref="okrTableRef" />
                 </div>
               </el-tab-pane>
             </el-tabs>
-            <el-button v-if="canEdit" class="sav-btn" type="primary" @click="handleSaveProcess">
+            <el-button class="sav-btn" type="primary" @click="handleSaveProcess">
               保存并更新
             </el-button>
           </div>
@@ -86,7 +86,7 @@
                   :key="item.nodeId"
                   class="border-b-1 child-item"
                   style="padding: 10px 5px; cursor: pointer"
-                  @click="handleChildItem(item)"
+                  @click="handleChildItem"
                 >
                   <div
                     class="flex justify-between items-center overflow-hidden text-16px"
@@ -95,21 +95,21 @@
                     <div class="child-label">【节点】{{ item.nodeName }}</div>
                     <el-progress
                       type="line"
-                      :percentage="parseInt(item.progress) || 0"
+                      :percentage="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">{{ item.objectiveNum }}</span>
+                    <span style="color: #aaa">{{ item.objectiveCount }}</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">{{ item.executorName || '无' }}</span>
+                      <span style="color: #aaa">{{ item.executorName }}</span>
                     </div>
                   </div>
                   <div
@@ -134,12 +134,11 @@
                     style="width: 120px"
                     @change="getCommentTemplate"
                   >
-                    <el-option
-                      v-for="it in commentTypeOptions"
-                      :label="it.label"
-                      :value="it.id"
-                      :key="it.id"
-                    />
+                    <el-option label="总结" :value="1" />
+                    <el-option label="日报" :value="2" />
+                    <el-option label="周报" :value="3" />
+                    <el-option label="月报" :value="4" />
+                    <!-- <el-option label="评论" :value="5" disabled /> -->
                   </el-select>
 
                   <div v-if="addNewComment">
@@ -159,12 +158,7 @@
                     :toolbarConfig="toolbarConfig"
                   />
                 </div>
-                <div
-                  v-for="(it, index) in commentList"
-                  :key="it.commentId"
-                  class="border-b-1"
-                  style="padding: 10px 5px"
-                >
+                <div v-for="index in 12" :key="index" class="border-b-1" style="padding: 10px 5px">
                   <div
                     class="flex items-center justify-between overflow-hidden text-16px"
                     style="line-height: 30px"
@@ -179,42 +173,28 @@
                         "
                         fit="fill"
                       >
-                        <span class="text-12px">{{ it.creatorName.slice(-2) }}</span>
+                        <span class="text-12px">门庆</span>
                       </el-avatar>
-                      <div class="ml-10px text-16px">{{ it.creatorName }}</div>
+                      <div class="ml-10px text-16px">西门庆</div>
                     </div>
+                    <div class="ml-10px text-13px text-gray-400">01-01 12:15</div>
                   </div>
-                  <div class="ml-10px" v-dompurify-html="it.content"></div>
+                  <div class="ml-10px" v-dompurify-html="commentListVal"></div>
                   <div
-                    class="ml-10px mt-10px flex items-center justify-between text-12px"
+                    class="ml-10px mt-10px flex items-center text-12px"
                     style="line-height: 20px; color: #aaa"
                   >
-                    <div class="flex items-center">
                     <div class="flex items-center mr-50px">
-                        <el-button link @click="good(it)">
-                          <Icon
-                            icon="fa:thumbs-o-up"
-                            :size="16"
-                            :color="it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'"
-                          />
+                      <el-button link @click="good(index)">
+                        <Icon icon="fa:thumbs-o-up" :size="16" />
                       </el-button>
-                        <span
-                          class="ml-5px"
-                          :style="{
-                            color: it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'
-                          }"
-                          >{{ it.likeCount }}</span
-                        >
+                      <span class="ml-5px">6</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" />
+                        <Icon icon="ep:chat-dot-square" :size="16" />
                       </el-button>
-                        <span class="ml-5px" style="color: #333">{{ it.commentCount }}</span>
-                      </div>
-                    </div>
-                    <div class="ml-10px text-13px text-gray-400">
-                      {{ formatDate(it.createTime, 'YYYY-MM-DD HH:mm') }}
+                      <span class="ml-5px">1</span>
                     </div>
                   </div>
                   <!-- 评论 -->
@@ -224,19 +204,22 @@
                     style="margin: 10px 10px 0 10px; border-radius: 4px"
                     label="评论"
                   >
-                    <div
-                      v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
-                      :key="subComment.commentId"
-                      class="text-14px"
-                      style="line-height: 24px"
-                    >
-                      <span class="font-bold">{{ subComment.creatorName }}：</span>
+                    <div class="text-14px" style="line-height: 24px">
+                      <span class="font-bold">武大郎：</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"
@@ -244,30 +227,12 @@
                         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(index)"
+                        @click="handleSendCommnet"
                       >
                         发布
                       </el-button>
@@ -283,7 +248,7 @@
                     v-for="item in nodeRecords"
                     :key="item.recordId"
                     placement="bottom"
-                    :timestamp="formatDate(item.createTime, 'YYYY-MM-DD HH:mm:ss')"
+                    :timestamp="formatDate(item.createTime)"
                     color="#30d1fc"
                   >
                     <div>{{ item.creator }}</div>
@@ -306,23 +271,10 @@ 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: [
@@ -349,27 +301,11 @@ const okrTableRef = ref(null)
 const nodeInfo = ref({})
 
 const nodeRecords = ref([])
-const commentTypeOptions = ref([])
 
-function open(curNode) {
-  canEdit.value = curNode.canEdit
-  nodeInfo.value.nodeId = curNode.nodeId
-  // 获取数据详情
-  searchInfo(curNode)
-  show.value = true
-}
-
-const employeeOptions = ref([])
-
-function searchInfo(curNode) {
+async function open(id) {
   try {
-    getOkrNodeDetail(curNode.nodeId).then((resp) => {
-      nodeInfo.value = {
-        ...resp,
-        executor: resp.executor || []
-      }
-      canEdit.value =
-        canEdit.value && currentUserId == nodeInfo.value.executor.includes(currentUserId)
+    getOkrNodeDetail(id).then((resp) => {
+      nodeInfo.value = resp
       if (resp.objectives) {
         okrList.value = resp.objectives.map((item) => ({
           ...item,
@@ -383,22 +319,13 @@ function searchInfo(curNode) {
         okrTableRef.value.prepareData(okrList.value)
       })
     })
-    getOkrNodeHistory(curNode.nodeId).then((resp) => {
+    getOkrNodeHistory(id).then((resp) => {
       nodeRecords.value = resp
     })
-    getEmployeeSimpleList({ status: 0 }).then((resp) => {
-      employeeOptions.value = resp.map((item) => ({
-        ...item,
-        label: item.name,
-        value: item.name
-      }))
-    })
-    getCommentTypeOptions().then((resp) => {
-      commentTypeOptions.value = resp
-    })
-    searchCommentList()
   } finally {
   }
+  show.value = true
+  // 获取数据详情
 }
 
 function close() {
@@ -407,96 +334,42 @@ function close() {
 
 defineExpose({ open, close })
 
-function handleMention(item) {
-  form.value.mentionedUserIdList.push(item.id)
-}
-
 function handleSaveProcess() {
-  okrTableRef.value.updateProcess(nodeInfo.value.nodeId).then(() => {
-    message.success('更新成功')
-    searchInfo()
-  })
+  console.log(okrList.value)
 }
 
-function handleChildItem(item) {
-  const arr = item.executor || []
-  const isExecutor = arr.includes(currentUserId)
-  canEdit.value = isExecutor && (!item.children || item.children.length == 0)
-  searchInfo(item)
+function handleChildItem() {
+  console.log('handleChildItem')
 }
 
 const addNewComment = ref(false)
 const form = ref({
   commentValue: '',
-  commentType: undefined,
-  mentionedUserIdList: []
+  commentType: 1
 })
 function handleInsertComment() {
   addNewComment.value = true
-  const defaultComment = commentTypeOptions.value[0]
-  if (defaultComment) {
   form.value = {
-      commentType: defaultComment.id,
-      mentionedUserIdList: []
-    }
+    commentValue: '',
+    commentType: 1
   }
   getCommentTemplate()
 }
 
 function getCommentTemplate() {
-  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'
-    })
-  })
 }
 
-function good(item) {
-  likeComment(item.commentId).then(() => {
-    message.success('点赞成功')
-    searchCommentList()
-  })
+const commentListVal = ref(
+  `<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>`
+)
+
+function good(index) {
+  console.log(index)
 }
 
 const showCommentIndex = ref(-1)
@@ -504,37 +377,8 @@ function showComment(index) {
   showCommentIndex.value = showCommentIndex.value == index ? -1 : index
 }
 
-function handleSendCommnet(idx) {
-  try {
-    // 过滤掉删除的用户，方式为遍历mentionedUserIdList，查找评论中是否有对应的用户名
-    const userList = [...form.value.mentionedUserIdList]
-    const arr = []
-    userList.map((item) => {
-      if (form.value.commentValue.indexOf(`@${item.name}`) != -1) {
-        arr.push(item.id)
-        // 然后移除对应的用户名，防止有多个
-        form.value.commentValue = form.value.commentValue.replace(`@${item.name}`, '')
-      }
-    })
-    const data = {
-      businessType: 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('评论失败')
-  }
+function handleSendCommnet() {
+  console.log(form.value.commentValue)
 }
 </script>
 

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

@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    v-if="show"
     v-model="show"
     width="900px"
     class="dialog-okr"
@@ -177,7 +178,6 @@
                             allow-create
                             :reserve-keyword="false"
                             class="flex-1 w-150px"
-                            @change="krChange(i, index)"
                           >
                             <el-option
                               v-for="it in krOptions"
@@ -378,6 +378,7 @@ const defaultProps = {
 }
 const sourceOptions = ref([])
 const objectList = ref([])
+
 function open(type, val) {
   show.value = true
   title.value = type == 'update' ? '修改Okr' : '新增Okr'
@@ -492,18 +493,6 @@ function getLastDayOfMonth(year, month) {
   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

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

@@ -237,7 +237,7 @@ const rules = ref({
 
 const followList = ref([])
 
-function open(type, id) {
+async function open(type, id) {
   show.value = true
   title.value = { create: '新增待办', update: '修改待办', do: '更新待办进度' }[type]
   formType.value = type

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

@@ -13,12 +13,11 @@
         />
       </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 />
+    <OkrTable ref="okrTableRef" @row-click="handleShowOkr" />
     <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
     <DialogOkrInfo ref="dialogOkrInfo" />
   </div>
@@ -47,11 +46,11 @@ const searchForm = ref({
 
 const peroidList = ref([])
 
-// onMounted(() => {
-handleSearchPeroid()
-// })
+onMounted(() => {
+  handleSearchPeroid()
+})
 
-function handleSearchPeroid() {
+async function handleSearchPeroid() {
   getMyNodeTree().then((resp) => {
     peroidList.value = listToTree(resp.tree, {
       id: 'nodeId',
@@ -63,7 +62,7 @@ function handleSearchPeroid() {
   })
 }
 
-function getOkrList() {
+async function getOkrList() {
   getMyOkrPage(searchForm.value).then((resp) => {
     const list = resp
     nextTick(() => {
@@ -83,18 +82,13 @@ function handleEditOkr() {
 }
 
 function handleUpdateProcess() {
-  okrTableRef.value.updateProcess(searchForm.value.nodeId).then(() => {
-    message.success('更新成功')
+  message.success('更新进度成功')
   getOkrList()
-  })
 }
 
 const dialogOkr = ref(null)
-function handleShowOkr(id) {
-  dialogOkr.value.open({
-    nodeId: id,
-    canEdit: true
-  })
+function handleShowOkr(row) {
+  dialogOkr.value.open(row.id)
 }
 </script>
 

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

@@ -6,7 +6,7 @@
           <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.nodeName ? searchForm.nodeName : '选择周期' }}
+              {{ searchForm.peroidName ? searchForm.peroidName : '选择周期' }}
             </span>
           </div>
         </template>
@@ -15,13 +15,11 @@
             <el-table :data="peroidList" @row-click="handleSelectPeroid">
               <el-table-column label="节点名称">
                 <template #default="{ row }">
-                  <el-radio v-model="searchForm.nodeId" :label="row.nodeId">{{
-                    row.nodeName
-                  }}</el-radio>
+                  <el-radio v-model="searchForm.peroidId" :label="row.id">{{ row.name }}</el-radio>
                 </template>
               </el-table-column>
-              <el-table-column label="开始日期" prop="startTime" width="120" />
-              <el-table-column label="截止日期" prop="endTime" width="120" />
+              <el-table-column label="开始日期" prop="startDate" width="120" />
+              <el-table-column label="截止日期" prop="endDate" width="120" />
             </el-table>
           </div>
         </div>
@@ -29,13 +27,7 @@
       <el-button class="ml-10px" type="primary" @click="handleAddNode">新建节点</el-button>
     </div>
 
-    <vue3-tree-org
-      :data="dataList"
-      center
-      collapsable
-      :props="treeProps"
-      @on-node-click="handleClickNode"
-    >
+    <vue3-tree-org :data="dataList" center collapsable @on-node-click="handleClickNode">
       <template #default="{ node }">
         <div style="cursor: pointer">
           <div class="tree-org-node__text node-label">
@@ -43,19 +35,15 @@
               <template #reference>
                 <div>
                   <div style="max-height: 40px; overflow: hidden">{{ node.label }}</div>
-                  <div class="tip"> 目标数： {{ getNodePropData(node.id, 'objectiveNum') }}</div>
-                  <!-- 执行人 -->
-                  <div class="tip">
-                    执行人： {{ getNodePropData(node.id, 'executorName') || '无' }}
-                  </div>
+                  <div class="tip"> 目标数： 3</div>
                 </div>
               </template>
               <template #default>
                 <div style="font-size: 0.875rem; line-height: 1.5">
-                  <div v-for="i in getNodePropData(node.id, 'objectives')" :key="i.id" class="mt-5">
-                    <span style="color: #aaa">{{ parseInt(i.progress) }}%</span>
+                  <div v-for="i in 3" :key="i" class="mt-5">
+                    <span style="color: #aaa">0%</span>
                     <span style="margin-left: 0.5rem">
-                      {{ i.objectiveName }}
+                      成交数达到10个，且订单的利润不能低于成交价的30%
                     </span>
                   </div>
                 </div>
@@ -63,12 +51,7 @@
             </el-popover>
           </div>
           <div class="p-5px">
-            <el-progress
-              type="line"
-              :percentage="parseInt(getNodePropData(node.id, 'progress')) || 0"
-              text-inside
-              :stroke-width="12"
-            />
+            <el-progress type="line" :percentage="80" text-inside :stroke-width="12" />
           </div>
         </div>
       </template>
@@ -84,69 +67,95 @@ import 'vue3-tree-org/lib/vue3-tree-org.css'
 import DialogOkr from './DialogOkr.vue'
 import DialogOkrInfo from './DialogOkrInfo.vue'
 
-import { getOkrRelationTree, getOkrRelationTreeChildren } from '@/api/okr/okr'
-import { listToTree } from '@/utils/tree'
-
-const dataList = ref({})
-const helpDataList = ref([])
-const treeProps = {
-  children: 'children',
-  label: 'nodeName',
-  id: 'nodeId',
-  pid: 'parentId'
-}
+const dataList = ref({
+  id: 1,
+  label: '寻驾全年目标',
+  noDragging: true,
+  disabled: true,
+  children: [
+    {
+      id: 2,
+      pid: 1,
+      label: '1月',
+      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({
-  nodeName: '',
-  nodeId: null
+  peroidName: '',
+  peroidId: null
 })
 
 const peroidList = ref([])
 
-handleSearchPeroid()
-
-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()
+onMounted(() => {
+  handleSearchPeroid()
+  if (!searchForm.value.peroidId && peroidList.value.length) {
+    searchForm.value.peroidId = peroidList.value[0].id
+    searchForm.value.peroidName = peroidList.value[0].name
   }
-  })
-}
+  handleSearchOkr()
+})
 
-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 = {}
+async function handleSearchPeroid() {
+  peroidList.value = [
+    {
+      id: 1,
+      name: '2025年寻驾okr',
+      startDate: '2022-01-01',
+      endDate: '2022-01-31'
+    },
+    {
+      id: 2,
+      name: '2024年寻驾okr',
+      startDate: '2022-02-01',
+      endDate: '2022-02-28'
     }
-  })
+  ]
 }
 
 function handleSelectPeroid(row) {
-  searchForm.value.nodeName = row.nodeName
-  searchForm.value.nodeId = row.nodeId
-  getOkrList()
+  searchForm.value.peroidName = row.name
+  searchForm.value.peroidId = row.id
+  handleSearchOkr()
 }
 
-function getNodePropData(nodeId, prop) {
-  const nodeData = helpDataList.value.find((it) => it.nodeId == nodeId)
-  if (nodeData) {
-    return nodeData[prop]
-  } else {
-    return ''
-  }
+function handleSearchOkr() {
+  console.log(searchForm.value)
 }
 
 function toggleExpand(data, val) {
@@ -168,23 +177,19 @@ function toggleExpand(data, val) {
 toggleExpand(dataList.value, true)
 
 const dialogOkr = ref(null)
-const clickNode = ref(null)
+const okrId = ref(null)
 function handleClickNode(node, data) {
-  clickNode.value = data
+  okrId.value = data.id
   openOkr()
 }
 
 function openOkr() {
-  clickNode.value &&
-    dialogOkr.value.open({
-      nodeId: clickNode.value.nodeId,
-      canEdit: !clickNode.value.children || clickNode.value.children.length == 0
-    })
+  okrId.value && dialogOkr.value.open(okrId.value)
 }
 
 const dialogOkrInfo = ref(null)
 function handleAddNode() {
-  clickNode.value = null
+  okrId.value = null
   dialogOkrInfo.value.open('create', null)
 }
 

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

@@ -28,7 +28,7 @@
             </span>
             <div class="flex items-center mt-10px ml-50px">
               <span>当前进度：</span>
-              <span v-if="row.isSys || !props.canEdit">{{ row.currentValue }}</span>
+              <span v-if="row.isSys">{{ row.currentValue }}</span>
               <el-input
                 v-else-if="row.resultType == 1"
                 v-model="row.currentValue"
@@ -41,8 +41,8 @@
                 v-model="row.currentValue"
                 size="small"
               >
-                <el-radio :value="1">是</el-radio>
-                <el-radio :value="0">否</el-radio>
+                <el-radio :value="true">是</el-radio>
+                <el-radio :value="false">否</el-radio>
               </el-radio-group>
             </div>
           </template>
@@ -50,7 +50,7 @@
       </el-table-column>
       <el-table-column prop="progress" label="进度" width="200px">
         <template #default="{ row }">
-          <el-progress :percentage="parseInt(row.progress) || 0" />
+          <el-progress :percentage="row.progress || 0" />
         </template>
       </el-table-column>
       <el-table-column prop="executorName" label="执行人" width="200px" />
@@ -59,17 +59,8 @@
 </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([])
 
@@ -89,18 +80,12 @@ function prepareData(list) {
       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)
+          targetValue: child.targetValue
         }
         helpList.value.push(kr)
         return kr
@@ -111,9 +96,9 @@ function prepareData(list) {
 }
 
 defineExpose({
-  prepareData,
-  updateProcess
+  prepareData
 })
+
 function getHeight(row, index) {
   if (helpList.value.length - 1 == index || helpList.value[index + 1].type == '目标') {
     return '22px'
@@ -127,25 +112,6 @@ 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)
 }