From b155d3ce9ead22e792621c538db9f88f9bfde21b Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 21 Mar 2025 11:37:25 +0800
Subject: [PATCH 1/3] sc

---
 .env.base                                     |   4 +-
 src/api/okr/wait.js                           |  83 ++++++++
 src/config/axios/index.ts                     |   5 +-
 src/config/axios/service.ts                   |   3 +-
 .../OKR/Management/Components/DialogWait.vue  | 183 ++++++++++-------
 .../OKR/Management/Components/WaitTarget.vue  | 193 ++++++------------
 yarn.lock                                     |  48 +++--
 7 files changed, 297 insertions(+), 222 deletions(-)
 create mode 100644 src/api/okr/wait.js

diff --git a/.env.base b/.env.base
index ef509f9..0aa0c82 100644
--- a/.env.base
+++ b/.env.base
@@ -4,8 +4,8 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://47.98.161.246:48080'
-VITE_BASE_URL='http://114.55.169.15: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'
diff --git a/src/api/okr/wait.js b/src/api/okr/wait.js
new file mode 100644
index 0000000..2431c03
--- /dev/null
+++ b/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 }
+  })
+}
diff --git a/src/config/axios/index.ts b/src/config/axios/index.ts
index f857d5a..f0687f6 100644
--- a/src/config/axios/index.ts
+++ b/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
     }
   })
 }
diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index 3009121..d49464d 100644
--- a/src/config/axios/service.ts
+++ b/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
diff --git a/src/views/OKR/Management/Components/DialogWait.vue b/src/views/OKR/Management/Components/DialogWait.vue
index fe83d5f..6fcc047 100644
--- a/src/views/OKR/Management/Components/DialogWait.vue
+++ b/src/views/OKR/Management/Components/DialogWait.vue
@@ -7,7 +7,7 @@
         :disabled="formType == 'do'"
         :rules="rules"
         label-width="80px"
-        class="flex-1 wait-form"
+        class="flex-1"
       >
         <el-row :gutter="20">
           <el-col :span="24" :offset="0">
@@ -39,8 +39,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="0">
-            <el-form-item label="完成状态" prop="status">
-              <el-select v-model="form.status" placeholder="选择完成状态" filterable>
+            <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"
@@ -53,9 +53,9 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12" :offset="0">
-            <el-form-item label="截止日期" prop="dueDate">
+            <el-form-item label="截止日期" prop="endDate">
               <el-date-picker
-                v-model="form.dueDate"
+                v-model="form.endDate"
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
@@ -64,9 +64,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="0">
-            <el-form-item label="执行人" prop="executorIds">
+            <el-form-item label="执行人" prop="userList">
               <el-select
-                v-model="form.executorIds"
+                v-model="form.userList"
                 placeholder="选择执行人，可多选"
                 multiple
                 clearable
@@ -76,6 +76,7 @@
                 <el-option
                   v-for="item in employeeOptions"
                   :key="item.id"
+                  :disabled="item.status == 1"
                   :label="item.name"
                   :value="item.id"
                 />
@@ -85,7 +86,7 @@
         </el-row>
         <el-row :gutter="0">
           <el-col :span="8" :offset="0">
-            <el-form-item prop="remindFrequency">
+            <el-form-item prop="notifyType">
               <template #label>
                 <el-tooltip
                   content="新增待办时会立刻发送消息通知执行人，若后续无需再次提醒，频率可选择“不提醒”"
@@ -96,34 +97,49 @@
                 </el-tooltip>
                 <span>提醒频率</span>
               </template>
-              <el-select v-model="form.remindFrequency" placeholder="选择提醒频率">
-                <el-option label="不提醒" :value="0" />
-                <el-option label="单次提醒" :value="1" />
-                <el-option label="循环提醒" :value="2" />
+              <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.remindFrequency != 0">
-            <el-form-item label="提醒时间" prop="remindTime">
-              <el-input v-model="form.remindTime" placeholder="输入小时数" min="0" type="number">
+          <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 v-if="form.remindFrequency == 1">提前</span>
-                  <span v-else-if="form.remindFrequency == 2">每</span>
+                  <span>每</span>
                 </template>
                 <template #append> 小时 </template>
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" :offset="0" v-if="form.remindFrequency == 2">
-            <el-form-item label="首次提醒" prop="firstTime">
+          <el-col :span="8" :offset="0" v-if="form.notifyType == 3">
+            <el-form-item label="首次提醒" prop="firstNotifyTime">
               <el-time-picker
-                v-model="form.firstTime"
+                v-model="form.firstNotifyTime"
                 format="HH:mm"
                 value-format="HH:mm"
                 style="width: 100%"
-                :picker-options="{
-                  selectableRange: '07:00 - 22:00'
-                }"
+                :picker-options="enableTimeRange"
                 placeholder="选择时间点"
               />
             </el-form-item>
@@ -143,23 +159,15 @@
         </div>
         <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">
-              <div>张三</div>
-              <div class="mt-10px text-14px" style="line-height: 24px; color: #666">
-                今天成交了15个
-              </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">
-                下午跟进了100条线索
-              </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">
-                上午跟进了100条线索
-              </div>
+            <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>
@@ -176,20 +184,30 @@
 </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 }
+      { label: '高', value: '1' },
+      { label: '中', value: '2' },
+      { label: '低', value: '3' }
     ]
   },
   statusOptions: {
     type: Array,
     default: () => [
-      { label: '未完成', value: 1, tagType: 'warning' },
-      { label: '已关闭', value: 2, tagType: 'success' }
+      { label: '未完成', value: '1', tagType: 'warning' },
+      { label: '已关闭', value: '2', tagType: 'success' }
     ]
   }
 })
@@ -201,6 +219,10 @@ const toolbarConfig = {
   toolbarKeys: []
 }
 
+const enableTimeRange = {
+  selectableRange: '07:00 - 22:00'
+}
+
 const show = ref(false)
 const title = ref('')
 const formType = ref('create')
@@ -209,10 +231,12 @@ const form = ref({})
 const formLoading = ref(false)
 const rules = ref({
   title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
-  dueDate: [{ required: true, message: '请选择截止日期', trigger: 'change' }],
-  executorIds: [{ required: true, message: '请选择执行人', trigger: 'change' }]
+  endDate: [{ required: true, message: '请选择截止日期', trigger: 'change' }],
+  userList: [{ required: true, message: '请选择执行人', trigger: 'change' }]
 })
 
+const followList = ref([])
+
 async function open(type, id) {
   show.value = true
   title.value = { create: '新增待办', update: '修改待办', do: '更新待办进度' }[type]
@@ -221,19 +245,15 @@ async function open(type, id) {
   if (id) {
     formLoading.value = true
     try {
-      // 模拟表单数据
-      form.value = {
-        title: '2025年1月20日，张三成交了15个',
-        content: '今天成交了15个',
-        priority: 1,
-        status: 1,
-        dueDate: '2025-01-20',
-        executorIds: [1, 2],
-        remindFrequency: 2,
-        remindTime: 12,
-        firstTime: '09:00'
-      }
-      // form.value = await KpiApi.getKpiDetail(id)
+      // 表单数据
+      getWaitDetail(id).then((info) => {
+        form.value = {
+          ...info,
+          endDate: formatDate(info.endDate, 'YYYY-MM-DD'),
+          userList: info.userIdList
+        }
+      })
+      getFollowList(id)
     } finally {
       formLoading.value = false
     }
@@ -241,25 +261,32 @@ async function open(type, id) {
   getOptions()
 }
 
+function getFollowList(id) {
+  // 跟进数据
+  getFollowWaitPage({
+    waitId: id
+  }).then((data) => {
+    followList.value = data
+  })
+}
+
 function getOptions() {
-  employeeOptions.value = [
-    { id: 1, name: '张三' },
-    { id: 2, name: '李四' },
-    { id: 3, name: '王五' }
-  ]
+  getEmployeeSimpleList().then((data) => {
+    employeeOptions.value = data
+  })
 }
 
 function resetForm() {
   form.value = {
     title: undefined,
     content: undefined,
-    priority: 1,
-    status: 1,
-    dueDate: undefined,
-    executorIds: [],
-    remindFrequency: 2,
+    priority: '1',
+    completeStatus: '1',
+    endDate: undefined,
+    userList: [],
+    notifyType: '3',
     remindTime: 12,
-    firstTime: '09:00'
+    firstNotifyTime: '09:00'
   }
 }
 
@@ -278,10 +305,10 @@ async function handleSave() {
   formLoading.value = true
   try {
     if (formType.value === 'create') {
-      await KpiApi.createKpi(form.value)
+      await createWait(form.value)
       message.success(t('common.createSuccess'))
     } else {
-      await KpiApi.updateKpi(form.value)
+      await updateWait(form.value)
       message.success(t('common.updateSuccess'))
     }
     show.value = false
@@ -293,6 +320,16 @@ async function handleSave() {
 }
 
 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>
diff --git a/src/views/OKR/Management/Components/WaitTarget.vue b/src/views/OKR/Management/Components/WaitTarget.vue
index 829d2fc..74a88c3 100644
--- a/src/views/OKR/Management/Components/WaitTarget.vue
+++ b/src/views/OKR/Management/Components/WaitTarget.vue
@@ -14,8 +14,13 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-select v-model="searchForm.status" placeholder="选择完成状态" clearable filterable>
+      <!-- <el-form-item>
+        <el-select
+          v-model="searchForm.completeStatus"
+          placeholder="选择完成状态"
+          clearable
+          filterable
+        >
           <el-option
             v-for="item in statusOptions"
             :key="item.value"
@@ -23,24 +28,16 @@
             :value="item.value"
           />
         </el-select>
-      </el-form-item>
+      </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>
-    <div>
-      <Icon icon="ep:info-filled" />
-      <span>开发注意：</span>
-      <div>列表排序 1 状态按照未完成在前、已关闭在后， 2优先级根据高中低排序 3截止日期正序</div>
-      <div>
-        表格全部操作按钮：创建人(修改、删除、催办->微信通知)、执行人(跟进);且与完成状态相关
-      </div>
-    </div>
-    <el-tabs v-model="tabIndex" @tab-click="searchList">
+    <el-tabs v-model="tabIndex" @tab-change="searchList">
       <el-tab-pane :name="1">
         <template #label>
-          <el-badge :value="9" :max="99">
+          <el-badge :value="tabCount.dayEndAgentWorkNum" :max="99" :show-zero="false">
             <el-tooltip content="截止日在今日及之前的未关闭事项" placement="top" effect="dark">
               <Icon icon="ep:question-filled" />
             </el-tooltip>
@@ -58,7 +55,7 @@
       </el-tab-pane>
       <el-tab-pane :name="3">
         <template #label>
-          <el-badge :value="3" :max="99">
+          <el-badge :value="tabCount.urgeAgentWorkNum" :max="99" :show-zero="false">
             <el-tooltip content="指派他人去办的事项" placement="top" effect="dark">
               <Icon icon="ep:question-filled" />
             </el-tooltip>
@@ -68,7 +65,7 @@
       </el-tab-pane>
       <el-tab-pane :name="4">
         <template #label>
-          <el-badge :value="999" :max="99">
+          <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>
@@ -101,20 +98,22 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="createUserName" label="创建人" />
-      <el-table-column prop="createDate" label="创建日期" />
-      <el-table-column prop="executorNames" label="执行人" />
-      <el-table-column prop="dueDate" label="截止日期" />
+      <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.status)">{{ statusNameFilter(row.status) }}</el-tag>
+          <el-tag :type="statusFilter(row.completeStatus)">{{
+            statusNameFilter(row.completeStatus)
+          }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="completeDate" label="关闭日期" />
+      <el-table-column prop="completedDate" label="关闭日期" :formatter="dateFormatter" />
       <el-table-column fixed="right" label="操作" width="140">
         <template #default="{ row }">
           <el-button
-            v-if="row.executorIds.includes(currentUserId) && row.status == 1"
+            v-if="row.userIdList.includes(currentUserId) && row.completeStatus == 1"
             style="padding: 0; margin-right: 10px"
             type="primary"
             text
@@ -123,25 +122,25 @@
             跟进
           </el-button>
           <el-button
-            v-if="row.createUserId == currentUserId && row.status == 1"
+            v-if="!row.userIdList.includes(currentUserId) && row.completeStatus == 1"
             style="padding: 0; margin-right: 10px; margin-left: 0"
             type="primary"
             text
-            @click="handleEdit(row)"
+            @click="handleNotice(row)"
           >
-            修改
+            催办
           </el-button>
           <el-button
-            v-if="!row.executorIds.includes(currentUserId) && row.status == 1"
+            v-if="row.creator == currentUserId && row.completeStatus == 1"
             style="padding: 0; margin-right: 10px; margin-left: 0"
             type="primary"
             text
-            @click="handleNotice(row)"
+            @click="handleEdit(row)"
           >
-            催办
+            修改
           </el-button>
           <el-button
-            v-if="row.createUserId == currentUserId && row.status == 1"
+            v-if="row.creator == currentUserId && row.completeStatus == 1"
             style="padding: 0; margin-right: 10px; margin-left: 0"
             type="danger"
             text
@@ -165,8 +164,11 @@
 
 <script setup name="WaitTarget">
 import { useUserStore } from '@/store/modules/user'
+import { dateFormatter } from '@/utils/formatTime'
 import DialogWait from './DialogWait.vue'
 
+import { getWaitPage, deleteWait, getWaitCount } from '@/api/okr/wait'
+
 const userStore = useUserStore()
 const currentUserId = userStore.getUser.id
 
@@ -174,7 +176,7 @@ const message = useMessage()
 
 const searchForm = ref({
   title: undefined,
-  status: undefined,
+  completeStatus: undefined,
   priority: undefined,
   pageNo: 1,
   pageSize: 50
@@ -186,25 +188,25 @@ const statusOptions = [
 ]
 
 const statusFilter = (status) => {
-  return statusOptions.find((item) => item.value === status)?.tagType
+  return statusOptions.find((item) => item.value == status)?.tagType
 }
 
 const statusNameFilter = (status) => {
-  return statusOptions.find((item) => item.value === status)?.label
+  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' }
+  { 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
+  return priorityOptions.find((item) => item.value == priority)?.tagType
 }
 
 const priorityNameFilter = (priority) => {
-  return priorityOptions.find((item) => item.value === priority)?.label
+  return priorityOptions.find((item) => item.value == priority)?.label
 }
 
 const tabIndex = ref(1)
@@ -218,6 +220,21 @@ function searchList() {
   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([])
@@ -225,97 +242,18 @@ const total = ref(0)
 function getList() {
   loading.value = true
   try {
-    // 用settimeout模拟网络请求
-    setTimeout(() => {
+    searchForm.value.queryType = tabIndex.value
+    getWaitPage(searchForm.value).then((res) => {
+      tableList.value = res.list
+      total.value = res.total
       loading.value = false
-      if (tabIndex.value == 4) {
-        mentionedList.value = [
-          {
-            id: 1,
-            content: '我是老六@张三',
-            createUserName: '王二',
-            createDate: '2025-03-07'
-          }
-        ]
-      } else {
-        const list = [
-          {
-            id: 1,
-            title: '今日跟进数量达到100',
-            description: '今日成交数量达到10',
-            priority: 1,
-            createUserId: 1,
-            createUserName: '系统',
-            createDate: '2025-03-07',
-            executorIds: ['1818599239840960512'],
-            executorNames: '张三',
-            dueDate: '2025-03-07',
-            status: 1,
-            completeDate: ''
-          },
-          {
-            id: 2,
-            title: '今日跟进数量达到100',
-            description: '今日成交数量达到10',
-            priority: 1,
-            createUserId: '1818599239840960512',
-            createUserName: '张三',
-            createDate: '2025-03-07',
-            executorIds: ['1818599239840960512', '123'],
-            executorNames: '张三，李四',
-            dueDate: '2025-02-07',
-            status: 1,
-            completeDate: ''
-          },
-          {
-            id: 3,
-            title: '今日跟进数量达到100',
-            description: '今日成交数量达到10',
-            priority: 1,
-            createUserId: '1818599239840960512',
-            createUserName: '张三',
-            createDate: '2025-03-07',
-            executorIds: ['1818599239840960512'],
-            executorNames: '张三',
-            dueDate: '2025-03-17',
-            status: 2,
-            completeDate: '2025-03-07'
-          },
-          {
-            id: 2,
-            title: '今日跟进数量达到100',
-            description: '今日成交数量达到10',
-            priority: 1,
-            createUserId: '1818599239840960512',
-            createUserName: '张三',
-            createDate: '2025-03-07',
-            executorIds: ['123'],
-            executorNames: '李四',
-            dueDate: '2025-02-07',
-            status: 1,
-            completeDate: ''
-          }
-        ]
-        tableList.value = list.filter((item) => {
-          if (tabIndex.value == 1) {
-            return item.status == 1
-          } else {
-            return item
-          }
-        })
-      }
-      total.value = 1
-    }, 1000)
-    // getWaitTargetList(searchForm.value).then((res) => {
-    //   tableList.value = res.data
-    //   total.value = res.total
-    //   loading.value = false
-    // })
+    })
+    getTabCount()
   } catch (error) {}
 }
 
 function handleDo(row) {
-  waitDialogRef.value.open('do', row.id)
+  waitDialogRef.value.open('do', row.workId)
 }
 
 const waitDialogRef = ref()
@@ -324,11 +262,16 @@ function handleAdd() {
 }
 
 function handleEdit(row) {
-  waitDialogRef.value.open('update', row.id)
+  waitDialogRef.value.open('update', row.workId)
 }
 
 function handleDelete(row) {
-  console.log(row)
+  message.confirm('确定删除待办事项吗？').then(() => {
+    deleteWait(row.workId).then(() => {
+      message.success('删除成功')
+      getList()
+    })
+  })
 }
 
 function handleNotice(row) {
diff --git a/yarn.lock b/yarn.lock
index 0e62347..b9b443f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.0.tgz#fa41b87812a16bf123122bf945946bae3fdf7fc1"
-  integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==
+"@floating-ui/core@^1.6.0":
+  version "1.6.9"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.9.tgz#64d1da251433019dafa091de9b2886ff35ec14e6"
+  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"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.3.tgz#954e46c1dd3ad48e49db9ada7218b0985cee75ef"
-  integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==
+  version "1.6.13"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.13.tgz#a8a938532aea27a95121ec16e667a7cbe8c59e34"
+  integrity sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==
   dependencies:
-    "@floating-ui/core" "^1.0.0"
-    "@floating-ui/utils" "^0.2.0"
+    "@floating-ui/core" "^1.6.0"
+    "@floating-ui/utils" "^0.2.9"
 
-"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2"
-  integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==
+"@floating-ui/utils@^0.2.9":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.9.tgz#50dea3616bc8191fb8e112283b49eaff03e78429"
+  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"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
-  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
+  version "4.17.16"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.16.tgz#94ae78fab4a38d73086e962d0b65c30d816bfb0a"
+  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.3:
+  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==
@@ -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==

From d6bfbcf96ac9160ad8cfe40b8f80d04b7ce98123 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 25 Mar 2025 16:27:52 +0800
Subject: [PATCH 2/3] sc

---
 package.json                                  |   2 +-
 src/api/okr/okr.js                            |  65 +++
 src/components/Crontab/src/Crontab.vue        |  66 +--
 src/components/Pagination/index.vue           |   5 -
 src/views/Basic/Dept/DeptForm.vue             |   4 +-
 src/views/Basic/Menu/MenuForm.vue             |  10 +-
 src/views/Basic/User/UserForm.vue             |   4 +-
 .../Finance/Commission/Comp/DialogPlan.vue    |  20 +-
 src/views/Finance/Salary/index.vue            |   4 +-
 .../OKR/Management/Components/AllTarget.vue   | 213 ++-------
 .../Management/Components/DialogOkrInfo.vue   | 422 +++++++++---------
 .../OKR/Management/Components/DialogWait.vue  |   2 +-
 .../OKR/Management/Components/MyDuty.vue      | 123 ++---
 .../OKR/Management/Components/OkrTable.vue    |  14 +-
 .../OKR/Management/Components/WaitTarget.vue  |   6 +-
 .../Pers/Employee/Comp/DialogEmployee.vue     |   4 +-
 src/views/Pers/Employee/index.vue             |   4 +-
 src/views/Profile/components/BasicInfo.vue    |   4 +-
 yarn.lock                                     |  16 +-
 19 files changed, 454 insertions(+), 534 deletions(-)
 create mode 100644 src/api/okr/okr.js

diff --git a/package.json b/package.json
index b5d033c..eac52df 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/api/okr/okr.js b/src/api/okr/okr.js
new file mode 100644
index 0000000..2798975
--- /dev/null
+++ b/src/api/okr/okr.js
@@ -0,0 +1,65 @@
+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 }
+  })
+}
diff --git a/src/components/Crontab/src/Crontab.vue b/src/components/Crontab/src/Crontab.vue
index 13096f7..d8e4eaa 100644
--- a/src/components/Crontab/src/Crontab.vue
+++ b/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 label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</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 label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</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 label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</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 label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
-                <el-radio-button label="4">本月最后一天</el-radio-button>
-                <el-radio-button label="5">不指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button value="4">本月最后一天</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 label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</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 label="1">范围</el-radio-button>
-                  <el-radio-button label="2">间隔</el-radio-button>
-                  <el-radio-button label="3">指定</el-radio-button>
-                  <el-radio-button label="4">本月最后一周</el-radio-button>
-                  <el-radio-button label="5">不指定</el-radio-button>
+                  <el-radio-button value="0">任意值</el-radio-button>
+                  <el-radio-button value="1">范围</el-radio-button>
+                  <el-radio-button value="2">间隔</el-radio-button>
+                  <el-radio-button value="3">指定</el-radio-button>
+                  <el-radio-button value="4">本月最后一周</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 label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="-1">忽略</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</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="范围">
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index ad9f6cf..7587f1f 100644
--- a/src/components/Pagination/index.vue
+++ b/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
   }
 })
 
diff --git a/src/views/Basic/Dept/DeptForm.vue b/src/views/Basic/Dept/DeptForm.vue
index 9f61981..fdccab9 100644
--- a/src/views/Basic/Dept/DeptForm.vue
+++ b/src/views/Basic/Dept/DeptForm.vue
@@ -43,8 +43,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 :label="1"> 禁用 </el-radio>
+              <el-radio :value="0"> 启用 </el-radio>
+              <el-radio :value="1"> 禁用 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/Basic/Menu/MenuForm.vue b/src/views/Basic/Menu/MenuForm.vue
index 6bc0346..a01fd5a 100644
--- a/src/views/Basic/Menu/MenuForm.vue
+++ b/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 :label="2"> 菜单 </el-radio-button>
-          <el-radio-button :label="3"> 按钮 </el-radio-button>
+          <el-radio-button :value="1"> 目录 </el-radio-button>
+          <el-radio-button :value="2"> 菜单 </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 :label="1"> 禁用 </el-radio>
+          <el-radio :value="0"> 启用 </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">
diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue
index a745737..4a6c70a 100644
--- a/src/views/Basic/User/UserForm.vue
+++ b/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 :label="2"> 女 </el-radio>
+              <el-radio :value="1"> 男 </el-radio>
+              <el-radio :value="2"> 女 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/Finance/Commission/Comp/DialogPlan.vue b/src/views/Finance/Commission/Comp/DialogPlan.vue
index 2007de8..9a27449 100644
--- a/src/views/Finance/Commission/Comp/DialogPlan.vue
+++ b/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 :label="false"> 否 </el-radio>
+              <el-radio :value="true"> 是 </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 :label="false"> 否 </el-radio>
+              <el-radio :value="true"> 是 </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 :label="false"> 否 </el-radio>
+              <el-radio :value="true"> 是 </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 :label="false"> 否 </el-radio>
+              <el-radio :value="true"> 是 </el-radio>
+              <el-radio :value="false"> 否 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/Finance/Salary/index.vue b/src/views/Finance/Salary/index.vue
index 5dcff1f..8a86667 100644
--- a/src/views/Finance/Salary/index.vue
+++ b/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 :label="1"> 离职 </el-radio>
+          <el-radio :value="0"> 在职 </el-radio>
+          <el-radio :value="1"> 离职 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item>
diff --git a/src/views/OKR/Management/Components/AllTarget.vue b/src/views/OKR/Management/Components/AllTarget.vue
index e3ba603..2b0ae3f 100644
--- a/src/views/OKR/Management/Components/AllTarget.vue
+++ b/src/views/OKR/Management/Components/AllTarget.vue
@@ -2,42 +2,26 @@
   <div>
     <div class="flex items-center justify-between">
       <el-row>
-        <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 : '选择周期' }}
-              </span>
-            </div>
-          </template>
-          <div>
-            <div class="mt-10px" style="height: 400px">
-              <el-table :data="peroidList" @row-click="handleSelectPeroid">
-                <el-table-column label="节点名称">
-                  <template #default="{ row }">
-                    <el-radio v-model="searchForm.peroidId" :label="row.id">{{
-                      row.name
-                    }}</el-radio>
-                  </template>
-                </el-table-column>
-                <el-table-column label="开始日期" prop="startDate" width="120" />
-                <el-table-column label="截止日期" prop="endDate" width="120" />
-              </el-table>
-            </div>
-          </div>
-        </el-popover>
+        <el-tree-select
+          v-model="searchForm.nodeId"
+          :data="peroidList"
+          :props="defaultProps"
+          :render-after-expand="false"
+          default-expand-all
+          style="width: 400px"
+          @change="getOkrList"
+        />
         <el-button class="ml-10px" type="primary" @click="handleAddNode">新建节点</el-button>
       </el-row>
       <el-row>
-        <el-button type="warning" @click="handleEditOkr(searchForm.peroidId)">
+        <el-button type="warning" @click="handleEditOkr(searchForm.nodeId)">
           修改当前节点
         </el-button>
         <el-button type="success" @click="handleUpdateProcess">更新进度</el-button>
       </el-row>
     </div>
 
-    <OkrTable ref="okrTableRef" @row-click="handleShowOkr" />
+    <OkrTable ref="okrTableRef" />
     <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
     <DialogOkrInfo ref="dialogOkrInfo" />
   </div>
@@ -48,161 +32,46 @@ import OkrTable from './OkrTable.vue'
 import DialogOkrInfo from './DialogOkrInfo.vue'
 import DialogOkr from './DialogOkr.vue'
 
+import { getAllNodeTree, getAllOkrPage } from '@/api/okr/okr'
+import { listToTree } from '@/utils/tree'
+
 const message = useMessage()
 
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
 const okrTableRef = ref(null)
 const searchForm = ref({
-  peroidName: '',
-  peroidId: null
+  nodeId: undefined
 })
 
 const peroidList = ref([])
 
 onMounted(() => {
   handleSearchPeroid()
-  if (!searchForm.value.peroidId && peroidList.value.length) {
-    searchForm.value.peroidId = peroidList.value[0].id
-    searchForm.value.peroidName = peroidList.value[0].name
-  }
-  getOkrList()
 })
 
-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.peroidName = row.name
-  searchForm.value.peroidId = row.id
-  handleSearchOkr()
-}
-
-function handleSearchOkr() {
-  console.log(searchForm.value)
+function handleSearchPeroid() {
+  getAllNodeTree().then((resp) => {
+    peroidList.value = listToTree(resp.tree, {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+    searchForm.value.nodeId = resp.nodeId
+    getOkrList()
+  })
 }
 
-async function getOkrList() {
-  const list = [
-    {
-      id: 1,
-      name: '销售成交额达到1000万，总体成交率15%',
-      process: 60,
-      type: 'object',
-      children: [
-        {
-          id: 11,
-          type: 'keyresult',
-          channelName: '抖音',
-          target: '线索目标',
-          targetType: 'value',
-          isSystem: true,
-          targetNum: 10000,
-          targetValue: false,
-          currentNum: 5000,
-          currentValue: false,
-          process: 60,
-          users: '张三、李四'
-        },
-        {
-          id: 12,
-          type: 'keyresult',
-          channelName: '抖音',
-          target: '成交数',
-          isSystem: true,
-          targetType: 'value',
-          targetNum: 2500,
-          targetValue: false,
-          currentNum: 500,
-          currentValue: false,
-          process: 60,
-          users: '张三、李四'
-        }
-      ]
-    },
-    {
-      id: 2,
-      name: '运营消耗预算控制在20万以内，获得10万条线索',
-      process: 80,
-      type: 'object',
-      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
-        }
-      ]
-    }
-  ]
-  nextTick(() => {
-    okrTableRef.value.prepareData(list)
+function getOkrList() {
+  getAllOkrPage(searchForm.value).then((resp) => {
+    const list = resp
+    nextTick(() => {
+      okrTableRef.value.prepareData(list)
+    })
   })
 }
 
@@ -213,7 +82,7 @@ function handleAddNode() {
 
 function handleEditOkr() {
   dialogOkr.value.close()
-  dialogOkrInfo.value.open('update', 1)
+  dialogOkrInfo.value.open('update', searchForm.value.nodeId)
 }
 
 function handleUpdateProcess() {
@@ -222,9 +91,9 @@ function handleUpdateProcess() {
 }
 
 const dialogOkr = ref(null)
-function handleShowOkr(row) {
-  dialogOkr.value.open(row.id)
-}
+// function handleShowOkr(row) {
+//   dialogOkr.value.open(row.id)
+// }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index 3fd15a7..bb88448 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -28,21 +28,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-input v-model="form.name" placeholder="请输入节点名称" />
+              <el-form-item prop="nodeName">
+                <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 +70,8 @@
                   v-model="form.executor"
                   placeholder="选择执行人，可多选"
                   multiple
+                  collapse-tags
+                  collapse-tags-tooltip
                   clearable
                   filterable
                 >
@@ -74,16 +79,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-select v-model="form.persission" placeholder="选择权限" clearable filterable>
-                  <el-option label="公开" :value="0" />
-                  <el-option label="仅上级可见" :value="1" />
+              <el-form-item prop="dataScope">
+                <el-select v-model="form.dataScope" placeholder="选择权限" clearable filterable>
+                  <el-option label="公开" :value="1" />
+                  <el-option label="仅上级可见" :value="2" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -91,8 +97,8 @@
         </el-form>
         <div class="relative">
           <el-button
-            v-if="okrKey === 'okr'"
-            style="position: absolute; right: 10px; top: 10px"
+            v-if="okrKey == 'okr'"
+            style="position: absolute; right: 10px; top: 10px; z-index: 9"
             type="primary"
             size="small"
             @click="addObjective"
@@ -100,8 +106,8 @@
             添加目标
           </el-button>
           <el-button
-            v-else-if="okrKey === 'childNode'"
-            style="position: absolute; right: 10px; top: 10px"
+            v-else-if="okrKey == 'childNode'"
+            style="position: absolute; right: 10px; top: 10px; z-index: 9"
             type="primary"
             size="small"
             @click="addChildNode"
@@ -114,63 +120,75 @@
                 <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="danger" text @click="removeObj">删除目标</el-button>
+                        <el-button type="primary" text @click="AddKR(i)">新增关键成果</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"
-                            placeholder="选择或输入"
+                            v-model="kr.keyResultName"
+                            placeholder="选择或输入关键成果"
                             filterable
-                            :props="{ value: 'id', label: 'name' }"
+                            :props="{ value: 'keyResultId', label: 'keyResultName' }"
                             allow-create
                             :reserve-keyword="false"
                             class="flex-1 w-150px"
                           >
                             <el-option
-                              v-for="it in item.children"
-                              :key="it.id"
-                              :label="it.name"
-                              :value="it.id"
+                              v-for="it in krOptions"
+                              :key="it.keyResultId"
+                              :label="it.keyResultName"
+                              :value="it.keyResultId"
                             />
                           </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-button label="value">目标值</el-radio-button>
-                            <el-radio-button label="radio">是/否</el-radio-button>
+                          <el-radio-group v-model="kr.resultType" class="ml-10px">
+                            <el-radio-button :value="1">目标值</el-radio-button>
+                            <el-radio-button :value="2">是/否</el-radio-button>
                           </el-radio-group>
 
                           <el-input
-                            v-if="kr.targetType === 'value'"
-                            v-model="kr.targetNum"
+                            v-if="kr.resultType == 1"
+                            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-option label="公开" :value="0" />
-                      <el-option label="仅上级可见" :value="1" />
+                    <el-select v-model="row.dataScope" placeholder="请选择" style="width: 130px">
+                      <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,16 @@
 </template>
 
 <script setup name="DialogOkrInfo">
+import {
+  getAllNodeTree,
+  getOkrNodeDetail,
+  createOkrNode,
+  updateOkrNode,
+  getAllOkrPage
+} from '@/api/okr/okr'
+import { listToTree } from '@/utils/tree'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -322,39 +355,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([
-  {
-    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 parentNodeList = ref([])
 
-const childNodeList = ref([{}])
+const childNodeList = ref([])
 
-const userOptions = ref([
-  { id: 1, name: '张三' },
-  { id: 2, name: '李四' },
-  { id: 3, name: '王五' },
-  { id: 4, name: '赵六' }
-])
+const userOptions = ref([])
+const krOptions = ref([])
 const defaultProps = {
   children: 'children',
   label: 'sourceName',
@@ -362,151 +376,51 @@ const defaultProps = {
   isLeaf: 'leaf'
 }
 const sourceOptions = ref([])
-const objectList = ref([
-  {
-    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'
-      }
-    ]
-  }
-])
+const objectList = ref([])
 
-async function open(type, val) {
+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'
+    })
+  })
   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: '',
-    name: '',
-    createTime: '',
-    endTime: '',
-    executor: []
+    parentId: undefined,
+    nodeName: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    executor: [],
+    dataScope: 1
   }
 }
 
@@ -518,26 +432,36 @@ const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于
 
 function addObjective() {
   objectList.value.push({
-    name: '',
-    objExecutor: [],
-    children: []
+    objectiveName: '',
+    executor: [],
+    keyResults: [],
+    dataScope: 1
   })
 }
 
-function AddKR() {
-  objectList.value.push({
-    name: '',
-    objExecutor: [],
-    children: []
+function AddKR(idx) {
+  if (!objectList.value[idx].keyResults) {
+    objectList.value[idx].keyResults = []
+  }
+  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() {
-  objectList.value.pop()
+function removeObj(idx) {
+  objectList.value.splice(idx, 1)
 }
 
-function removeKR() {
-  objectList.value.pop()
+function removeKR(oIdx, krIdx) {
+  objectList.value[oIdx].keyResults.splice(krIdx, 1)
 }
 
 function addChildNode() {
@@ -548,6 +472,23 @@ 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()
+}
+
 async function handleSave() {
   // 校验表单
   if (!formRef.value) return
@@ -556,11 +497,46 @@ 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('0')}-01`,
+              endTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart(
+                '0'
+              )}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
+              children: [
+                {
+                  nodeName: `第${month + 1}月第1周`,
+                  children: []
+                },
+                {
+                  nodeName: `第${month + 1}月第2周`,
+                  children: []
+                },
+                {
+                  nodeName: `第${month + 1}月第3周`,
+                  children: []
+                },
+                {
+                  nodeName: `第${month + 1}月第3周`,
+                  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
diff --git a/src/views/OKR/Management/Components/DialogWait.vue b/src/views/OKR/Management/Components/DialogWait.vue
index 6fcc047..3358838 100644
--- a/src/views/OKR/Management/Components/DialogWait.vue
+++ b/src/views/OKR/Management/Components/DialogWait.vue
@@ -264,7 +264,7 @@ async function open(type, id) {
 function getFollowList(id) {
   // 跟进数据
   getFollowWaitPage({
-    waitId: id
+    workId: id
   }).then((data) => {
     followList.value = data
   })
diff --git a/src/views/OKR/Management/Components/MyDuty.vue b/src/views/OKR/Management/Components/MyDuty.vue
index f8841da..2727eb0 100644
--- a/src/views/OKR/Management/Components/MyDuty.vue
+++ b/src/views/OKR/Management/Components/MyDuty.vue
@@ -2,37 +2,17 @@
   <div>
     <div class="flex items-center justify-between">
       <el-row>
-        <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 : '选择周期' }}
-              </span>
-            </div>
-          </template>
-          <div>
-            <div class="mt-10px" style="height: 400px">
-              <el-table :data="peroidList" @row-click="handleSelectPeroid">
-                <el-table-column label="节点名称">
-                  <template #default="{ row }">
-                    <el-radio v-model="searchForm.peroidId" :label="row.id">{{
-                      row.name
-                    }}</el-radio>
-                  </template>
-                </el-table-column>
-                <el-table-column label="开始日期" prop="startDate" width="120" />
-                <el-table-column label="截止日期" prop="endDate" width="120" />
-              </el-table>
-            </div>
-          </div>
-        </el-popover>
-        <el-button class="ml-10px" type="primary" @click="handleAddNode">新建节点</el-button>
+        <el-tree-select
+          v-model="searchForm.nodeId"
+          :data="peroidList"
+          :props="defaultProps"
+          :render-after-expand="false"
+          default-expand-all
+          style="width: 400px"
+          @change="handleSearchOkr"
+        />
       </el-row>
       <el-row>
-        <el-button type="warning" @click="handleEditOkr(searchForm.peroidId)">
-          修改当前节点
-        </el-button>
         <el-button type="success" @click="handleUpdateProcess">更新进度</el-button>
       </el-row>
     </div>
@@ -50,45 +30,78 @@ import DialogOkr from './DialogOkr.vue'
 
 const message = useMessage()
 
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
 const okrTableRef = ref(null)
 const searchForm = ref({
-  peroidName: '',
-  peroidId: null
+  nodeId: 4
 })
 
 const peroidList = ref([])
 
 onMounted(() => {
   handleSearchPeroid()
-  if (!searchForm.value.peroidId && peroidList.value.length) {
-    searchForm.value.peroidId = peroidList.value[0].id
-    searchForm.value.peroidName = peroidList.value[0].name
-  }
   getOkrList()
 })
 
 async function handleSearchPeroid() {
   peroidList.value = [
     {
-      id: 1,
-      name: '2025年寻驾okr',
+      nodeId: 1,
+      nodeName: '2025年寻驾okr',
       startDate: '2022-01-01',
-      endDate: '2022-01-31'
-    },
-    {
-      id: 2,
-      name: '2024年寻驾okr',
-      startDate: '2022-02-01',
-      endDate: '2022-02-28'
+      endDate: '2022-01-31',
+      children: [
+        {
+          nodeId: 2,
+          nodeName: '1月',
+          startDate: '2022-01-01',
+          endDate: '2022-01-31',
+          children: [
+            {
+              nodeId: 3,
+              nodeName: '第1周',
+              startDate: '2022-01-01',
+              endDate: '2022-01-31',
+              children: [
+                {
+                  nodeId: 4,
+                  nodeName: '仇山河',
+                  startDate: '2022-01-01',
+                  endDate: '2022-01-31'
+                }
+              ]
+            },
+            {
+              nodeId: 5,
+              nodeName: '第2周',
+              startDate: '2022-02-01',
+              endDate: '2022-02-28',
+              children: [
+                {
+                  nodeId: 6,
+                  nodeName: '仇山河',
+                  startDate: '2022-02-01',
+                  endDate: '2022-02-28'
+                }
+              ]
+            }
+          ]
+        }
+      ]
     }
   ]
 }
 
-function handleSelectPeroid(row) {
-  searchForm.value.peroidName = row.name
-  searchForm.value.peroidId = row.id
-  handleSearchOkr()
-}
+// function handleSelectPeroid(row) {
+//   searchForm.value.peroidName = row.name
+//   searchForm.value.nodeId = row.id
+//   handleSearchOkr()
+// }
 
 function handleSearchOkr() {
   console.log(searchForm.value)
@@ -100,7 +113,7 @@ async function getOkrList() {
       id: 1,
       name: '销售成交额达到1000万，总体成交率15%',
       process: 60,
-      type: 'object',
+      type: '目标',
       children: [
         {
           id: 11,
@@ -136,7 +149,7 @@ async function getOkrList() {
       id: 2,
       name: '运营消耗预算控制在20万以内，获得10万条线索',
       process: 80,
-      type: 'object',
+      type: '目标',
       children: [
         {
           id: 21,
@@ -170,7 +183,7 @@ async function getOkrList() {
       id: 3,
       name: '目标3',
       process: 40,
-      type: 'object',
+      type: '目标',
       children: [
         {
           id: 31,
@@ -207,9 +220,9 @@ async function getOkrList() {
 }
 
 const dialogOkrInfo = ref(null)
-function handleAddNode() {
-  dialogOkrInfo.value.open('create', null)
-}
+// function handleAddNode() {
+//   dialogOkrInfo.value.open('create', null)
+// }
 
 function handleEditOkr() {
   dialogOkr.value.close()
diff --git a/src/views/OKR/Management/Components/OkrTable.vue b/src/views/OKR/Management/Components/OkrTable.vue
index d6a119f..b15873a 100644
--- a/src/views/OKR/Management/Components/OkrTable.vue
+++ b/src/views/OKR/Management/Components/OkrTable.vue
@@ -15,11 +15,11 @@
             v-if="!expandedRows[row.id]"
             class="line1"
             :style="{
-              top: row.type == 'object' ? '30px' : 0,
+              top: !row.keyResultId ? '30px' : 0,
               height: getHeight(row, $index)
             }"
           ></span>
-          <span v-if="row.type === 'object'">【目标】{{ row.name }}</span>
+          <span v-if="!row.keyResultId">【目标】{{ row.objectiveName }}</span>
           <template v-else>
             <span class="line2"></span>
             <span>
@@ -41,8 +41,8 @@
                 v-model="row.currentValue"
                 size="small"
               >
-                <el-radio :label="true">是</el-radio>
-                <el-radio :label="false">否</el-radio>
+                <el-radio :value="true">是</el-radio>
+                <el-radio :value="false">否</el-radio>
               </el-radio-group>
             </div>
           </template>
@@ -53,7 +53,7 @@
           <el-progress :percentage="row.process" />
         </template>
       </el-table-column>
-      <el-table-column prop="users" label="执行人" width="200px" />
+      <el-table-column prop="executorName" label="执行人" width="200px" />
     </el-table>
   </div>
 </template>
@@ -69,7 +69,7 @@ function prepareData(list) {
   helpList.value = []
   okrList.value.map((item) => {
     helpList.value.push(item)
-    item.children.map((child) => {
+    item.children?.map((child) => {
       helpList.value.push(child)
     })
   })
@@ -80,7 +80,7 @@ defineExpose({
 })
 
 function getHeight(row, index) {
-  if (helpList.value.length - 1 == index || helpList.value[index + 1].type == 'object') {
+  if (helpList.value.length - 1 == index || helpList.value[index + 1].type == '目标') {
     return '22px'
   } else {
     return '100%'
diff --git a/src/views/OKR/Management/Components/WaitTarget.vue b/src/views/OKR/Management/Components/WaitTarget.vue
index 74a88c3..1d0c5e0 100644
--- a/src/views/OKR/Management/Components/WaitTarget.vue
+++ b/src/views/OKR/Management/Components/WaitTarget.vue
@@ -167,7 +167,7 @@ import { useUserStore } from '@/store/modules/user'
 import { dateFormatter } from '@/utils/formatTime'
 import DialogWait from './DialogWait.vue'
 
-import { getWaitPage, deleteWait, getWaitCount } from '@/api/okr/wait'
+import { getWaitPage, deleteWait, getWaitCount, urgeWait } from '@/api/okr/wait'
 
 const userStore = useUserStore()
 const currentUserId = userStore.getUser.id
@@ -278,7 +278,9 @@ function handleNotice(row) {
   console.log(row)
 
   message.confirm('即将发送微信通知提醒执行人，是否继续？').then(() => {
-    message.success('发送成功')
+    urgeWait({ workId: row.workId }).then(() => {
+      message.success('发送成功')
+    })
   })
 }
 
diff --git a/src/views/Pers/Employee/Comp/DialogEmployee.vue b/src/views/Pers/Employee/Comp/DialogEmployee.vue
index 164ed08..2c8b5af 100644
--- a/src/views/Pers/Employee/Comp/DialogEmployee.vue
+++ b/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 :label="2"> 女 </el-radio>
+              <el-radio :value="1"> 男 </el-radio>
+              <el-radio :value="2"> 女 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
diff --git a/src/views/Pers/Employee/index.vue b/src/views/Pers/Employee/index.vue
index 7d6ccf2..ed3888c 100644
--- a/src/views/Pers/Employee/index.vue
+++ b/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 :label="1"> 离职 </el-radio>
+          <el-radio :value="0"> 在职 </el-radio>
+          <el-radio :value="1"> 离职 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item>
diff --git a/src/views/Profile/components/BasicInfo.vue b/src/views/Profile/components/BasicInfo.vue
index 35d8b9e..6efa411 100644
--- a/src/views/Profile/components/BasicInfo.vue
+++ b/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 :label="2">{{ t('profile.user.woman') }}</el-radio>
+        <el-radio :value="1">{{ t('profile.user.man') }}</el-radio>
+        <el-radio :value="2">{{ t('profile.user.woman') }}</el-radio>
       </el-radio-group>
     </template>
   </Form>
diff --git a/yarn.lock b/yarn.lock
index b9b443f..4402301 100644
--- a/yarn.lock
+++ b/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==
@@ -3520,7 +3520,7 @@ 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.13:
   version "1.11.13"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
@@ -3837,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:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.3.4.tgz#4319f6b0a1096cfac9c53b69da2fe23ac5aea63e"
-  integrity sha512-SQr0J9z7N4z48WYk/l9NE2tizl8Q7j2OhqlpTc42k4pGncry3+rVX6dsmcsglFynn6vt3NzYxWJqmLFyDKQq+g==
+element-plus@2.9.4:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.9.4.tgz#e4b75055f0f1b1c1f33186321eb3d7a6424051e5"
+  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"

From 79530d221f35c49c8f722c255b4b92189bc71a3e Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 25 Mar 2025 17:14:54 +0800
Subject: [PATCH 3/3] sc

---
 src/views/OKR/Management/Components/DialogOkrInfo.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index bb88448..396a683 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -507,8 +507,9 @@ async function handleSave() {
           for (let month = 0; month < 12; month++) {
             form.value.children.push({
               nodeName: `${month + 1}月`,
-              startTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart('0')}-01`,
+              startTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart(2, '0')}-01`,
               endTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart(
+                2,
                 '0'
               )}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
               children: [