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

# Conflicts:
#	.env.base

.env.base

@@ -5,10 +5,22 @@ VITE_DEV=true
 
 # 请求路径
 VITE_BASE_URL='http://localhost:48080'
-#VITE_BASE_URL='http://114.55.169.15:48080'
+# VITE_BASE_URL='http://47.98.161.246:48080'
+#VITE_BASE_URL='http://114.215.207.150:48080'
+
+# 高德地图key密钥
+# 1寻驾
+VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
+# 2莳松
+# VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
+
+# 小程序接口请求路劲
+VITE_APPLET_URL='https://cloud.ahduima.com'
+# 题库路径
+VITE_TIKU_URL = 'http://47.98.161.246'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 # VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
 
 # 接口前缀

.env.dev

@@ -7,7 +7,7 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/crm-api

.env.front

@@ -4,11 +4,11 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-#VITE_BASE_URL='http://118.31.23.45:48080'
+#VITE_BASE_URL='http://47.98.161.246:48080'
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/crm-api

.env.pro

@@ -5,6 +5,11 @@ VITE_DEV=false
 
 # 请求路径
 VITE_BASE_URL='/crm-api'
+# 高德地图key密钥
+# 1寻驾
+VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
+# 2莳松
+# VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
 
 # 上传路径
 VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload'

.env.stage

@@ -7,7 +7,7 @@ VITE_DEV=false
 VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/crm-api

.env.static

@@ -7,7 +7,7 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/crm-api

.env.test

@@ -7,7 +7,7 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/crm-api

.vscode/extensions.json

@@ -1,15 +0,0 @@
-{
-  "recommendations": [
-    "voorjaar.windicss-intellisense",
-    "vscode-icons-team.vscode-icons",
-    "davidanson.vscode-markdownlint",
-    "stylelint.vscode-stylelint",
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode",
-    "vue.volar",
-    "lokalise.i18n-ally",
-    "mikestead.dotenv",
-    "eamodio.gitlens",
-    "antfu.iconify"
-  ]
-}

.vscode/launch.json

@@ -1,16 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "msedge",
-      "request": "launch",
-      "name": "Launch Edge against localhost",
-      "url": "http://localhost",
-      "webRoot": "${workspaceFolder}/src",
-      "sourceMaps": true
-    }
-  ]
-}

.vscode/settings.json

@@ -1,54 +0,0 @@
-{
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "prettier.enable": true,
-  "editor.formatOnType": true,
-  "editor.formatOnSave": true,
-  "editor.formatOnPaste": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
-  "[vue]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
-  },
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[typescript]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[jsonc]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[html]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[css]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[scss]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "i18n-ally.localesPaths": ["src/locales"],
-  "i18n-ally.keystyle": "nested",
-  "i18n-ally.sortKeys": true,
-  "i18n-ally.namespace": true,
-  "i18n-ally.enabledParsers": ["ts"],
-  "i18n-ally.sourceLanguage": "en",
-  "i18n-ally.displayLanguage": "zh-CN",
-  "i18n-ally.enabledFrameworks": ["vue", "react"],
-  "god.tsconfig": "./tsconfig.json",
-  "vue-i18n.i18nPaths": "src/locales",
-  "explorer.fileNesting.enabled": true,
-  "explorer.fileNesting.expand": false,
-  "explorer.fileNesting.patterns": {
-    "*.ts": "$(capture).test.ts, $(capture).test.tsx",
-    "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
-    "*.env": "$(capture).env.*",
-    "CHANGELOG.md": "CHANGELOG*",
-    "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc,vite.config.*,windi.*,tailwind.*,tsconfig.*,postcss*",
-    ".eslintrc.js": ".eslintignore,.eslintrc-*,.prettierignore,.stylelintignore,.commitlintrc.js,.prettierrc.js,.stylelint*,stylelint*,prettier.*,.editorconfig"
-  }
-}

index.html

@@ -141,7 +141,9 @@
     <script type="module" src="/src/main.js"></script>
     <script type="text/javascript">
       window._AMapSecurityConfig = {
-        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥
+        // securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥
+        securityJsCode: '420463f2f8c849ab78b9d29548aff7d3' // 寻驾密钥
+        // securityJsCode: 'ab6bcce5d153c4e5353b40e5b0ce6fee' // 莳松密钥
       }
     </script>
   </body>

package.json

@@ -39,6 +39,7 @@
     "@vueuse/core": "^10.1.2",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.10",
+    "@wangeditor/plugin-upload-attachment": "^1.1.0",
     "@zxcvbn-ts/core": "^3.0.1",
     "animate.css": "^4.1.1",
     "axios": "^1.4.0",
@@ -51,7 +52,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",
@@ -60,7 +61,6 @@
     "min-dash": "^4.1.1",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
-    "or": "^0.2.0",
     "pinia": "^2.1.3",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
@@ -70,10 +70,11 @@
     "vue": "3.3.4",
     "vue-amap": "^0.5.10",
     "vue-dompurify-html": "^5.0.1",
-    "vue-draggable-plus": "^0.5.3",
+    "vue-draggable-plus": "^0.6.0",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.2.1",
     "vue-types": "^5.0.3",
+    "vue3-tree-org": "^4.2.2",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xe-utils": "^3.5.7",

src/api/clue/payment.js

@@ -5,7 +5,7 @@ export const getPaymentList = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign-pay-record/list', params })
 }
 
-// 查询（精简)列表
+// 查询列表
 export const getPaymentPage = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign-pay-record/page', params })
 }
@@ -45,3 +45,8 @@ export const updateApplyPayment = async (data) => {
     data
   })
 }
+
+// 导出
+export const exportPayment = async (params) => {
+  return await request.download({ url: '/admin-api/crm/sign-pay-record/export-excel', params })
+}

src/api/kpi/index.js

@@ -0,0 +1,42 @@
+import request from '@/config/axios'
+
+// 创建
+export const createKpi = (data) => {
+  return request.post({
+    url: '/admin-api/oa/examine-configuration/create',
+    data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateKpi = (data) => {
+  return request.put({ url: '/admin-api/oa/examine-configuration/update', data })
+}
+
+//  修改状态
+export const updateKpiStatus = (data) => {
+  return request.put({ url: '/admin-api/oa/examine-configuration/status/update', data })
+}
+
+// 分页
+export const getKpiPage = (params) => {
+  return request.get({ url: '/admin-api/oa/examine-configuration/page', params })
+}
+
+// 详情
+export const getKpiDetail = (id) => {
+  return request.get({ url: '/admin-api/oa/examine-configuration/get', params: { id } })
+}
+
+// 删除
+export const deleteKpi = (id) => {
+  return request.delete({ url: '/admin-api/oa/examine-configuration/delete', params: { id } })
+}
+
+//
+export const getKpiEmployees = () => {
+  return request.get({
+    url: '/admin-api/oa/employee/examinedEmployees'
+  })
+}

src/api/kpi/score.js

@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 打分数据
+export const getKpiEmployees = (params) => {
+  return request.get({ url: '/admin-api/oa/examine-score/getExamineUserExamineScore', params })
+}
+
+// 保存考勤打分数据
+export const saveKpiScore = (data) => {
+  return request.put({ url: '/admin-api/oa/examine-score/update', data })
+}
+
+// 删除考核项
+export const deleteKpiItem = (params) => {
+  return request.delete({ url: '/admin-api/oa/examine-score/delete', params })
+}
+
+// 考评分页数据
+export const getScorePage = (params) => {
+  return request.get({ url: '/admin-api/oa/examine-period/page', params })
+}
+
+// 封存
+export const saveScoreRecord = (params) => {
+  return request.get({ url: '/admin-api/oa/examine-period/confirm', params })
+}
+
+// 查询周期是否已封存
+export const getKpiPeriodStatus = (params) => {
+  return request.get({ url: '/admin-api/oa/examine-period/getExaminePeriodByPeriod', params })
+}
+
+// 查询考核记录
+export const getScoreRecord = (data) => {
+  return request.post({ url: '/admin-api/oa/examine-result/periodPage', data })
+}
+
+// 查详情
+export const getScoreDetail = (params) => {
+  return request.get({ url: '/admin-api/oa/examine-result/detail', params })
+}

src/api/okr/comment.js

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

src/api/okr/meeting.js

@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export const createMeeting = (data) => {
+  return request.post({
+    url: '/admin-api/okr/meeting/add',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 修改
+export const updateMeeting = (data) => {
+  return request.put({
+    url: '/admin-api/okr/meeting/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+// 查询详情
+export const getMeetingDetail = (params) => {
+  return request.get({
+    url: '/admin-api/okr/meeting/get',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 取消会议
+export const cancelMeeting = (data) => {
+  return request.put({
+    url: '/admin-api/okr/meeting/cancel',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 分页查询
+export const getMeetingPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/meeting/page',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 刷新微信群列表
+export const refreshWxGroupList = () => {
+  return request.get({
+    url: '/admin-api/system/wx/reFreshWeChatGroupList'
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取微信群聊列表
+export const getWxGroupList = () => {
+  return request.get({
+    url: '/admin-api/system/wx/getWeChatGroupList'
+    // headers: { 'instance-id': 1016 }
+  })
+}

src/api/okr/okr.js

@@ -0,0 +1,154 @@
+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 = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/get',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 我负责的 - 节点树
+export const getMyNodeTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/my/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 我负责的 - okr列表
+export const getMyOkrPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/my/object/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 全部目标 - 节点树
+export const getAllNodeTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/all/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 全部目标 - okr列表
+export const getAllOkrPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/all/object/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取节点操作历史
+export const getOkrNodeHistory = (nodeId) => {
+  return request.get({
+    url: '/admin-api/okr/record/list',
+    params: { nodeId }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取系统默认的关键成果内容
+export const getDefaultOkrOptions = () => {
+  return request.get({
+    url: '/admin-api/okr/dict-data/get-by-type',
+    params: { dictType: 'key_result_source' }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 更新OKR进度
+export const updateOkrProgress = (data) => {
+  return request.put({
+    url: '/admin-api/okr/node/progress/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取目标关系树一级节点
+export const getOkrRelationTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/first-node',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取目标关系树下级节点数据
+export const getOkrRelationTreeChildren = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/node-tree',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取我的组员
+export const getMyMemberList = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/my-members',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取我的组员节点树
+export const getMySonNodeTree = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/member/node/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取我的组员OKR列表
+export const getMySonOkrPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/member/objective/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取渠道
+export const getChannelOptions = () => {
+  return request.get({
+    url: '/admin-api/okr/node/source'
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取统计表中的合计信息
+export const getOkrStatisticsTotal = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/data/count',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}

src/api/okr/wait.js

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

src/api/pers/attendancePlan.js

@@ -0,0 +1,36 @@
+import request from '@/config/axios'
+
+// 创建
+export const createPlan = (data) => {
+  return request.post({ url: '/admin-api/oa/attendance-setting/create', data, isSubmitForm: true })
+}
+
+// 修改
+export const updatePlan = (data) => {
+  return request.put({ url: '/admin-api/oa/attendance-setting/update', data })
+}
+
+//  修改状态
+export const updatePlanStatus = (data) => {
+  return request.put({ url: '/admin-api/oa/attendance-setting/status/update', data })
+}
+
+// 分页
+export const getPlanPage = (params) => {
+  return request.get({ url: '/admin-api/oa/attendance-setting/page', params })
+}
+
+// 列表
+export const getPlanSimpleList = (params) => {
+  return request.get({ url: '/admin-api/oa/attendance-setting/simple-list', params })
+}
+
+// 详情
+export const getPlanDetail = (id) => {
+  return request.get({ url: '/admin-api/oa/attendance-setting/get', params: { id } })
+}
+
+// 删除
+export const deletePlan = (id) => {
+  return request.delete({ url: '/admin-api/oa/attendance-setting/delete', params: { id } })
+}

src/api/pers/employee.js

@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 创建
+export const createEmployee = (data) => {
+  return request.post({ url: '/admin-api/oa/employee/create', data, isSubmitForm: true })
+}
+
+// 分页
+export const getEmployeeSimpleList = (params) => {
+  return request.get({ url: '/admin-api/oa/employee/list-all-simple', params })
+}
+
+// 修改
+export const updateEmployee = (data) => {
+  return request.put({ url: '/admin-api/oa/employee/update', data })
+}
+
+//  修改状态
+export const updateEmployeeStatus = (data) => {
+  return request.put({ url: '/admin-api/oa/employee/status/update', data })
+}
+
+// 分页
+export const getEmployeePage = (params) => {
+  return request.get({ url: '/admin-api/oa/employee/page', params })
+}
+
+// 详情
+export const getEmployeeDetail = (id) => {
+  return request.get({ url: '/admin-api/oa/employee/get', params: { id } })
+}
+
+// 删除
+export const deleteEmployee = (id) => {
+  return request.delete({ url: '/admin-api/oa/employee/delete', params: { id } })
+}
+
+// 获取钉钉id
+export const getDingUserId = (params) => {
+  return request.get({ url: '/admin-api/oa/employee/getDingTalkUserIdByMobile', params })
+}

src/api/system/user/index.ts

@@ -12,9 +12,11 @@ export interface UserVO {
   avatar: string
   loginIp: string
   status: number
+  hireStatus: number
   remark: string
   loginDate: Date
   createTime: Date
+  retireDate: string
 }
 
 // 查询用户管理列表
@@ -62,10 +64,17 @@ export const resetUserPwd = (id: number, password: string) => {
 }
 
 // 用户状态修改
-export const updateUserStatus = (id: number, status: number) => {
+export const updateUserStatus = (
+  id: number,
+  status: number,
+  retireDate: string,
+  hireStatus: number
+) => {
   const data = {
     id,
-    status
+    status,
+    retireDate,
+    hireStatus
   }
   return request.put({ url: '/admin-api/system/user/update-status', data: data })
 }
@@ -84,3 +93,8 @@ export const getAllUserList = (): Promise<UserVO[]> => {
 export const getAllUserListWithHire = (): Promise<UserVO[]> => {
   return request.get({ url: '/admin-api/system/user/no/permission/list-all' })
 }
+
+// 获取钉钉id
+export const getDDIdByPhone = (params) => {
+  return request.get({ url: '/admin-api/system/user/getDingTalkUserIdByMobile', params })
+}

src/api/system/wechat/index.js

@@ -0,0 +1,23 @@
+import request from '@/config/axios'
+
+// 更新
+export const updateWechatConfig = (data) => {
+  return request.post({ url: '/admin-api/system/wx-robot-message-setting/save', data })
+}
+
+// 更新发送时间
+export const updateWechatSendTime = (data) => {
+  return request.put({ url: '/admin-api/system/wx-robot-message-setting/update-send-time', data })
+}
+// 更新微信群
+export const updateWechatGroup = (data) => {
+  return request.put({ url: '/admin-api/system/wx-robot-message-setting/update-wx-group', data })
+}
+
+// 获得列表
+export const getWechatConfigList = (params) => {
+  return request.get({
+    url: '/admin-api/system/wx-robot-message-setting/list',
+    params
+  })
+}

src/api/xjapplet/discount.js

@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+export const getVipDiscountList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/discount/list',
+    params: params
+  })
+}
+
+export const addVipDiscount = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/discount/add',
+    data
+  })
+}
+
+export const updateVipDiscount = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/discount/update',
+    data
+  })
+}
+
+export const deleteVipDiscount = async (id) => {
+  return await request.delete({
+    url: '/admin-api/applet/xunjia/member/discount/delete?discountId=' + id
+  })
+}
+
+export const getVipDiscountOptions = async () => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/discount/simple-list'
+  })
+}
+
+export const getUserDiscountList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/user/discount/list',
+    params: params
+  })
+}
+
+export const giveUserDiscount = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/user/discount/send',
+    data
+  })
+}

src/api/xjapplet/resell.js

@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+export const getResellList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/distribution/list',
+    params: params
+  })
+}
+
+export const addResell = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/distribution/add',
+    data
+  })
+}
+
+export const updateResell = async (data) => {
+  return await request.put({
+    url: '/admin-api/applet/xunjia/distribution/update',
+    data
+  })
+}
+export const deleteResell = async (id) => {
+  return await request.delete({
+    url: '/admin-api/applet/xunjia/distribution/delete?distributionId=' + id
+  })
+}
+export const getResellDetail = async (id) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/distribution/' + id
+  })
+}
+
+export const getResellSimpleList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/distribution/simple-list',
+    params: params
+  })
+}

src/api/xjapplet/vip.js

@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export const getUserMemberList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/user/member/list',
+    params: params
+  })
+}
+
+export const giveUserMember = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/user/member/add',
+    data
+  })
+}
+
+export const getVipTypeList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/list',
+    params: params
+  })
+}
+
+export const addVipType = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/add',
+    data
+  })
+}
+
+export const updateVipType = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/member/update',
+    data
+  })
+}
+
+export const deleteVipType = async (id) => {
+  return await request.delete({
+    url: '/admin-api/applet/xunjia/member/delete?memberId=' + id
+  })
+}
+
+export const getVipTypeOptions = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/member/simple-list',
+    params: params
+  })
+}
+
+export const getRechargeRecords = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/pay/list',
+    params: params
+  })
+}

src/api/xjapplet/vipdatabase.js

@@ -0,0 +1,67 @@
+import request from '@/config/axios'
+
+export const addJx = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/question/jx/add',
+    data: data
+  })
+}
+
+export const getJxQuestionList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/question/jx/list',
+    params: params
+  })
+}
+
+export const delJxData = async (id) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/question/jx/delete?id=${id}`
+  })
+}
+
+export const addMj = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/secret/add',
+    data: data
+  })
+}
+
+export const getMjList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/secret/list',
+    params: params
+  })
+}
+
+export const delMj = async (secretId) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/secret/delete?secretId=${secretId}`
+  })
+}
+
+export const clearMj = async (secretId) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/secret/clear?secretId=${secretId}`
+  })
+}
+
+export const getMjQuestionList = async (params) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/secret/question/list',
+    params: params
+  })
+}
+
+export const addMjQuestion = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/secret/question/add',
+    data: data
+  })
+}
+
+export const delMjQuestion = async (id) => {
+  return await request.delete({
+    url: `/admin-api/applet/xunjia/secret/question/delete?id=${id}`
+  })
+}

src/api/xjapplet/xjdatabase.js

@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+export const searchQuestion = async (param) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/question/list',
+    params: param
+  })
+}
+
+export const updateQuestion = async (data) => {
+  return await request.put({
+    url: '/admin-api/applet/xunjia/question/update',
+    data: data
+  })
+}
+
+export const addQuestion = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/question/add',
+    data: data
+  })
+}
+
+export const deleteQuestion = async (id) => {
+  return await request.delete({
+    url: '/admin-api/applet/xunjia/question/delete?id=' + id
+  })
+}
+
+export const uploadFile = async (data) => {
+  return await request.post({
+    url: '/admin-api/applet/xunjia/question/upload',
+    data: data
+  })
+}
+
+export const getQuestionSort = async (param) => {
+  return await request.get({
+    url: '/admin-api/applet/xunjia/question/sort/list',
+    params: param
+  })
+}
+
+export const getMjList = async (params) => {
+  return await request.get({
+    url: 'http://localhost/tiku-api/tiku/xunjia/secret/list',
+    params: params
+  })
+}

src/components/DictTag/src/DictTag.vue

@@ -8,7 +8,7 @@ export default defineComponent({
   name: 'DictTag',
   props: {
     type: {
-      type: String as PropType<string>,
+      type: String,
       required: true
     },
     value: {
@@ -42,7 +42,7 @@ export default defineComponent({
       return (
         <ElTag
           style={dictData.value?.cssClass ? 'color: #fff' : ''}
-          type={dictData.value?.colorType}
+          type={dictData.value?.colorType || 'primary'}
           color={
             dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
               ? dictData.value?.cssClass

src/components/Editor/src/Editor.vue

@@ -21,10 +21,34 @@ const props = defineProps({
   height: propTypes.oneOfType([Number, String]).def('40vh'),
   editorConfig: {
     type: Object as PropType<Partial<IEditorConfig>>,
-    default: () => undefined
+    default: () => ({})
   },
   readonly: propTypes.bool.def(false),
-  modelValue: propTypes.string.def('')
+  modelValue: propTypes.string.def(''),
+  toolbarConfig: {
+    type: Object,
+    default: () => ({
+      excludeKeys: [
+        'insertVideo', // 网络视频
+        'insertImage', // 网络图片
+        'insertLink', // 链接
+        'codeBlock', // 代码块
+        'headerSelect', // 标题
+        'blockquote', // 引用
+        'fontFamily', // 字体
+        'todo', // 代办
+        'group-indent', // 缩进
+        'emotion', // 表情
+        'undo', // 撤销
+        'redo', // 重做
+        'fullScreen'
+      ],
+      insertKeys: {
+        index: 20, // 自定义插入的位置
+        keys: ['uploadAttachment'] // “上传附件”菜单
+      }
+    })
+  }
 })
 
 const emit = defineEmits(['change', 'update:modelValue'])
@@ -84,6 +108,12 @@ const editorConfig = computed((): IEditorConfig => {
       },
       autoFocus: false,
       scroll: true,
+      // 在编辑器中，点击选中“附件”节点时，要弹出的菜单
+      hoverbarKeys: {
+        attachment: {
+          menuKeys: ['downloadAttachment'] // “下载附件”菜单
+        }
+      },
       MENU_CONF: {
         ['uploadImage']: {
           server: import.meta.env.VITE_UPLOAD_URL,
@@ -198,6 +228,52 @@ const editorConfig = computed((): IEditorConfig => {
           customInsert(res: any, insertFn: InsertFnType) {
             insertFn(res.data, 'video', res.data)
           }
+        },
+        uploadAttachment: {
+          server: import.meta.env.VITE_UPLOAD_URL,
+          timeout: 20 * 1000, // 2s
+
+          fieldName: 'file',
+          // meta: { token: 'xxx', a: 100 }, // 请求时附加的数据
+          // metaWithUrl: true, // meta 拼接到 url 上
+          // headers: { Accept: 'text/x-json' },
+          // 自定义增加 http  header
+          headers: {
+            Accept: '*',
+            Authorization: 'Bearer ' + getAccessToken(),
+            'tenant-id': getTenantId(),
+            'instance-id': getAppId()
+          },
+
+          maxFileSize: 20 * 1024 * 1024, // 20M
+
+          onBeforeUpload(file: File) {
+            console.log('onBeforeUpload', file)
+            return file // 上传 file 文件
+            // return false // 会阻止上传
+          },
+          onProgress(progress: number) {
+            console.log('onProgress', progress)
+          },
+          onSuccess(file: File, res: any) {
+            console.log('onSuccess', file, res)
+          },
+          onFailed(file: File, res: any) {
+            alert(res.message)
+            console.log('onFailed', file, res)
+          },
+          onError(file: File, err: Error, res: any) {
+            alert(err.message)
+            console.error('onError', file, err, res)
+          },
+          // 上传成功后，用户自定义插入文件
+          customInsert(res: any, file: File, insertFn: Function) {
+            console.log('customInsert', res)
+
+            // 插入附件到编辑器
+            insertFn(file.name, res.data)
+            // insertFn(res.data, `customInsert-${file.name}`, res.data)
+          }
         }
       },
       uploadImgShowBase64: true
@@ -212,24 +288,6 @@ const editorStyle = computed(() => {
   }
 })
 
-const toolbarConfig = ref({
-  excludeKeys: [
-    'insertVideo', // 网络视频
-    'insertImage', // 网络图片
-    'insertLink', // 链接
-    'codeBlock', // 代码块
-    'headerSelect', // 标题
-    'blockquote', // 引用
-    'fontFamily', // 字体
-    'todo', // 代办
-    'group-indent', // 缩进
-    'emotion', // 表情
-    'undo', // 撤销
-    'redo', // 重做
-    'fullScreen'
-  ]
-})
-
 // 回调函数
 const handleChange = (editor: IDomEditor) => {
   emit('change', editor)

src/components/Form/src/components/useRenderRadio.tsx

@@ -13,7 +13,7 @@ export const useRenderRadio = () => {
     return item?.options?.map((option) => {
       const { ...other } = option
       return (
-        <Com {...other} label={option[valueAlias || 'value']}>
+        <Com {...other} label={option[valueAlias || 'value']} value={option[valueAlias || 'value']}>
           {option[labelAlias || 'label']}
         </Com>
       )

src/components/Pagination/index.vue

@@ -6,7 +6,7 @@
     v-model:page-size="pageSize"
     :small="small"
     :background="true"
-    :page-sizes="[10, 20, 30, 50, 100]"
+    :page-sizes="[10, 50, 100, 500, 1000]"
     :pager-count="pagerCount"
     :total="total"
     class="float-right mt-15px mb-15px"

src/components/SSTable/index.vue

@@ -35,7 +35,7 @@
             @end="onDragEnd"
           >
             <template #item="{ element: item }">
-              <el-checkbox :key="item.id" :label="item.id">
+              <el-checkbox :key="item.id" :label="item.id" :value="item.id">
                 {{ item.label }}
               </el-checkbox>
             </template>

src/components/Search/src/Search.vue

@@ -183,7 +183,7 @@ initSearch()
           virtual-triggering
         >
           <el-checkbox-group v-model="checkedSchema" @change="changeSearch">
-            <el-checkbox v-for="item in schema" :key="item.id" :label="item.id">
+            <el-checkbox v-for="item in schema" :key="item.id" :label="item.id" :value="item.id">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>

src/config/axios/service.ts

@@ -132,6 +132,9 @@ service.interceptors.response.use(
       throw new Error()
     }
     const { t } = useI18n()
+    // if (data.code === undefined) {
+    //   return response
+    // }
     // 未设置状态码则默认成功状态
     const code = data.code || result_code
     // 二进制数据则直接返回

src/hooks/web/useCrudSchemas.ts

@@ -266,7 +266,6 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
 // 过滤 descriptions 结构
 const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[] => {
   const descriptionsSchema: FormSchema[] = []
-
   eachTree(crudSchema, (schemaItem: CrudSchema) => {
     // 判断是否显示
     if (schemaItem?.isDetail !== false && schemaItem.detail?.show !== false) {
@@ -275,6 +274,10 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
         field: schemaItem.field,
         label: schemaItem.detail?.label || schemaItem.label
       }
+      if (schemaItem.form?.component == 'Editor') {
+        descriptionsSchemaItem.span = 2
+        descriptionsSchemaItem.isEditor = true
+      }
       if (schemaItem.dictType) {
         descriptionsSchemaItem.dictType = schemaItem.dictType
       }

src/main.js

@@ -42,8 +42,13 @@ import '@/plugins/tongji' // 百度统计
 import Logger from '@/utils/Logger'
 import VueDOMPurifyHTML from 'vue-dompurify-html'
 
+import { Boot } from '@wangeditor/editor'
+import attachmentModule from '@wangeditor/plugin-upload-attachment'
+
 // 创建实例
 const setupAll = async () => {
+  // 注册。要在创建编辑器之前注册，且只能注册一次，不可重复注册。
+  Boot.registerModule(attachmentModule)
   const app = createApp(App)
 
   await setupI18n(app)

src/permission.js

@@ -1,14 +1,14 @@
 import router from './router'
 import { isRelogin } from '@/config/axios/service'
-import { getAccessToken, removeToken } from '@/utils/auth'
+import { getAccessToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
-import { getTenantId, getAppId } from '@/utils/auth'
-import cache from '@/plugins/cache'
+import { useAppStoreWithOut } from '@/store/modules/app'
+import { getTenantId, getAppId, setTenantId, setAppId } from '@/utils/auth'
 
 const { start, done } = useNProgress()
 
@@ -29,23 +29,22 @@ const whiteList = [
 router.beforeEach(async (to, from, next) => {
   start()
   loadStart()
-  if (getAppId() && to.query?.appId && getAppId() != to.query?.appId) {
-    removeToken()
-    cache?.local?.delete('appInfo')
-    cache?.local?.delete('roleRouters')
-    cache?.local?.delete('user')
-    cache?.local?.delete('App_ID')
-    next(`/login?tenantId=${to.query?.tenantId}&appId=${to.query?.appId}`)
-  } else {
+  const userStore = useUserStoreWithOut()
+  if (to.path == '/login') {
+    userStore.resetState() // 重置用户信息状态
+  }
   if (getAccessToken()) {
     if (to.path === '/login') {
+      if (to.query?.tenantId && to.query?.appId) {
+        setApp(to.query.tenantId, to.query.appId)
+        await waitTime(1500)
+      }
       next({ path: '/' })
     } else {
       // 获取所有字典
       const dictStore = useDictStoreWithOut()
-        const userStore = useUserStoreWithOut()
       const permissionStore = usePermissionStoreWithOut()
-        if (!dictStore.getIsSetDict && to.path != '/nm-detail') {
+      if (!dictStore.getIsSetDict) {
         await dictStore.setDictMap()
       }
       if (!userStore.getIsSetUser) {
@@ -72,15 +71,31 @@ router.beforeEach(async (to, from, next) => {
       const tenantId = getTenantId()
       const appId = getAppId()
       if (tenantId && appId) {
-          next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
       } else {
-          next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        }
+        // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        window.location.href = 'https://cloud.ahduima.com/ss/login'
       }
     }
   }
 })
 
+async function waitTime(seconds) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve()
+    }, seconds)
+  })
+}
+
+function setApp(tenantId, appId) {
+  setTenantId(tenantId)
+
+  setAppId(appId)
+  const appStore = useAppStoreWithOut()
+  appStore.setAppInfo(appId)
+}
+
 router.afterEach((to) => {
   useTitle(to?.meta?.title)
   done() // 结束Progress

src/router/modules/remaining.ts

@@ -51,7 +51,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     }
   },
   {
-    path: '',
+    path: '/',
     component: Layout,
     redirect: '/Home/index',
     name: '',
@@ -59,6 +59,20 @@ const remainingRouter: AppRouteRecordRaw[] = [
       title: '首页',
       hidden: true
     }
+    // ,children: [
+    //   {
+    //     path: '/index',
+    //     component: () => import('@/views/Basic/Menu/index.vue'),
+    //     name: 'Home',
+    //     meta: {
+    //       title: '首页',
+    //       icon: 'ep:home-filled',
+    //       noTagsView: true,
+    //       affix: true
+    //       // hidden: true
+    //     }
+    //   }
+    // ]
   },
   {
     path: '/swagger',
@@ -133,8 +147,8 @@ const remainingRouter: AppRouteRecordRaw[] = [
   //   path: '/Basic',
   //   component: Layout,
   //   name: 'Basic',
-  //   meta: { title: '菜单管理' },
   //   redirect: '/Basic/menu',
+  //   meta: { title: '菜单管理' },
   //   children: [
   //     {
   //       path: 'menu',

src/router/modules/static.ts

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

src/store/modules/dict.ts

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

src/store/modules/permission.ts

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

src/store/modules/user.ts

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

src/styles/index.scss

@@ -82,3 +82,38 @@
 .el-table--default .cell {
   padding: 0 5px;
 }
+
+.flex-radio{
+  display: flex;
+  width: 100%;
+  align-items: center;
+  line-height: 40px;
+  height: 40px;
+  .el-radio__label {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    font-size: 16px;
+  }
+}
+
+/* 去除 Chrome、Safari、Edge、Opera 中的指示器 */
+.el-input__inner::-webkit-outer-spin-button,
+.el-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* 去除 Firefox 中的指示器 */
+.el-input__inner[type='number'] {
+  -moz-appearance: textfield;
+}
+.el-drawer__header {
+  padding: 16px 16px 8px 16px !important;
+  margin: 0 !important;
+  line-height: 24px !important;
+  font-size: 18px !important;
+  color: #303133 !important;
+  box-sizing: border-box !important;
+  // border-bottom: 1px solid #e8e8e8 !important;
+}

src/utils/auth.ts

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

src/utils/constants.ts

@@ -74,13 +74,13 @@ export const SystemUserSocialTypeEnum = {
     type: 20,
     source: 'dingtalk',
     img: 'https://s1.ax1x.com/2022/05/22/OzMDRs.png'
-  },
-  WECHAT_ENTERPRISE: {
-    title: '企业微信',
-    type: 30,
-    source: 'wechat_enterprise',
-    img: 'https://s1.ax1x.com/2022/05/22/OzMrzn.png'
   }
+  // WECHAT_ENTERPRISE: {
+  //   title: '企业微信',
+  //   type: 30,
+  //   source: 'wechat_enterprise',
+  //   img: 'https://s1.ax1x.com/2022/05/22/OzMrzn.png'
+  // }
 }
 
 /**

src/utils/index.ts

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

src/views/Basic/Dept/DeptForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
+  <Dialog v-if="dialogVisible" v-model="dialogVisible" :title="dialogTitle" width="800px">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -30,7 +30,12 @@
       <el-row :gutter="20">
         <el-col :span="12" :offset="0">
           <el-form-item label="负责人" prop="leaderUserId">
-            <el-select v-model="formData.leaderUserId" clearable placeholder="请输入负责人">
+            <el-select
+              v-model="formData.leaderUserId"
+              clearable
+              multiple
+              placeholder="请输入负责人"
+            >
               <el-option
                 v-for="item in userList"
                 :key="item.id"
@@ -59,7 +64,7 @@
       <el-row :gutter="20">
         <el-col :span="24" :offset="0">
           <el-form-item label="备注" prop="remark">
-            <Editor v-model:modelValue="formData.remark" />
+            <Editor v-model="formData.remark" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/Basic/Dept/index.vue

@@ -21,7 +21,7 @@
   <!-- 列表 -->
   <el-table v-loading="loading" :data="list" row-key="id" default-expand-all border>
     <el-table-column prop="name" label="部门名称" />
-    <el-table-column prop="leader" label="负责人" width="120" />
+    <el-table-column prop="leaderUserName" label="负责人" width="120" />
     <el-table-column prop="sort" label="排序" width="200" />
     <el-table-column prop="status" label="状态" width="100">
       <template #default="{ row }">

src/views/Basic/GeneralSet/index.vue

@@ -7,6 +7,9 @@
       <!-- <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
         <BSSalerComission v-if="tabIndex == 10" />
       </el-tab-pane> -->
+      <!-- <el-tab-pane label="微信机器人" :name="20">
+        <BSSalerComission v-if="tabIndex == 20" />
+      </el-tab-pane> -->
     </el-tabs>
   </div>
 </template>

src/views/Basic/Menu/index.vue

@@ -84,7 +84,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <MenuForm ref="formRef" :appList="appList" @success="getList" />
 </template>
-<script lang="ts" name="SystemMenu" setup>
+<script lang="ts" name="Menu" setup>
 import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'

src/views/Basic/User/UserForm.vue

@@ -5,7 +5,7 @@
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="80px"
+      label-width="100px"
     >
       <el-row :gutter="20">
         <el-col :span="12">
@@ -85,6 +85,11 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="微信号" prop="wxAlias">
+            <el-input v-model="formData.wxAlias" placeholder="请输入微信号" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12" :offset="0">
           <el-form-item label="入职日期" prop="hireDate">
             <el-date-picker
@@ -97,6 +102,23 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="钉钉手机号">
+            <el-input
+              v-model="formData.ddPhone"
+              placeholder="请输入钉钉手机号"
+              clearable
+              @blur="getDDId"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="钉钉Id" prop="dingUserId">
+            <el-input v-model="formData.dingUserId" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注">
@@ -127,7 +149,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
+const formData = ref<any>({
   nickname: '',
   deptId: '',
   mobile: '',
@@ -140,7 +162,8 @@ const formData = ref({
   status: CommonStatusEnum.ENABLE,
   roleIds: [],
   hireDate: '',
-  isNewUserConfirm: false
+  isNewUserConfirm: false,
+  wxAlias: ''
 })
 const formRules = ref<any>({
   username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
@@ -228,8 +251,21 @@ const resetForm = () => {
     status: CommonStatusEnum.ENABLE,
     roleIds: [],
     hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
-    isNewUserConfirm: false
+    isNewUserConfirm: false,
+    wxAlias: ''
   }
   formRef.value?.resetFields()
 }
+
+async function getDDId() {
+  try {
+    if (!formData.value.ddPhone) {
+      formData.value.dingUserId = undefined
+      return
+    }
+    const data = await UserApi.getDDIdByPhone({ mobile: formData.value.ddPhone })
+    formData.value.dingUserId = data
+  } finally {
+  }
+}
 </script>

src/views/Basic/User/index.vue

@@ -27,8 +27,8 @@
         </el-form-item>
         <el-form-item>
           <el-radio-group v-model="queryParams.status" @change="handleQuery">
-            <el-radio :label="0"> 在职 </el-radio>
-            <el-radio :label="1"> 离职 </el-radio>
+            <el-radio :label="0"> 启用 </el-radio>
+            <el-radio :label="1"> 禁用 </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item>
@@ -45,31 +45,45 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" :data="list">
-        <el-table-column label="用户编号" key="id" prop="id" />
+        <el-table-column label="用户编号" key="id" prop="id" width="100" />
         <el-table-column label="登录账号" prop="username" />
         <el-table-column label="用户姓名" prop="nickname" />
-        <el-table-column label="部门" key="deptName" prop="deptName" />
+        <el-table-column label="部门" key="deptName" prop="deptName" width="100" />
         <el-table-column label="手机号码" prop="mobile" width="120" />
-        <el-table-column label="状态" key="status" width="180">
+        <el-table-column label="微信号" prop="wxAlias" min-width="80" />
+        <el-table-column label="钉钉号" prop="dingUserId" min-width="80" />
+        <el-table-column label="在职状态" key="hireStatus" width="120">
           <template #default="scope">
             <el-switch
-              v-model="scope.row.status"
+              v-model="scope.row.hireStatus"
               :active-value="0"
               :inactive-value="1"
               active-text="在职"
               inactive-text="离职"
+              size="small"
               v-hasPermi="['basic:employee:update']"
               @change="handleStatusChange(scope.row)"
             />
           </template>
         </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="createTime"
-          width="180"
-          :formatter="dateFormatter"
+        <el-table-column label="启用状态" key="status" width="120">
+          <template #default="scope">
+            <el-switch
+              v-model="scope.row.status"
+              :active-value="0"
+              :inactive-value="1"
+              active-text="启用"
+              inactive-text="禁用"
+              size="small"
+              :disabled="scope.row.hireStatus == 1"
+              v-hasPermi="['basic:employee:update']"
+              @change="handleUseChange(scope.row)"
             />
-        <el-table-column label="操作" width="200">
+          </template>
+        </el-table-column>
+        <el-table-column label="入职日期" prop="hireDate" width="120" :formatter="dateFormatter" />
+        <el-table-column label="离职日期" prop="" width="120" :formatter="dateFormatter" />
+        <el-table-column label="操作" width="180" fixed="right">
           <template #default="scope">
             <el-button
               type="primary"
@@ -178,14 +192,49 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-/** 修改用户状态 */
+/** 修改在职状态 */
 const handleStatusChange = async (row: UserApi.UserVO) => {
   try {
     // 修改状态的二次确认
-    const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
-    await message.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
+    const text = row.hireStatus === CommonStatusEnum.ENABLE ? '入职' : '离职'
+    let result = { value: '' }
+    if (text == '入职') {
+      await message.confirm('确认要"' + text + '""' + row.nickname + '"吗?')
+    } else {
+      result = await message.prompt(
+        '请输入年月日，如2024-01-01',
+        '确认要"' + text + '""' + row.nickname + '"用户吗?'
+      )
+      const regex = /^\d{4}-\d{2}-\d{2}$/
+
+      if (!regex.test(result.value)) {
+        message.error('请输入离职日期')
+        throw new Error()
+      }
+    }
     // 发起修改状态
-    await UserApi.updateUserStatus(row.id, row.status)
+    await UserApi.updateUserStatus(row.id, row.status, result.value, row.hireStatus)
+    message.success('修改成功')
+    // 刷新列表
+    await getList()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.hireStatus =
+      row.hireStatus === CommonStatusEnum.ENABLE
+        ? CommonStatusEnum.DISABLE
+        : CommonStatusEnum.ENABLE
+  }
+}
+
+// 修改启用状态
+const handleUseChange = async (row: UserApi.UserVO) => {
+  try {
+    // 修改状态的二次确认
+    const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '禁用'
+    await message.confirm('确认要"' + text + '""' + row.nickname + '"吗?')
+    // 发起修改状态
+    await UserApi.updateUserStatus(row.id, row.status, row.retireDate, row.hireStatus)
+    message.success('修改成功')
     // 刷新列表
     await getList()
   } catch {

src/views/Basic/WxRobot/Record.vue

@@ -0,0 +1,7 @@
+<template>
+  <div> record </div>
+</template>
+
+<script setup name="WXRecord"></script>
+
+<style lang="scss" scoped></style>

src/views/Basic/WxRobot/Setting.vue

@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="tableList" border stripe>
+      <el-table-column v-for="col in columns" :prop="col.prop" :key="col.prop" :label="col.label" />
+      <el-table-column label="发送方式" min-width="150">
+        <template #default="{ row }">
+          <el-checkbox-group v-model="row.sendType" size="small" @change="rowChange(row)">
+            <el-checkbox label="微信"> 微信 </el-checkbox>
+            <el-checkbox label="微信群"> 微信群 </el-checkbox>
+          </el-checkbox-group>
+        </template>
+      </el-table-column>
+      <el-table-column label="群二维码" width="100">
+        <template #default="{ row }">
+          <el-upload
+            ref="rewardFile"
+            action="#"
+            :limit="1"
+            accept=".jpg,.jpeg,.png"
+            :disabled="loading"
+            :show-file-list="false"
+            :before-upload="fileBeforeUpload"
+            :http-request="(data) => rewardUpload(data, row.id)"
+          >
+            <el-button type="primary" size="small">
+              <Icon icon="ep:upload" class="mr-5px" size="small" /> 点击上传
+            </el-button>
+          </el-upload>
+          <!-- <UploadImg v-model="row.wxQrCode" /> -->
+
+          <!-- <img :src="row.wxCode" width="80px" height="80px" alt="" /> -->
+        </template>
+      </el-table-column>
+      <el-table-column label="微信群名称" prop="wxGroup" min-width="150" />
+      <el-table-column label="操作" width="100">
+        <template #default="{ row }">
+          <!-- <div>
+            <el-button
+              v-if="row.sendType.includes('微信群')"
+              type="primary"
+              style="padding: 5px 0"
+              text
+              @click="row.edit = true"
+            >
+              修改群名称
+            </el-button>
+          </div> -->
+          <div v-if="['每日', '每月'].includes(row.sendFrequency)">
+            <el-button type="primary" style="padding: 5px 0" text @click="changeSendTime(row)">
+              修改发送时间
+            </el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <Dialog
+      :title="`修改【${sendTimeInfo.messageName}】发送时间`"
+      v-model="showSendTime"
+      width="500px"
+    >
+      <el-text type="danger">
+        <span v-if="sendTimeInfo.sendFrequency == '每日'">
+          请按照时间格式输入，多个时间以“、”分割，如09:00、15:00、18:00
+        </span>
+        <span v-else-if="sendTimeInfo.sendFrequency == '每月'">
+          请按照"日期-时间"格式输入，多个日期以“、”分割，如26-18:00、28-14:00、30-15:00、30-18:00
+        </span>
+      </el-text>
+      <el-input
+        type="textarea"
+        class="mt-20px mb-20px"
+        :autosize="{ minRows: 3 }"
+        v-model="sendTimeInfo.sendTime"
+        placeholder="请输入"
+        clearable
+      />
+      <template #footer>
+        <el-button :disabled="formLoading" type="primary" @click="submitSendTime">确 定</el-button>
+        <el-button @click="showSendTime = false">取 消</el-button>
+      </template>
+    </Dialog>
+  </div>
+</template>
+
+<script setup name="WXSetting">
+import * as WechatApi from '@/api/system/wechat'
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(false)
+const tableList = ref([])
+const columns = [
+  {
+    label: '消息名称',
+    prop: 'messageName'
+  },
+  {
+    label: '解释说明',
+    prop: 'description'
+  },
+  {
+    label: '发送频率',
+    prop: 'sendFrequency'
+  },
+  {
+    label: '发送时间',
+    prop: 'sendTime'
+  }
+]
+
+onMounted(() => {
+  getTableList()
+})
+
+async function getTableList() {
+  try {
+    loading.value = true
+    const list = await WechatApi.getWechatConfigList()
+    tableList.value = list.map((it) => ({ ...it, sendType: it.sendType || [] }))
+  } finally {
+    loading.value = false
+  }
+}
+
+let timer = ref(null)
+const lastId = ref('')
+function rowChange(row) {
+  try {
+    lastId.value == row.id && clearTimeout(timer.value)
+    timer.value = setTimeout(async () => {
+      lastId.value = row.id
+      await WechatApi.updateWechatGroup({
+        id: row.id,
+        sendType: row.sendType,
+        wxGroup: row.wxGroup
+      })
+      // message.success('修改成功')
+    }, 1500)
+  } finally {
+  }
+}
+
+const showSendTime = ref(false)
+const sendTimeInfo = ref({})
+function changeSendTime(row) {
+  showSendTime.value = true
+  sendTimeInfo.value = { ...row }
+}
+
+const formLoading = ref(false)
+
+async function submitSendTime() {
+  // 校验时间是否有效
+  const arr = sendTimeInfo.value.sendTime ? sendTimeInfo.value.sendTime.split('、') : []
+
+  if (sendTimeInfo.value.sendFrequency == '每日') {
+    // 正则校验是否HH:MM
+    if (arr.some((it) => !/^([01]?[0-9]|2[0-3]):[0-5][0-9]$/.test(it))) {
+      message.error('请检查输入格式是否正确！！！')
+      return
+    } else {
+      try {
+        formLoading.value = true
+        await WechatApi.updateWechatSendTime({
+          id: sendTimeInfo.value.id,
+          sendTime: arr.join('、')
+        })
+        message.success('修改成功！')
+        getTableList()
+        showSendTime.value = false
+      } finally {
+        formLoading.value = false
+      }
+    }
+  } else if (sendTimeInfo.value.sendFrequency == '每月') {
+    // 正则校验是否【1-31】-HH:MM
+    const reg = /^([1-9]|[1-2]\d|3[01])-([01]?[0-9]|2[0-3]):[0-5][0-9]$/
+    if (arr.length > 0 && arr.some((it) => !reg.test(it))) {
+      message.error('请检查输入格式是否正确！！！')
+      return
+    } else {
+      try {
+        formLoading.value = true
+        await WechatApi.updateWechatSendTime({
+          id: sendTimeInfo.value.id,
+          sendTime: arr.join('、')
+        })
+        message.success('修改成功！')
+        getTableList()
+        showSendTime.value = false
+      } finally {
+        formLoading.value = false
+      }
+    }
+  }
+}
+
+const fileBeforeUpload = (file) => {
+  let format = '.' + file.name.split('.')[1]
+  if (!['.jpg', '.png', 'jpeg'].includes(format)) {
+    message.error(`请上传指定格式".jpg,.jpeg,.png"文件`)
+    return false
+  }
+  let isRightSize = file.size / 1024 / 1024 < 20
+  if (!isRightSize) {
+    message.error('文件大小超过 20MB')
+  }
+  return isRightSize
+}
+
+const fd = ref(new FormData())
+
+async function rewardUpload(data, id) {
+  fd.value.append('file', data.file)
+  fd.value.append('id', id)
+  // 上传接口，成功后得到微信群名
+  try {
+    // 上传文件
+    setTimeout(() => {
+      getTableList()
+    }, 2000)
+  } finally {
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Basic/WxRobot/index.data.js

@@ -1,62 +0,0 @@
-// import { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-
-const statusOptions = [
-  { label: '发送成功', value: 1 },
-  { label: '发送失败', value: 2 },
-  { label: '排队中', value: 3 },
-  { label: '微信端卡住', value: 4 }
-]
-
-// CrudSchema：https://doc.iocoder.cn/vue3/crud-schema/
-const crudSchemas = reactive([
-  {
-    label: '发送对象',
-    field: 'sendUser',
-    isSearch: true,
-    isTable: true
-  },
-  {
-    label: '发送内容',
-    field: 'content',
-    isSearch: false,
-    isTable: true
-  },
-  {
-    label: '发送状态',
-    field: 'status',
-    isSearch: true,
-    isTable: true,
-    search: {
-      component: 'Select',
-      api: () => statusOptions,
-      componentProps: {
-        optionsAlias: {
-          labelField: 'label',
-          valueField: 'value'
-        }
-      }
-    }
-  },
-  {
-    label: '发送时间',
-    field: 'createTime',
-    isSearch: true,
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
-    },
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'daterange',
-        format: 'YYYY-MM-DD',
-        valueFormat: 'YYYY-MM-DD',
-        startPlaceholder: '发送时间',
-        endPlaceholder: '发送时间'
-      }
-    }
-  }
-])
-export const { allSchemas } = useCrudSchemas(crudSchemas)

src/views/Basic/WxRobot/index.vue

@@ -1,77 +1,19 @@
 <template>
   <el-tabs v-model="tabIndex" type="border-card">
-    <el-tab-pane label="微信消息记录" :name="0">
-      <!-- 搜索工作栏 -->
-      <Search
-        :schema="allSchemas.searchSchema"
-        labelWidth="0"
-        @search="setSearchParams"
-        @reset="setSearchParams"
-      />
-      <!-- 列表 -->
-      <SSTable
-        class="mt-20px"
-        v-model:tableObject="tableObject"
-        :tableColumns="allSchemas.tableColumns"
-        @get-list="getTableList"
-      >
-        <el-table-column
-          v-for="item in allSchemas.tableColumns"
-          :key="item.field"
-          :prop="item.field"
-          :label="item.label"
-          :fixed="item.fixed"
-          min-width="150px"
-          showOverflowTooltip
-        />
-        <el-table-column label="操作" width="150px" fixed="right">
-          <template #default="{ row }">
-            <el-button type="primary" link @click="sendMsg(row)">再次发送</el-button>
-          </template>
-        </el-table-column>
-      </SSTable>
+    <!-- <el-tab-pane label="微信消息记录" :name="0">
+      <Record />
+    </el-tab-pane> -->
+    <el-tab-pane label="消息配置" :name="1">
+      <Setting />
     </el-tab-pane>
   </el-tabs>
 </template>
 
-<script setup>
-import { allSchemas } from './index.data.js'
+<script setup name="WXBoot">
+// import Record from './Record.vue'
+import Setting from './Setting.vue'
 
-const tabIndex = ref(0)
-
-const tableObject = ref({
-  tableList: [],
-  loading: false,
-  total: 1,
-  pageSize: 20,
-  currentPage: 1
-})
-
-function setSearchParams() {
-  tableObject.value.tableList = [
-    {
-      sendUser: '测试',
-      content: '您今日有10条待跟进的线索',
-      status: '发送成功',
-      createTime: '2024-04-25 12:00:00'
-    }
-  ]
-}
-
-function getTableList() {
-  tableObject.value.tableList = [
-    {
-      sendUser: '测试',
-      content: '您今日有10条待跟进的线索',
-      status: '发送成功',
-      createTime: '2024-04-25 12:00:00'
-    }
-  ]
-}
-
-function sendMsg() {
-  console.log('测试')
-}
+const tabIndex = ref(1)
 </script>
 
 <style lang="scss" scoped></style>

src/views/Clue/Order/Comp/AfterSales.vue

@@ -83,6 +83,18 @@
           style="width: 240px"
         />
       </el-form-item>
+      <template v-if="appStore.getAppInfo?.instanceType == 1">
+        <el-form-item>
+          <el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
+            <el-option
+              v-for="item in areaOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </template>
       <el-form-item>
         <el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
           查询
@@ -189,6 +201,7 @@
 <script setup name="AfterSales">
 import * as AfterSaleApi from '@/api/clue/afterSale'
 import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { getAreaSimpleList } from '@/api/school/setting/area'
 import { useUserStore } from '@/store/modules/user'
 
 import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
@@ -292,7 +305,12 @@ function handleAudit(row) {
   afterSaleAuditDialog.value.open(row)
 }
 
+const areaOptions = ref([])
 function getOptions() {
+  // 区域
+  getAreaSimpleList().then((data) => {
+    areaOptions.value = data
+  })
   getUserOption().then((data) => {
     userOptions.value = data
   })

src/views/Clue/Order/Comp/DialogOrder.vue

@@ -198,13 +198,14 @@ function getFields() {
       if (it.label.includes('日期')) {
         it.dateFormat = 'YYYY-MM-DD'
       }
+
       if (it.field == 'receivedMoney') {
         checkPermi(['clue:order:return-list']) && arr.push(it)
       } else {
         arr.push(it)
       }
     })
-    if (arr.length % 2 != 0) {
+    if (arr.filter((item) => item.span != 2).length % 2 != 0) {
       arr.push({})
     }
     orderSchema.value = [

src/views/Clue/Order/Comp/MallOrderList.vue

@@ -78,20 +78,62 @@
       <el-table-column type="expand" fixed="left">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
-            <VueDraggable
+            <!-- <VueDraggable
               target="tbody"
               v-model="row.signProducts"
               :animation="150"
               @end="onDragEnd"
               style="width: 100%"
-            >
+            > -->
             <el-table
               :data="row.signProducts"
               row-key="id"
               stripe
-                style="width: 80%; margin: 0 auto"
+              style="width: 90%; margin: 0 auto"
             >
-                <el-table-column prop="productName" label="成交产品" width="120px" />
+              <el-table-column prop="" label="子订单号" />
+              <el-table-column prop="" label="登记人" width="120px" />
+              <el-table-column prop="" label="成交日期" width="120px" />
+              <el-table-column prop="" label="成交价" width="120px" />
+              <el-table-column prop="" label="支付金额" width="120px" />
+              <el-table-column prop="" label="已到账金额" width="120px" />
+              <el-table-column prop="" label="提成状态" width="120px" />
+              <el-table-column prop="" label="备注" />
+              <el-table-column label="操作" width="200px" fixed="right">
+                <template #default="scope">
+                  <el-button
+                    type="primary"
+                    class="mr-10px"
+                    link
+                    style="padding: 0; margin-left: 0"
+                    v-hasPermi="['clue:order:after-sale']"
+                    @click="sellAfter(scope.row)"
+                  >
+                    售后
+                  </el-button>
+                  <el-button
+                    type="primary"
+                    class="mr-10px"
+                    link
+                    style="padding: 0; margin-left: 0"
+                    v-hasPermi="['clue:order:return']"
+                    @click="feeBack(scope.row)"
+                  >
+                    回款
+                  </el-button>
+                  <el-button
+                    type="primary"
+                    class="mr-10px"
+                    link
+                    style="padding: 0; margin-left: 0"
+                    v-hasPermi="['clue:pool:enroll']"
+                    @click="cancelDeal(scope.row)"
+                  >
+                    取消登记
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- <el-table-column prop="productName" label="成交产品" width="120px" />
                 <el-table-column prop="specsName" label="产品规格" width="120px" />
                 <el-table-column prop="signNum" label="成交数量" width="90px" />
                 <el-table-column prop="remark" label="成交备注" width="100px" />
@@ -157,9 +199,9 @@
                       删除
                     </el-button>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
             </el-table>
-            </VueDraggable>
+            <!-- </VueDraggable> -->
           </div>
         </template>
       </el-table-column>
@@ -184,7 +226,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="240px" fixed="right">
+      <el-table-column label="操作" width="120px" fixed="right">
         <template #default="scope">
           <el-button
             type="primary"
@@ -196,27 +238,6 @@
           >
             详情
           </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:order:after-sale']"
-            @click="sellAfter(scope.row)"
-          >
-            售后
-          </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-if="scope.row.isPayoff == '未结清'"
-            v-hasPermi="['clue:order:return']"
-            @click="feeBack(scope.row)"
-          >
-            回款
-          </el-button>
           <el-button
             type="primary"
             class="mr-10px"
@@ -227,26 +248,6 @@
           >
             添加支出
           </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:pool:enroll']"
-            @click="cancelDeal(scope.row)"
-          >
-            取消登记
-          </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:order:add-product']"
-            @click="handleAddProduct(scope.row)"
-          >
-            添加产品
-          </el-button>
         </template>
       </el-table-column>
     </SSTable>
@@ -277,8 +278,8 @@ import DialogAddProduct from './DialogAddProduct.vue'
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
 import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
-import { VueDraggable } from 'vue-draggable-plus'
-import { checkPermi } from '@/utils/permission'
+// import { VueDraggable } from 'vue-draggable-plus'
+// import { checkPermi } from '@/utils/permission'
 
 const userOptions = ref([])
 const allUserOptions = ref([])
@@ -421,14 +422,14 @@ async function getOptions() {
   getCurdSchemas()
 }
 const deliveryDialog = ref()
-function handleDelivery(row) {
-  deliveryDialog.value.open(row)
-}
+// function handleDelivery(row) {
+//   deliveryDialog.value.open(row)
+// }
 
-const addProductDialog = ref()
-function handleAddProduct(row) {
-  addProductDialog.value.open(row.signId, prodOptions.value)
-}
+// const addProductDialog = ref()
+// function handleAddProduct(row) {
+//   addProductDialog.value.open(row.signId, prodOptions.value)
+// }
 
 const batchIds = ref([])
 function handleSelectionChange(val) {
@@ -486,51 +487,51 @@ function handleBatchUpdateInstall() {
   }
 }
 
-async function handleRemoveProduct(row) {
-  try {
-    // 修改状态的二次确认
-    await message.confirm(`确认要删除${row.productName}吗?`)
-    // 发起修改状态
-    await SignApi.removeOrderProduct(row.id)
-    message.success('删除成功')
-    // 刷新列表
-    getTableList()
-  } catch {}
-}
+// async function handleRemoveProduct(row) {
+//   try {
+//     // 修改状态的二次确认
+//     await message.confirm(`确认要删除${row.productName}吗?`)
+//     // 发起修改状态
+//     await SignApi.removeOrderProduct(row.id)
+//     message.success('删除成功')
+//     // 刷新列表
+//     getTableList()
+//   } catch {}
+// }
 
-async function handleChangeProdoce(row) {
-  try {
-    // 修改状态的二次确认
-    await message.confirm('确认要修改生产状态吗?')
-    // 发起修改状态
-    await SignApi.updateProduceStatus({
-      signId: row.signId,
-      id: row.id,
-      isProduced: row.isProduced
-    })
-    message.success('修改成功')
-    // 刷新列表
-    getTableList()
-  } catch {
-    // 取消后，进行恢复按钮
-    row.isProduced = !row.isProduced
-  }
-}
+// async function handleChangeProdoce(row) {
+//   try {
+//     // 修改状态的二次确认
+//     await message.confirm('确认要修改生产状态吗?')
+//     // 发起修改状态
+//     await SignApi.updateProduceStatus({
+//       signId: row.signId,
+//       id: row.id,
+//       isProduced: row.isProduced
+//     })
+//     message.success('修改成功')
+//     // 刷新列表
+//     // getTableList()
+//   } catch {
+//     // 取消后，进行恢复按钮
+//     row.isProduced = !row.isProduced
+//   }
+// }
 
-const expendRows = ref([])
-async function onDragEnd(ev) {
-  try {
-    expendRows.value = [ev.data.signId]
-    const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
-    await SignApi.updateProduceSort(list.map((it) => it.id))
-    message.success('修改成功')
-    // 刷新列表
-    getTableList()
-  } catch (error) {
-    console.log(error)
-    getTableList()
-  }
-}
+// const expendRows = ref([])
+// async function onDragEnd(ev) {
+//   try {
+//     expendRows.value = [ev.data.signId]
+//     const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
+//     await SignApi.updateProduceSort(list.map((it) => it.id))
+//     message.success('修改成功')
+//     // 刷新列表
+//     getTableList()
+//   } catch (error) {
+//     console.log(error)
+//     getTableList()
+//   }
+// }
 </script>
 
 <style lang="scss" scoped></style>

src/views/Clue/Order/Comp/MallSettle.vue

@@ -246,6 +246,16 @@
         <el-form-item label="结算金额">
           {{ settleAmount }}
         </el-form-item>
+        <el-form-item label="结算日期">
+          <el-date-picker
+            v-model="form.settlementDate"
+            type="date"
+            placeholder="选择日期时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :clearable="false"
+          />
+        </el-form-item>
         <el-form-item label="结算备注" prop="remark">
           <Editor v-model:modelValue="form.remark" />
         </el-form-item>
@@ -269,7 +279,7 @@ import * as SettleApi from '@/api/clue/settle'
 
 import { getSupplierSimpleList } from '@/api/school/setting/supplier'
 import { removeNullField } from '@/utils/index'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -394,6 +404,7 @@ function batchSettle() {
     showDailog.value = true
     form.value = {
       settlementIds: selectList.value.map((it) => it.settlementId),
+      settlementDate: formatDate(new Date(), 'YYYY-MM-DD'),
       reamrk: undefined
     }
     settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)

src/views/Clue/Order/Comp/Reback.vue

@@ -94,6 +94,16 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
+            <el-option
+              v-for="item in areaOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
       </template>
       <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
         <el-select
@@ -182,6 +192,7 @@
       <el-form-item>
         <el-button @click="handleSearch" v-hasPermi="['clue:order:return-search']">查询</el-button>
         <el-button @click="handleReset" v-hasPermi="['clue:order:return-reset']">重置</el-button>
+        <el-button @click="handleExport" v-hasPermi="['clue:order:return-export']">导出</el-button>
         <el-button @click="batchAudit" v-hasPermi="['clue:order:return-batch-audit']">
           批量审核
         </el-button>
@@ -404,6 +415,7 @@ import * as FeebackApi from '@/api/clue/payment'
 import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
+import { getAreaSimpleList } from '@/api/school/setting/area'
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import { useUserStore } from '@/store/modules/user'
 
@@ -412,8 +424,10 @@ import DialogFeebackDetail from './DialogFeebackDetail.vue'
 import DialogBatchAudit from './DialogBatchAudit.vue'
 
 import { removeNullField } from '@/utils'
+import download from '@/utils/download'
 import { useAppStore } from '@/store/modules/app'
 import { dateFormatter, formatDate } from '@/utils/formatTime'
+import { ElLoading } from 'element-plus'
 
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
@@ -471,6 +485,7 @@ function handleReset() {
     signSchool: undefined,
     signPlace: undefined,
     signClass: undefined,
+    area: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -506,6 +521,26 @@ async function getList() {
   }
 }
 
+async function handleExport() {
+  try {
+    ElLoading.service({
+      lock: true,
+      text: '正在导出数据，请稍后...',
+      background: 'rgba(0, 0, 0, 0.7)'
+    })
+    const params = removeNullField(searchForm.value)
+    delete params.pageNo
+    delete params.pageSize
+    const data = await FeebackApi.exportPayment(params)
+    download.excel(data, `汇款记录表${new Date().getTime()}.xls`)
+  } finally {
+    setTimeout(() => {
+      const loadingInstance = ElLoading.service()
+      loadingInstance.close()
+    }, 400)
+  }
+}
+
 const batchIds = ref([])
 function handleSelectionChange(val) {
   batchIds.value = val.map((it) => it.id)
@@ -541,12 +576,17 @@ function handleAudit(row) {
   feebackDialog.value.open(row)
 }
 
+const areaOptions = ref([])
 function getOptions() {
   // 驾校
   getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
     schoolOptions.value = data.schoolList
     allPlaceOptions.value = data.placeList
   })
+  // 区域
+  getAreaSimpleList().then((data) => {
+    areaOptions.value = data
+  })
   getUserOption().then((data) => {
     userOptions.value = data
   })

src/views/Clue/Pool/Comp/ClueMap.vue

@@ -82,7 +82,7 @@ async function initMap() {
   }
   defaultCity.value = cityInfo.locationName
   AMapLoader.load({
-    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+    key: import.meta.env.VITE_AMAP_KEY, //设置您的key
     version: '2.0',
     plugins: ['AMap.AutoComplete']
   }).then((AMap) => {

src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue

@@ -52,7 +52,7 @@ const form = ref({
 })
 
 const rules = ref({
-  originFollowUserId: { required: true, message: '原跟进人不可为空', trigger: 'change' }
+  // originFollowUserId: { required: true, message: '原跟进人不可为空', trigger: 'change' }
   // newFollowUserId: { required: true, message: '新跟进人不可为空', trigger: 'change' }
 })
 

src/views/Clue/Pool/Comp/DialogClue.vue

@@ -19,7 +19,7 @@
                 :disabled="!row.editable"
               >
                 <el-option
-                  v-for="item in props.userOptions"
+                  v-for="item in props.allUserOptions"
                   :key="item.id"
                   :label="item.nickname"
                   :value="item.id"
@@ -88,7 +88,7 @@
             <div class="w-100px">线索位置：</div>
             <el-input v-model="address" disabled placeholder="请输入线索位置" clearable />
           </div>
-          <el-checkbox v-model="showSchool" :label="true" @change="handleShowSchool">
+          <el-checkbox v-model="showSchool" :label="true" :value="true" @change="handleShowSchool">
             展示场地
           </el-checkbox>
         </div>
@@ -170,7 +170,7 @@ const formSchema = computed(() => {
     if (it.field == 'consultTime') {
       it.componentProps['disabled-date'] = dateAfterToday
       // it.componentProps['disabled'] = formType.value != 'create'
-      it.componentProps['disabled'] = true
+      it.componentProps['disabled'] = appStore.getAppInfo?.instanceType == 1
     }
     // else if (it.field == 'convertPeople' && formType.value == 'update') {
     //   it.componentProps['disabled'] = true
@@ -395,7 +395,7 @@ let geoCoder = ref(null)
 
 function initMap(data) {
   AMapLoader.load({
-    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+    key: import.meta.env.VITE_AMAP_KEY, //设置您的key
     version: '2.0',
     plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
   }).then((AMap) => {

src/views/Clue/Pool/Comp/DialogSuccess.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog title="成交登记" v-model="show" width="900px">
+  <Dialog title="成交登记" v-model="show" width="1000px">
     <template #btn>
       <el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
     </template>
@@ -12,7 +12,7 @@
       :defaultShow="false"
     />
     <el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
-      <el-row :gutter="20">
+      <el-row>
         <!-- 驾校招生模式 -->
         <template v-if="appStore.getAppInfo?.instanceType == 1">
           <el-col :span="8" :offset="0">
@@ -95,8 +95,8 @@
         <el-col :span="8" :offset="0">
           <el-form-item label="是否全款">
             <el-radio-group v-model="form.isPayoff">
-              <el-radio :label="true"> 全款 </el-radio>
-              <el-radio :label="false"> 非全款 </el-radio>
+              <el-radio :label="true" :value="true"> 全款 </el-radio>
+              <el-radio :label="false" :value="false"> 非全款 </el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -113,8 +113,8 @@
         <el-col :span="8" :offset="0">
           <el-form-item label="公司收款" prop="isCompanyReceipts">
             <el-radio-group v-model="form.isCompanyReceipts">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
+              <el-radio :label="true" :value="true">是</el-radio>
+              <el-radio :label="false" :value="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -165,7 +165,12 @@
                 />
               </template>
               <template v-else-if="fieldItem.component == 'Radio'">
-                <el-radio v-for="item in fieldItem.options" :key="item.id" :label="item.id">
+                <el-radio
+                  v-for="item in fieldItem.options"
+                  :key="item.id"
+                  :label="item.id"
+                  :value="item.id"
+                >
                   {{ item.name }}
                 </el-radio>
               </template>

src/views/Clue/Pool/Comp/DrawerClue.vue

@@ -86,7 +86,7 @@
       <el-tab-pane label="详细信息" name="infoDetail">
         <Descriptions :data="info" :schema="showSchema" :columns="2" />
         <div v-if="appStore.getAppInfo?.instanceType == 1">
-          <el-checkbox v-model="showSchool" :label="true" @change="handleShowSchool">
+          <el-checkbox v-model="showSchool" :label="true" :value="true" @change="handleShowSchool">
             展示场地
           </el-checkbox>
           <div id="dialogMap" class="mt-20px" style="height: 400px; width: 100%"></div>
@@ -289,7 +289,7 @@ const defaultLatLng = ref({
 
 function initMap(data) {
   AMapLoader.load({
-    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+    key: import.meta.env.VITE_AMAP_KEY, //设置您的key
     version: '2.0'
   }).then((AMap) => {
     aMap.value = AMap

src/views/Clue/Pool/index.vue

@@ -67,6 +67,7 @@
         class="mt-20px"
         v-model:tableObject="tableObject"
         :tableColumns="allSchemas.tableColumns"
+        rowkey="clueId"
         @get-list="getTableList"
         @get-checked-columns="getCheckedColumns"
         @selection-change="handleSelectionChange"
@@ -135,7 +136,7 @@
               <el-button
                 type="primary"
                 link
-                :disabled="scope.row.state == '成交'"
+                :disabled="appStore.getAppInfo?.instanceType == 1 && scope.row.state == '成交'"
                 @click="handleSuccess(scope.row)"
                 v-hasPermi="['clue:pool:enroll']"
               >

src/views/Home/CloseRate.vue

@@ -25,7 +25,7 @@
         <el-table-column type="index" width="50" fixed="left" />
         <el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
         <el-table-column
-          v-for="(item, index) in new Date().getMonth() + 1"
+          v-for="(item, index) in 12"
           :key="index"
           :label="item + '月'"
           sortable

src/views/Home/Comp/ChannelMonthly.vue

@@ -17,6 +17,7 @@
           :data="props.sourceOptions"
           :props="defaultProps"
           check-strictly
+          filterable
           node-key="sourceId"
           placeholder="请选择渠道"
         />

src/views/Home/Comp/ChannelPeriod.vue

@@ -25,6 +25,7 @@
           :data="props.sourceOptions"
           :props="defaultProps"
           check-strictly
+          filterable
           node-key="sourceId"
           placeholder="请选择渠道"
           style="width: 100%"

src/views/Home/Index.vue

@@ -13,6 +13,32 @@
           </el-col>
           <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
             <div class="flex h-40px items-center justify-end <sm:mt-10px">
+              <div
+                class="px-8px text-right"
+                @click="router.push({ path: '/Okr/okr-wait', query: { type: 1 } })"
+              >
+                <div class="text-14px text-red-600 mb-20px">今日待办</div>
+                <CountTo
+                  class="text-20px number-font"
+                  :start-val="0"
+                  :end-val="waitCount.dayEndAgentWorkNum"
+                  :duration="2600"
+                />
+              </div>
+              <el-divider direction="vertical" border-style="dashed" />
+              <div
+                class="px-8px text-right"
+                @click="router.push({ path: '/Okr/okr-wait', query: { type: 2 } })"
+              >
+                <div class="text-14px text-gray-400 mb-20px">我的待办</div>
+                <CountTo
+                  class="text-20px number-font"
+                  :start-val="0"
+                  :end-val="waitCount.myAgentWorkNum"
+                  :duration="2600"
+                />
+              </div>
+              <el-divider direction="vertical" border-style="dashed" />
               <div class="px-8px text-right">
                 <div class="text-14px text-gray-400 mb-20px">今日待跟进</div>
                 <CountTo
@@ -85,8 +111,8 @@
           <div class="flex justify-between items-center">
             <span>跟进榜Top10</span>
             <el-radio-group v-model="followDate" size="small" @change="getFollowList">
-              <el-radio :label="1">本日</el-radio>
-              <el-radio :label="2">本月</el-radio>
+              <el-radio :label="1" :value="1">本日</el-radio>
+              <el-radio :label="2" :value="2">本月</el-radio>
             </el-radio-group>
           </div>
         </template>
@@ -116,7 +142,13 @@
             <el-table-column type="index" width="40" />
             <el-table-column prop="username" label="姓名" width="80" />
             <el-table-column prop="followNum" label="成交数量" width="90" sortable />
-            <el-table-column prop="signPrice" label="成交额" min-width="90" sortable />
+            <el-table-column
+              v-if="appStore.getAppInfo?.instanceType != 1"
+              prop="signPrice"
+              label="成交额"
+              min-width="90"
+              sortable
+            />
             <el-table-column prop="deptName" label="所属组织" width="150" />
           </el-table>
         </el-skeleton>
@@ -143,11 +175,13 @@ import { useUserStore } from '@/store/modules/user'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { lineOptions } from './echarts-data'
 import * as HomeApi from '@/api/home/index'
+import { getWaitCount } from '@/api/okr/wait'
 import { useAppStore } from '@/store/modules/app'
 
 const { t } = useI18n()
 const userStore = useUserStore()
 const appStore = useAppStore()
+const router = useRouter() // 路由对象
 const loading = ref(false)
 const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg
 const username = userStore.getUser.nickname
@@ -237,8 +271,27 @@ function getSignList() {
   })
 }
 
+function getWaitTargetCount() {
+  getWaitCount({}).then((res) => {
+    waitCount.value = res
+  })
+}
+
+const waitCount = ref({
+  dayEndAgentWorkNum: 0,
+  myAgentWorkNum: 0,
+  urgeAgentWorkNum: 0,
+  notifyNum: 0
+})
+
 const getAllApi = async () => {
-  await Promise.all([getClueInfo(), getSignList(), getMonthlySaleRate(), getFollowList()])
+  await Promise.all([
+    getClueInfo(),
+    getSignList(),
+    getMonthlySaleRate(),
+    getFollowList(),
+    getWaitTargetCount()
+  ])
   loading.value = false
 }
 

src/views/Home/SalesReport.vue

@@ -174,10 +174,10 @@ const searchForm = ref({})
 
 function handleReset() {
   const year = new Date().getFullYear()
-  const month = new Date().getMonth() + 1
+  const month = new Date().getMonth() + 1 + ''
   searchForm.value = {
     nickname: undefined,
-    consultTime: [`${year}-${month}-01`, formatDate(new Date())],
+    consultTime: [`${year}-${month.padStart(2, '0')}-01`, formatDate(new Date())],
     licenseTypeList: [],
     sourceId: undefined
   }

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

@@ -0,0 +1,225 @@
+<template>
+  <Dialog :title="title" v-model="show" width="800px">
+    <el-form v-loading="formLoading" :model="form" ref="formRef" :rules="rules" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="考核指标" prop="examineTarget">
+            <el-input v-model="form.examineTarget" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="生效日期" prop="effectiveDate">
+            <el-date-picker
+              v-model="form.effectiveDate"
+              :disabled="form.id"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期时间"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24" :offset="0">
+          <el-form-item label="模式" prop="type">
+            <el-radio-group v-model="form.type">
+              <el-radio
+                v-for="(item, index) in prop.kpiModeOoptions"
+                :key="index"
+                :label="item.value"
+              >
+                {{ item.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="权重" prop="weight">
+            <el-input-number v-model="form.weight" :min="0" :step="1" :controls="false" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="评分上限" prop="examineScore">
+            <el-input-number v-model="form.examineScore" :min="0" :step="1" :controls="false" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24" :offset="0">
+          <el-form-item label="考核内容" prop="examineContent">
+            <Editor
+              v-model:modelValue="form.examineContent"
+              height="150px"
+              :toolbarConfig="{
+                toolbarKeys: []
+              }"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24" :offset="0">
+          <el-form-item label="考核规则" prop="examineRule">
+            <Editor
+              v-model:modelValue="form.examineRule"
+              height="150px"
+              :toolbarConfig="{ toolbarKeys: [] }"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="24" :offset="0">
+          <el-form-item label="考核员工" prop="examinedUserIdList">
+            <div>
+              <el-checkbox
+                v-model="checkAll"
+                :indeterminate="isIndeterminate"
+                @change="handleCheckAllChange"
+              >
+                全选
+              </el-checkbox>
+              <el-checkbox-group v-model="form.examinedUserIdList" @change="handleCheckedChange">
+                <el-checkbox
+                  v-for="item in employeeOptions"
+                  :key="item.id"
+                  :disabled="item.status == 1"
+                  :label="item.id"
+                  :value="item.id"
+                >
+                  {{ item.name }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span>
+        <el-button @click="show = false">取 消</el-button>
+        <el-button type="primary" :disabled="formLoading" @click="handleSave">保 存</el-button>
+      </span>
+    </template>
+  </Dialog>
+</template>
+
+<script setup name="DialogAppraise">
+import * as KpiApi from '@/api/kpi/index.js'
+
+const prop = defineProps({
+  kpiModeOoptions: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const show = ref(false)
+const title = ref('')
+const formType = ref('create')
+
+const form = ref({})
+const formLoading = ref(false)
+const rules = ref({
+  examineTarget: { required: true, message: '标题不可为空', trigger: 'blur' },
+  effectiveDate: { required: true, message: '生效日期不可为空', trigger: 'blur,change' },
+  examineContent: { required: true, message: '标题不可为空', trigger: 'blur' },
+  examineRule: { required: true, message: '标题不可为空', trigger: 'blur' }
+})
+
+async function open(type, val) {
+  show.value = true
+  title.value = type == 'update' ? '修改考核项' : '新增考核项'
+  formType.value = type
+  resetForm()
+  if (val) {
+    formLoading.value = true
+    try {
+      form.value = await KpiApi.getKpiDetail(val)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  getOptions()
+}
+
+function getOptions() {
+  KpiApi.getKpiEmployees().then((data) => {
+    employeeOptions.value = data
+    if (formType.value == 'update') {
+      handleCheckedChange(form.value.examinedUserIdList)
+    } else {
+      handleCheckAllChange(true)
+      checkAll.value = true
+    }
+  })
+}
+
+function resetForm() {
+  form.value = {
+    examineTarget: '',
+    type: '3',
+    weight: 0,
+    examineContent: ``,
+    examineRule: ``,
+    examineScore: 5,
+    examinedUserIdList: []
+  }
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+const formRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+async function handleSave() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    if (formType.value === 'create') {
+      await KpiApi.createKpi(form.value)
+      message.success(t('common.createSuccess'))
+    } else {
+      await KpiApi.updateKpi(form.value)
+      message.success(t('common.updateSuccess'))
+    }
+    show.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+const checkAll = ref(false)
+const isIndeterminate = ref(false)
+const employeeOptions = ref([])
+
+function handleCheckAllChange(val) {
+  form.value.examinedUserIdList = val ? employeeOptions.value.map((it) => it.id) : []
+  isIndeterminate.value = false
+}
+
+function handleCheckedChange(value) {
+  const checkedCount = value.length
+  checkAll.value = checkedCount === employeeOptions.value.length
+  isIndeterminate.value = checkedCount > 0 && checkedCount < employeeOptions.value.length
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Kpi/Appraise/index.vue

@@ -0,0 +1,156 @@
+<template>
+  <div>
+    <!-- 搜索工作栏 -->
+    <el-form :model="searchForm" ref="queryFormRef" inline label-width="0">
+      <el-form-item>
+        <el-input v-model="searchForm.examineTarget" placeholder="请输入考核指标" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery" v-hasPermi="['kpi:appraise:search']"> 搜索</el-button>
+        <el-button @click="resetQuery" v-hasPermi="['kpi:appraise:reset']"> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['kpi:appraise:add']"
+        >
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list" border>
+      <el-table-column prop="examineTarget" label="考核指标" width="180" />
+      <el-table-column prop="typeName" label="分值模式" width="90" :formatter="getKpiModeLabel" />
+      <el-table-column prop="weight" label="权重%" width="90" />
+      <el-table-column label="考核内容">
+        <template #default="{ row }">
+          <div v-dompurify-html="row.examineContent"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="考核规则" prop="examineRule">
+        <template #default="{ row }">
+          <div v-dompurify-html="row.examineRule"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="评分上限" prop="examineScore" width="90" />
+      <el-table-column label="考核人数" width="90">
+        <template #default="{ row }">
+          {{ row.examinedUserIdList?.length || 0 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="生效日期" prop="effectiveDate" width="120" />
+      <el-table-column label="操作" class-name="fixed-width" width="120">
+        <template #default="{ row }">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', row.id)"
+            v-hasPermi="['kpi:appraise:update']"
+          >
+            修改
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(row.id)"
+            v-hasPermi="['kpi:appraise:remove']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+
+    <DialogAppraise ref="formRef" :kpiModeOoptions="kpiModeOoptions" @success="handleQuery" />
+  </div>
+</template>
+
+<script setup name="KpiContent">
+import { removeNullField } from '@/utils'
+import DialogAppraise from './Components/DialogAppraise.vue'
+import * as KpiApi from '@/api/kpi/index.js'
+import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+const searchForm = ref({
+  examineTarget: undefined,
+  pageNo: 1,
+  pageSize: 20
+})
+const total = ref(0)
+
+/** 初始化 **/
+onMounted(() => {
+  getOptions()
+  handleQuery()
+})
+
+const kpiModeOoptions = ref([])
+function getOptions() {
+  getGeneralSysDictData('examine_type').then((data) => {
+    kpiModeOoptions.value = data
+  })
+}
+
+function getKpiModeLabel(row) {
+  return kpiModeOoptions.value.find((it) => it.value == row.type)?.label
+}
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await KpiApi.getKpiPage(removeNullField(searchForm.value))
+    list.value = data.list
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  searchForm.value = {
+    examineTarget: undefined,
+    pageNo: 1,
+    pageSize: 20
+  }
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type, id) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await KpiApi.deleteKpi(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Kpi/Score/index.vue

@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <!-- 搜索工作栏 -->
+    <el-form :model="searchForm" inline label-width="0">
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.period"
+          type="month"
+          format="YYYY-MM"
+          value-format="YYYY-MM"
+          :clearable="false"
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getList" v-hasPermi="['kpi:score:search']"> 搜索</el-button>
+      </el-form-item>
+    </el-form>
+    <el-tabs v-model="employeeId" @tab-click="getList">
+      <el-tab-pane
+        v-for="item in employeeOptions"
+        :key="item.examinedUser"
+        :name="item.examinedUser"
+      >
+        <template #label>
+          <span>{{ item.examinedUserName }}</span>
+          <el-badge :is-dot="item.notExaminedCount > 0" type="danger" />
+        </template>
+        <div class="mb-10px">
+          <el-tag v-if="periodSaved == 1" type="danger">
+            当前周期已封存，不可修改当月绩效考核
+          </el-tag>
+          <el-tag v-else type="warning">
+            当前周期未封存，可选择修改当月绩效考核，两秒内不操作将自动保存考核结果
+          </el-tag>
+        </div>
+
+        <el-table
+          v-loading="loading"
+          :data="list"
+          border
+          show-summary
+          :summary-method="getSummaries"
+        >
+          <el-table-column prop="examineTarget" label="考核指标" width="180" />
+          <el-table-column prop="typeName" label="分值模式" width="90" />
+          <el-table-column prop="weight" label="权重%" width="90" />
+          <el-table-column label="考核内容">
+            <template #default="{ row }">
+              <div v-dompurify-html="row.examineContent"></div>
+            </template>
+          </el-table-column>
+          <el-table-column label="考核规则" prop="examineRule">
+            <template #default="{ row }">
+              <div v-dompurify-html="row.examineRule"></div>
+            </template>
+          </el-table-column>
+          <el-table-column label="评分上限" prop="examineScore" width="90" />
+          <el-table-column label="考核评分" width="120">
+            <template #default="{ row }">
+              <div v-if="periodSaved == 1">{{ row.score }}</div>
+              <el-input-number
+                v-else
+                v-model="row.score"
+                :min="0"
+                :max="row.examineScore"
+                :step="1"
+                :controls="false"
+                size="small"
+                style="width: 100%"
+                @input="handleSave(row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="评分备注" width="200">
+            <template #default="{ row }">
+              <div v-if="periodSaved == 1">{{ row.remark }}</div>
+              <el-input
+                v-else
+                v-model="row.remark"
+                type="textarea"
+                :rows="3"
+                size="small"
+                style="width: 100%"
+                @input="handleSave(row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="加权得分" prop="weightSocre" width="90" />
+          <el-table-column label="操作" fixed="right" width="100">
+            <template #default="{ row }">
+              <el-button style="padding: 0" type="danger" text @click="handleDelete(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="KpiScore">
+import { formatDate } from '@/utils/formatTime'
+import * as KpiApi from '@/api/kpi/score.js'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+const searchForm = ref({
+  period: undefined
+})
+
+const periodSaved = ref(0)
+
+const employeeOptions = ref([])
+const employeeId = ref('')
+
+onMounted(() => {
+  // 默认取上个月
+  const today = new Date()
+  searchForm.value.period = formatDate(
+    new Date(today.getFullYear(), today.getMonth() - 1),
+    'YYYY-MM'
+  )
+
+  KpiApi.getKpiPeriodStatus({ period: searchForm.value.period }).then((data) => {
+    periodSaved.value = data.status
+  })
+
+  getList()
+})
+
+async function getList() {
+  try {
+    // 获取当前要考核的人员
+    const arr = await KpiApi.getKpiEmployees(searchForm.value)
+    employeeOptions.value = arr || []
+    if (employeeOptions.value.length > 0) {
+      if (!employeeId.value) {
+        employeeId.value = employeeOptions.value[0].examinedUser
+      }
+    } else {
+      message.error('当月无待考核员工！！！')
+      return
+    }
+    list.value =
+      employeeOptions.value.find((it) => it.examinedUser == employeeId.value)
+        ?.examineScoreRespVOList || []
+  } finally {
+    loading.value = false
+  }
+}
+
+let timer = ref(null)
+const lastId = ref('')
+function handleSave(row) {
+  try {
+    lastId.value == row.id && clearTimeout(timer.value)
+    timer.value = setTimeout(async () => {
+      lastId.value = row.id
+      // message.success('正在保存数据，请稍后')
+      await KpiApi.saveKpiScore({
+        id: row.id,
+        score: row.score,
+        remark: row.remark
+      })
+      message.success('修改成功！')
+      getList()
+    }, 2000)
+  } catch (err) {
+    console.log(err)
+  }
+}
+
+async function handleDelete(row) {
+  try {
+    // 删除的二次确认
+    await message.delConfirm(
+      `删除后，该员工于${searchForm.value.period}将不再考核此项，是否确认删除？`
+    )
+    // 发起删除
+    await KpiApi.deleteKpiItem({ id: row.id })
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+function getSummaries({ columns, data }) {
+  let sums = []
+  columns.forEach((column, index) => {
+    if (index == 0) {
+      sums[index] = '考核总分'
+      return
+    }
+    const values = data.map((item) => Number(item[column.property]))
+    if (!values.every((value) => Number.isNaN(value))) {
+      if (column.property == 'weightSocre') {
+        const employee = employeeOptions.value.find((it) => it.examinedUser == employeeId.value)
+        sums[index] = employee.scoreTotal + '分'
+      } else {
+        sums[index] = ''
+      }
+    } else {
+      sums[index] = ''
+    }
+  })
+  return sums
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Login/Login.vue

@@ -1,54 +1,25 @@
 <template>
   <div
     :class="prefixCls"
-    class="h-[100%] relative <xl:bg-v-dark <sm:px-10px <xl:px-10px <md:px-10px"
+    class="h-[100%] relative dark:bg-v-dark <sm:px-10px <xl:px-10px <md:px-10px"
   >
     <div class="relative h-full flex mx-auto">
-      <div
-        :class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px <xl:hidden`"
-      >
+      <div :class="`${prefixCls}__left w-[30%] <lg:w-[100%] left-box relative p-30px <xl:p-20px`">
         <!-- 左上角的 logo + 系统标题 -->
-        <div class="flex items-center relative text-white">
-          <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" />
-          <span class="text-20px font-bold">{{ underlineToHump(appInfo.instanceName) }}</span>
-        </div>
-        <!-- 左边的背景图 + 欢迎语 -->
-        <div class="flex justify-center">
-          <TransitionGroup
-            appear
-            enter-active-class="animate__animated animate__bounceInLeft"
-            tag="div"
-          >
-            <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
-            <!-- <div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div> -->
-          </TransitionGroup>
-        </div>
-
-        <div class="landIn">
-          <transition-group name="text-animation">
-            <span v-for="(char, index) in chars" :key="index">{{ char }}</span>
-          </transition-group>
-        </div>
-      </div>
-      <div class="flex-1 p-30px <sm:p-10px dark:bg-v-dark relative">
-        <!-- 右上角的主题、语言选择 -->
-        <div class="flex justify-between items-center text-white @2xl:justify-end @xl:justify-end">
-          <div class="flex items-center @2xl:hidden @xl:hidden">
-            <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" />
-            <span class="text-20px font-bold">{{ underlineToHump(appInfo.instanceName) }}</span>
-          </div>
-          <div class="flex justify-end items-center space-x-10px">
-            <ThemeSwitch />
-            <!-- <LocaleDropdown class="<xl:text-white dark:text-white" /> -->
-          </div>
+        <div class="flex items-center relative">
+          <h2 class="mb-3 text-2xl font-bold">
+            欢迎使用 {{ underlineToHump(appInfo.instanceName) }}
+          </h2>
+          <!-- <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" /> -->
+          <!-- <span class="text-20px font-bold">{{ underlineToHump(appInfo.instanceName) }}</span> -->
         </div>
         <!-- 右边的登录界面 -->
         <Transition appear enter-active-class="animate__animated animate__bounceInRight">
           <div
-            class="h-full flex items-center m-auto w-[100%] @2xl:max-w-500px @xl:max-w-500px @md:max-w-500px @lg:max-w-500px"
+            class="flex items-center m-auto w-[100%] @2xl:max-w-500px @xl:max-w-500px @md:max-w-500px @lg:max-w-500px <xl:mt-20px"
           >
             <!-- 账号登录 -->
-            <LoginForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" />
+            <LoginForm class="p-40px <xl:p-10px h-auto m-auto" />
             <!-- 手机登录 -->
             <!-- <MobileForm class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
             <!-- 二维码登录 -->
@@ -59,6 +30,39 @@
             <!-- <SSOLoginVue class="p-20px h-auto m-auto <xl:(rounded-3xl light:bg-white)" /> -->
           </div>
         </Transition>
+        <!-- 左边的背景图 + 欢迎语 -->
+        <div class="flex justify-center">
+          <TransitionGroup
+            appear
+            enter-active-class="animate__animated animate__bounceInLeft"
+            tag="div"
+          >
+            <!-- <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" /> -->
+            <img key="1" alt="" class="w-[50%] m-auto" src="@/assets/imgs/login2.gif" />
+          </TransitionGroup>
+        </div>
+
+        <div class="landIn">
+          <transition-group name="text-animation">
+            <span v-for="(char, index) in chars" :key="index">{{ char }}</span>
+          </transition-group>
+        </div>
+      </div>
+      <div class="login-box flex-1 p-30px <sm:p-10px dark:bg-v-dark <lg:hidden relative">
+        <!-- 右上角的主题、语言选择 -->
+        <div class="flex justify-between items-center text-white @2xl:justify-end @xl:justify-end">
+          <div class="flex items-center @2xl:hidden @xl:hidden">
+            <!-- <img alt="" class="w-48px h-48px mr-10px" :src="appInfo.instanceIcon" /> -->
+            <!-- <span class="text-20px font-bold text-black">
+              欢迎使用 {{ underlineToHump(appInfo.instanceName) }}
+            </span> -->
+          </div>
+          <div class="flex justify-end items-center space-x-10px">
+            <ThemeSwitch />
+            <!-- <LocaleDropdown class="<xl:text-white dark:text-white" /> -->
+          </div>
+        </div>
+        <img src="@/assets/imgs/shisong.jpg" width="80%" alt="" srcset="" />
       </div>
     </div>
   </div>
@@ -96,7 +100,7 @@ const chars = computed(() => {
   return text.slice(0, currentCharIndex.value)
 })
 
-async function init() {
+function init() {
   const res = currentRoute.value?.query?.tenantId
   authUtil.setTenantId(res)
 
@@ -137,7 +141,7 @@ $prefix-cls: #{$namespace}-login;
       z-index: -1;
       width: 100%;
       height: 100%;
-      background-image: url('@/assets/svgs/login-bg.svg');
+      // background-image: url('@/assets/svgs/login-bg.svg');
       background-position: center;
       background-repeat: no-repeat;
       content: '';
@@ -145,6 +149,20 @@ $prefix-cls: #{$namespace}-login;
   }
 }
 
+// .left-box {
+//   background: #f3f4fb;
+//   background-image: url('@/assets/imgs/login-left-bg.png');
+//   background-repeat: no-repeat;
+//   background-size: 100% 100%;
+// }
+
+.login-box {
+  background-image: url('@/assets/imgs/shisong.jpg');
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: 80% 80%;
+}
+
 .text-animation-enter-active,
 .text-animation-leave-active {
   transition: opacity 0.5s;
@@ -160,12 +178,11 @@ $prefix-cls: #{$namespace}-login;
   width: 80%;
   display: flex;
   flex-wrap: wrap;
-  font-size: 18px;
-  line-height: 1.8;
+  font-size: 1rem;
+  line-height: 1.3;
   font-family: Lora, serif;
   white-space: pre;
   font-weight: 600;
-  color: #6ee1f5;
 
   span {
     animation: landIn 0.8s ease-out both;

src/views/Login/components/LoginForm.vue

@@ -11,10 +11,13 @@
   >
     <el-row style="margin-left: -10px; margin-right: -10px">
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
+        <slot name="title"></slot>
+      </el-col>
+      <!-- <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
         <el-form-item>
           <LoginFormTitle style="width: 100%" />
         </el-form-item>
-      </el-col>
+      </el-col> -->
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
         <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantId">
           <el-input
@@ -107,7 +110,7 @@
 </template>
 <script name="LoginForm" setup>
 import { ElLoading } from 'element-plus'
-import LoginFormTitle from './LoginFormTitle.vue'
+// import LoginFormTitle from './LoginFormTitle.vue'
 
 import { useIcon } from '@/hooks/web/useIcon'
 

src/views/MiniMall/Purchase/Comp/DialogAdd.vue

@@ -33,9 +33,9 @@
             <el-select v-model="form.supplier" placeholder="选择供应商" filterable>
               <el-option
                 v-for="item in opts.supplier"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                :key="item.id"
+                :label="item.supplierName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>

src/views/OKR/Analysis/index.vue

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

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

@@ -0,0 +1,150 @@
+<template>
+  <div class="flex flex-col w-full h-full p-4 bg-white rounded-lg shadow-md overflow-hidden">
+    <div class="flex items-center justify-between">
+      <el-row>
+        <el-tree-select
+          v-model="searchForm.nodeId"
+          :data="peroidList"
+          :props="defaultProps"
+          :render-after-expand="false"
+          :default-expand-all="false"
+          check-strictly
+          style="width: 400px"
+          @change="nodeChange"
+        />
+        <el-button class="ml-10px" type="primary" @click="handleAddNode">新建节点</el-button>
+      </el-row>
+      <el-row>
+        <el-button type="info" @click="handleShowOkr(searchForm.nodeId)"> 节点详情 </el-button>
+        <el-button
+          type="warning"
+          v-if="currentUserId == searchForm.creatorId"
+          @click="handleEditOkr(searchForm.nodeId)"
+        >
+          修改当前节点
+        </el-button>
+        <el-button
+          type="success"
+          v-if="searchForm.executor?.includes(currentUserId)"
+          @click="handleUpdateProcess"
+          >更新进度</el-button
+        >
+      </el-row>
+    </div>
+    <OkrTable ref="okrTableRef" :canEdit="isCurrentLeafNode" />
+    <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
+    <DialogOkrInfo ref="dialogOkrInfo" @success="handleSearchPeroid" />
+  </div>
+</template>
+
+<script setup name="AllTarget">
+import OkrTable from './OkrTable.vue'
+import DialogOkrInfo from './DialogOkrInfo.vue'
+import DialogOkr from './DialogOkr.vue'
+
+import { getAllNodeTree, getAllOkrPage } from '@/api/okr/okr'
+import { listToTree, findNode } from '@/utils/tree'
+import { useUserStore } from '@/store/modules/user'
+
+const message = useMessage()
+const userStore = useUserStore()
+const currentUserId = userStore.getUser.id
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const okrTableRef = ref(null)
+const searchForm = ref({
+  nodeId: undefined
+})
+
+const peroidList = ref([])
+
+handleSearchPeroid()
+
+// 当前是否是叶子节点
+// 如果不是叶子节点，则表格数据不可修改
+const isCurrentLeafNode = ref(false)
+
+function handleSearchPeroid() {
+  getAllNodeTree().then((resp) => {
+    if (resp.nodeId) {
+      peroidList.value = listToTree(resp?.tree || [], {
+        id: 'nodeId',
+        pid: 'parentId',
+        children: 'children'
+      })
+      nodeChange(resp.nodeId)
+    } else {
+      message.warning('请先创建节点数据')
+    }
+  })
+}
+
+function nodeChange(nodeId) {
+  if (nodeId) {
+    searchForm.value.nodeId = nodeId
+    getOkrList()
+    const currentNode = findNode(peroidList.value, (node) => {
+      return node.nodeId == nodeId
+    })
+    searchForm.value.creatorId = currentNode.creatorId
+    if (!currentNode.children || currentNode.children.length == 0) {
+      isCurrentLeafNode.value = true
+    } else {
+      isCurrentLeafNode.value = false
+    }
+  }
+}
+
+function getOkrList() {
+  getAllOkrPage(searchForm.value).then((resp) => {
+    const list = resp
+    if (list && list.length > 0) {
+      nextTick(() => {
+        okrTableRef.value.prepareData(list)
+      })
+    } else {
+      // 如果没有数据，清空表格
+      okrTableRef.value.prepareData([])
+    }
+  })
+}
+
+const dialogOkrInfo = ref(null)
+function handleAddNode() {
+  dialogOkrInfo.value.open('create', null)
+}
+
+function handleEditOkr(nodeId = undefined) {
+  dialogOkr.value.close()
+  dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
+}
+
+function handleUpdateProcess() {
+  okrTableRef.value.updateProcess(searchForm.value.nodeId).then(() => {
+    message.success('更新成功')
+    getOkrList()
+  })
+}
+
+const dialogOkr = ref(null)
+function handleShowOkr(id) {
+  dialogOkr.value.open({
+    nodeId: id,
+    canEdit: isCurrentLeafNode.value,
+    queryType: 2
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-overlay-dialog) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

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

@@ -0,0 +1,682 @@
+<template>
+  <el-dialog
+    v-if="show"
+    v-model="show"
+    width="94vw"
+    class="dialog-okr"
+    :show-close="false"
+    :close-on-click-modal="false"
+  >
+    <template #header>
+      <div class="dialog-okr-header">
+        <div class="flex-1 flex items-center" style="line-height: 50px">
+          <div class="dialog-okr-title">
+            <Icon icon="ep:circle-check-filled" color="#30d1fc" :size="14" />
+            <span>目标</span>
+          </div>
+          <el-divider direction="vertical" />
+          <span class="text-14px ml-0.25">ork落地</span>
+          <div class="ml-20px text-14px">
+            <span>【节点】</span>
+            <span
+              v-for="(item, index) in nodeInfo.parentNodes"
+              :key="item.nodeId"
+              @click="handleChildItem(item)"
+            >
+              <span
+                class="cursor-pointer"
+                :style="{
+                  color: index < nodeInfo.parentNodes.length - 1 ? '#409eff' : '#333',
+                  borderBottom:
+                    index < nodeInfo.parentNodes.length - 1 ? '1px solid #409eff' : 'none'
+                }"
+              >
+                {{ item.nodeName }}
+              </span>
+              <span v-if="index != nodeInfo.parentNodes.length - 1"> -> </span>
+            </span>
+          </div>
+        </div>
+        <div class="flex items-center">
+          <el-button
+            v-if="nodeInfo.creatorId == currentUserId"
+            link
+            @click="emit('edit', nodeInfo.nodeId)"
+          >
+            <el-tooltip content="编辑" placement="top" effect="dark">
+              <Icon icon="ep:edit" :size="16" />
+            </el-tooltip>
+          </el-button>
+
+          <el-button link @click="show = false">
+            <el-tooltip content="关闭" placement="top" effect="dark">
+              <Icon icon="ep:close" :size="16" />
+            </el-tooltip>
+          </el-button>
+        </div>
+      </div>
+    </template>
+    <template #default>
+      <div class="dialog-okr-body">
+        <div class="dialog-okr-content pr-10px">
+          <div class="dialog-okr-content-detail">
+            <div class="detail-basic-title">
+              <div class="basic-title-item">
+                <div class="basic-title-label">创建人</div>
+                <div class="basic-title-value">{{ nodeInfo.creator }}</div>
+              </div>
+              <div class="basic-title-item">
+                <div class="basic-title-label">执行人</div>
+                <div class="basic-title-value">{{ nodeInfo.executorName || '无' }}</div>
+              </div>
+              <div class="basic-title-item">
+                <div class="basic-title-label">目标数</div>
+                <div class="basic-title-value">{{ okrList.length }}</div>
+              </div>
+              <div class="basic-title-item" style="min-width: 200px">
+                <div class="basic-title-label">总体进度</div>
+                <el-progress :percentage="parseInt(nodeInfo.progress) || 0" :stroke-width="8" />
+              </div>
+            </div>
+            <div class="flex detail-basic-info">
+              <span>开始日期：{{ nodeInfo.startTime }}</span>
+              <span>截止日期：{{ nodeInfo.endTime }}</span>
+              <span>最新更新时间：{{ nodeInfo.updateTime }}</span>
+            </div>
+          </div>
+          <div class="flex" style="position: relative; flex: 1; height: 100px">
+            <el-tabs v-model="workIndex" style="flex: 1">
+              <el-tab-pane label="目标/关键成果" name="okr">
+                <div class="content-wrap">
+                  <OkrTable ref="okrTableRef" :canEdit="canEdit" />
+                </div>
+              </el-tab-pane>
+            </el-tabs>
+            <el-button v-if="canEdit" class="sav-btn" type="primary" @click="handleSaveProcess">
+              保存并更新
+            </el-button>
+          </div>
+        </div>
+        <div class="dialog-okr-side pl-10px">
+          <el-tabs v-model="sideIndex" style="flex: 1; height: 100%">
+            <el-tab-pane label="子节点" name="subNode" key=" ">
+              <div class="overflow-y-auto" style="height: calc(100% - 50px)">
+                <div
+                  v-for="item in childNodeList"
+                  :key="item.nodeId"
+                  class="border-b-1 child-item"
+                  style="padding: 10px 5px; cursor: pointer"
+                  @click="handleChildItem(item)"
+                >
+                  <div
+                    class="flex justify-between items-center overflow-hidden text-16px"
+                    style="line-height: 30px"
+                  >
+                    <div class="child-label">【节点】{{ item.nodeName }}</div>
+                    <el-progress
+                      type="line"
+                      :percentage="parseInt(item.progress) || 0"
+                      :stroke-width="6"
+                      style="width: 120px"
+                    />
+                  </div>
+                  <div class="ml-10px flex items-center text-13px" style="line-height: 30px">
+                    <span>目标数：</span>
+                    <span style="color: #aaa">{{ item.objectiveNum }}</span>
+                    <el-divider direction="vertical" style="margin: 0 20px" />
+                    <div
+                      class="flex-1 overflow-hidden h-30px"
+                      style="text-overflow: ellipsis; white-space: nowrap"
+                    >
+                      <span>执行人：</span>
+                      <span style="color: #aaa">{{ item.executorName || '无' }}</span>
+                    </div>
+                  </div>
+                  <div
+                    class="ml-10px flex items-center text-12px"
+                    style="line-height: 20px; color: #aaa"
+                  >
+                    <span>开始日期：{{ item.startTime }}</span>
+                    <el-divider direction="vertical" style="margin: 0 20px" />
+                    <span>截止日期：{{ item.endTime }}</span>
+                  </div>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="笔谈" name="conclusion" key="conclusion">
+              <div class="relative overflow-y-auto" style="height: calc(100% - 50px)">
+                <div v-if="addNewComment">
+                  <div class="flex justify-between items-center">
+                    <el-select
+                      v-model="form.commentType"
+                      filterable
+                      size="small"
+                      style="width: 120px"
+                      @change="getCommentTemplate"
+                    >
+                      <el-option
+                        v-for="it in commentTypeOptions"
+                        :label="it.label"
+                        :value="it.id"
+                        :key="it.id"
+                      />
+                    </el-select>
+
+                    <div>
+                      <el-button size="small" @click="addNewComment = false"> 取消 </el-button>
+                      <el-button type="primary" size="small" @click="handleSaveComment">
+                        发布
+                      </el-button>
+                    </div>
+                  </div>
+                  <div class="mt-10px" v-if="addNewComment">
+                    <Editor
+                      v-model:modelValue="form.commentValue"
+                      height="300px"
+                      :toolbarConfig="toolbarConfig"
+                    />
+                  </div>
+                </div>
+                <el-button v-else type="primary" size="small" @click="handleInsertComment">
+                  新增笔谈
+                </el-button>
+                <div
+                  v-for="(it, index) in commentList"
+                  :key="it.commentId"
+                  class="border-b-1"
+                  style="padding: 10px 5px"
+                >
+                  <div
+                    class="flex items-center justify-between overflow-hidden text-16px"
+                    style="line-height: 30px"
+                  >
+                    <div class="flex items-center">
+                      <el-avatar
+                        shape="circle"
+                        style="
+                          background-color: var(--el-color-primary-light-3);
+                          width: 30px;
+                          height: 30px;
+                        "
+                        fit="fill"
+                      >
+                        <span class="text-12px">{{ it.creatorName.slice(-2) }}</span>
+                      </el-avatar>
+                      <div class="ml-10px text-16px">{{ it.creatorName }}</div>
+                    </div>
+                  </div>
+                  <div class="ml-10px" v-dompurify-html="it.content"></div>
+                  <div
+                    class="ml-10px mt-10px flex items-center justify-between text-12px"
+                    style="line-height: 20px; color: #aaa"
+                  >
+                    <div class="flex items-center">
+                      <div class="flex items-center mr-50px">
+                        <el-button link @click="good(it)">
+                          <Icon
+                            icon="fa:thumbs-o-up"
+                            :size="16"
+                            :color="it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'"
+                          />
+                        </el-button>
+                        <span
+                          class="ml-5px"
+                          :style="{
+                            color: it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'
+                          }"
+                          >{{ it.likeCount }}</span
+                        >
+                      </div>
+                      <div class="flex items-center mr-50px">
+                        <el-button link @click="showComment(index)">
+                          <Icon icon="ep:chat-dot-square" :size="16" color="#333" />
+                        </el-button>
+                        <span class="ml-5px" style="color: #333">{{ it.commentCount }}</span>
+                      </div>
+                    </div>
+                    <div class="ml-10px text-13px text-gray-400">
+                      {{ formatDate(it.createTime, 'YYYY-MM-DD HH:mm') }}
+                    </div>
+                  </div>
+                  <!-- 评论 -->
+                  <div
+                    v-if="showCommentIndex == index"
+                    class="bg-gray-100 pl-10px pr-10px pt-5px pb-5px"
+                    style="margin: 10px 10px 0 10px; border-radius: 4px"
+                    label="笔谈"
+                  >
+                    <div
+                      v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
+                      :key="subComment.commentId"
+                      class="text-14px"
+                      style="line-height: 24px"
+                    >
+                      <span class="font-bold">{{ subComment.creatorName }}：</span>
+                      <span>
+                        {{ subComment.content }}
+                      </span>
+                    </div>
+                    <div class="mt-10px relative">
+                      <!-- <el-input
+                        v-model="form.commentValue"
+                        placeholder="请输入评论"
+                        type="textarea"
+                        :autosize="{ minRows: 4 }"
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                      /> -->
+                      <el-mention
+                        v-model="form.commentValue"
+                        type="textarea"
+                        :autosize="{ minRows: 4 }"
+                        :options="employeeOptions"
+                        style="width: 100%"
+                        size="small"
+                        whole
+                        placeholder="请输入内容"
+                        @select="handleMention"
+                      >
+                        <template #label="{ 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)"
+                      >
+                        发布
+                      </el-button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="进度历史" name="history" key="history">
+              <div class="overflow-y-auto pl-15px" style="height: calc(100% - 50px)">
+                <el-timeline class="ml-10px">
+                  <el-timeline-item
+                    v-for="item in nodeRecords"
+                    :key="item.recordId"
+                    placement="bottom"
+                    :timestamp="formatDate(item.createTime, 'YYYY-MM-DD HH:mm:ss')"
+                    color="#30d1fc"
+                  >
+                    <div>{{ item.creator }}</div>
+                    <div class="mt-10px text-14px" style="line-height: 24px; color: #666">
+                      {{ item.content }}
+                    </div>
+                  </el-timeline-item>
+                </el-timeline>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup name="DialogOkr">
+import { formatDate } from '@/utils/formatTime'
+import OkrTable from './OkrTable.vue'
+
+import { getOkrNodeDetail, getOkrNodeHistory } from '@/api/okr/okr'
+import {
+  getCommentTypeOptions,
+  createComment,
+  getCommentPage,
+  likeComment
+} from '@/api/okr/comment'
+import { listToTree } from '@/utils/tree'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+import { useUserStore } from '@/store/modules/user'
+
+const message = useMessage()
+const userStore = useUserStore()
+const currentUserId = userStore.getUser.id
+const emit = defineEmits(['edit', 'close'])
+
+const show = ref(false)
+
+watch(
+  () => show.value,
+  (newValue, oldValue) => {
+    if (oldValue && !newValue) {
+      emit('close', nodeInfo.value)
+    }
+  }
+)
+
+const canEdit = ref(false)
+
+const toolbarConfig = {
+  toolbarKeys: [
+    'bold', // 加粗
+    'underline', // 下划线
+    'italic', // 斜体
+    'color', // 文字颜色
+    'bgColor', // 背景色
+    'fontSize', // 字号
+    'bulletedList', // 无序列表
+    'numberedList', // 有序列表
+    'insertTable', // 插入表格
+    'insertLink', // 插入链接
+    'undo' // 撤销
+  ]
+}
+
+const workIndex = ref('okr')
+const okrList = ref([])
+const childNodeList = ref([])
+const sideIndex = ref('subNode')
+
+const okrTableRef = ref(null)
+const nodeInfo = ref({})
+
+const nodeRecords = ref([])
+const commentTypeOptions = ref([])
+
+const queryType = ref(1)
+function open(curNode) {
+  canEdit.value = curNode.canEdit
+  nodeInfo.value.nodeId = curNode.nodeId
+  queryType.value = curNode.queryType
+  // 获取数据详情
+  searchInfo(curNode)
+  show.value = true
+}
+
+const employeeOptions = ref([])
+
+function searchInfo(curNode) {
+  try {
+    getOkrNodeDetail({ nodeId: curNode.nodeId, queryType: queryType.value }).then((resp) => {
+      nodeInfo.value = {
+        ...resp,
+        executor: resp.executor || []
+      }
+      canEdit.value = canEdit.value && nodeInfo.value.executor.includes(currentUserId + '')
+      if (resp.objectives) {
+        okrList.value = resp.objectives.map((item) => ({
+          ...item,
+          keyResults: item.keyResults || []
+        }))
+      } else {
+        okrList.value = []
+      }
+      childNodeList.value = [...resp.children]
+      nextTick(() => {
+        okrTableRef.value.prepareData(okrList.value)
+      })
+    })
+    getOkrNodeHistory(curNode.nodeId).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 {
+  }
+}
+
+function close() {
+  show.value = false
+}
+
+defineExpose({ open, close })
+
+function handleMention(item) {
+  form.value.mentionedUserIdList.push(item.id)
+}
+
+function handleSaveProcess() {
+  okrTableRef.value.updateProcess(nodeInfo.value.nodeId).then(() => {
+    message.success('更新成功')
+    searchInfo({ nodeId: nodeInfo.value.nodeId })
+  })
+}
+
+function handleChildItem(item) {
+  const arr = item.executor || []
+  const isExecutor = arr.includes(currentUserId)
+  canEdit.value = isExecutor && (!item.children || item.children.length == 0)
+  searchInfo(item)
+}
+
+const addNewComment = ref(false)
+const form = ref({
+  commentValue: '',
+  commentType: undefined,
+  mentionedUserIdList: []
+})
+function handleInsertComment() {
+  addNewComment.value = true
+  const defaultComment = commentTypeOptions.value[0]
+  if (defaultComment) {
+    form.value = {
+      commentType: defaultComment.id,
+      mentionedUserIdList: []
+    }
+  }
+  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,
+      commentType: form.value.commentType,
+      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 showCommentIndex = ref(-1)
+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,
+      commentType: form.value.commentType,
+      content: form.value.commentValue,
+      mentionedUserIdList: arr,
+      parentId: commentList.value[idx].commentId
+    }
+    createComment(data)
+      .then(() => {
+        message.success('创建成功')
+        searchCommentList()
+      })
+      .finally(() => {
+        form.value.commentValue = ''
+      })
+  } catch (error) {
+    message.error('创建失败')
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-okr {
+  .dialog-okr-header {
+    display: flex;
+    height: 51px;
+    min-height: 51px;
+    vertical-align: middle;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    padding: 0 1.25rem;
+    .dialog-okr-title {
+      display: flex;
+      margin-right: 5px;
+      align-items: center;
+      background: rgba(48, 209, 252, 0.1);
+      border-radius: 3px;
+      padding: 0 10px;
+      line-height: 24px;
+      span {
+        color: #2a344b;
+        font-size: 12px;
+        margin-left: 6px;
+      }
+    }
+  }
+  .dialog-okr-body {
+    display: flex;
+    background: #f0f3fa;
+    overflow: hidden;
+    min-width: 1064px;
+    height: calc(94vh - 85px);
+    .dialog-okr-content {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      width: 70%;
+      flex: auto;
+      min-width: 700px;
+      background: #fff;
+      margin: 0 1px 0 0;
+      justify-content: space-between;
+      overflow-y: hidden !important;
+      .dialog-okr-content-detail {
+        position: relative;
+        margin-bottom: 30px;
+        overflow-y: auto;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-box-orient: vertical;
+        -webkit-box-direction: normal;
+        -ms-flex-direction: column;
+        flex-direction: column;
+        .detail-basic-title {
+          display: flex;
+          font-size: 14px;
+          margin-bottom: 16px;
+          .basic-title-item {
+            margin-right: 50px;
+            .basic-title-label {
+              color: #aaa;
+              margin-bottom: 6px;
+            }
+            .basic-title-value {
+              color: #2a344b;
+              font-size: 14px;
+            }
+          }
+        }
+        .detail-basic-info {
+          font-size: 14px;
+          color: #aaa;
+          span {
+            margin-right: 40px;
+          }
+        }
+      }
+      .content-wrap {
+        display: flex;
+        flex-direction: column;
+        height: calc(100% - 15px);
+      }
+    }
+    .dialog-okr-side {
+      padding-left: 10px;
+      display: flex;
+      flex-direction: column;
+      width: 30%;
+      overflow: hidden;
+      min-width: 364px;
+      max-width: 500px;
+      background: #fff;
+      margin: 0;
+      .child-item:hover {
+        background: #f0f3fa;
+      }
+    }
+  }
+}
+
+.sav-btn {
+  position: absolute;
+  right: 10px;
+  top: 0;
+  width: auto;
+}
+</style>

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

@@ -0,0 +1,647 @@
+<template>
+  <el-dialog
+    v-model="show"
+    width="88vw"
+    class="dialog-okr"
+    :show-close="false"
+    :close-on-click-modal="false"
+  >
+    <template #header>
+      <div class="dialog-okr-header">
+        <div class="flex-1 flex items-center" style="line-height: 50px"> {{ title }} </div>
+        <div class="flex items-center">
+          <el-button type="primary" link :disabled="formLoading" @click="handleSave">
+            保存
+          </el-button>
+          <el-button link @click="show = false"> 关闭 </el-button>
+        </div>
+      </div>
+    </template>
+    <template #default>
+      <div class="dialog-okr-body" v-loading="formLoading">
+        <el-form :model="form" ref="formRef" :rules="rules" label-width="0">
+          <el-row :gutter="10">
+            <el-col :span="4" :offset="0">
+              <el-form-item prop="parentId">
+                <el-tree-select
+                  v-model="form.parentId"
+                  :data="parentNodeList"
+                  check-strictly
+                  :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="nodeName">
+                <el-input v-model="form.nodeName" placeholder="请输入节点名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" :offset="0">
+              <el-form-item prop="startTime">
+                <el-date-picker
+                  v-model="form.startTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="开始日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" :offset="0">
+              <el-form-item prop="endTime">
+                <el-date-picker
+                  v-model="form.endTime"
+                  type="date"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  placeholder="截止日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" :offset="0">
+              <el-form-item prop="executor">
+                <el-select
+                  v-model="form.executor"
+                  placeholder="选择执行人，可多选"
+                  multiple
+                  collapse-tags
+                  collapse-tags-tooltip
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in userOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id + ''"
+                    :disabled="item.status == 1"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" :offset="0">
+              <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>
+          </el-row>
+        </el-form>
+        <div class="relative">
+          <el-button
+            v-if="okrKey == 'okr'"
+            style="position: absolute; right: 10px; top: 10px; z-index: 9"
+            type="primary"
+            size="small"
+            @click="addObjective"
+          >
+            添加目标
+          </el-button>
+          <el-button
+            v-else-if="okrKey == 'childNode'"
+            style="position: absolute; right: 10px; top: 10px; z-index: 9"
+            type="primary"
+            size="small"
+            @click="addChildNode"
+          >
+            添加子节点
+          </el-button>
+          <el-tabs v-model="okrKey">
+            <el-tab-pane label="目标/关键成果" name="okr">
+              <div>
+                <div
+                  class="flex items-center w-full"
+                  v-for="(item, i) in objectList"
+                  :key="item.objectiveId"
+                  style="padding-bottom: 5px"
+                >
+                  <div class="flex-1 w-100px">
+                    <div class="flex items-center">
+                      <el-tooltip content="点击可折叠/展开目标" placement="top" effect="dark">
+                        <el-tag
+                          type="success"
+                          class="mr-10px"
+                          @click="item.hideChild = !item.hideChild"
+                        >
+                          O{{ i + 1 }}
+                        </el-tag>
+                      </el-tooltip>
+
+                      <el-input
+                        v-model="item.objectiveName"
+                        placeholder="目标名称"
+                        class="flex-1 w-150px"
+                        :disabled="!!item.objectiveId"
+                      />
+                      <el-select
+                        v-model="item.executor"
+                        placeholder="选择执行人，可多选"
+                        multiple
+                        clearable
+                        collapse-tags
+                        filterable
+                        style="width: 240px; margin-left: 10px"
+                      >
+                        <el-option
+                          v-for="it in userOptions"
+                          :key="it.id"
+                          :label="it.name"
+                          :value="it.id + ''"
+                          :disabled="it.status == 1"
+                        />
+                      </el-select>
+                      <el-select
+                        v-model="item.dataScope"
+                        placeholder="选择权限"
+                        clearable
+                        filterable
+                        style="width: 120px; margin-left: 10px"
+                      >
+                        <el-option label="公开" :value="1" />
+                        <el-option label="仅上级可见" :value="2" />
+                      </el-select>
+                      <div class="ml-10px">
+                        <el-button type="primary" text @click="AddKR(i)">新增关键成果</el-button>
+                        <el-button type="danger" text @click="removeObj(i)">删除目标</el-button>
+                      </div>
+                    </div>
+                    <div v-if="!item.hideChild" style="background: #f0f3fa; padding-bottom: 10px">
+                      <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.keyResultName"
+                            placeholder="选择或输入关键成果"
+                            filterable
+                            :props="{ value: 'keyResultId', label: 'keyResultName' }"
+                            allow-create
+                            :reserve-keyword="false"
+                            class="flex-1 w-150px"
+                            @change="krChange(i, index)"
+                          >
+                            <el-option
+                              v-for="it in krOptions"
+                              :key="it.value"
+                              :label="it.label"
+                              :value="it.value"
+                            />
+                          </el-select>
+                          <el-button type="danger" text @click="removeKR(i, index)">
+                            删除关键成果
+                          </el-button>
+                        </div>
+                        <div class="mt-5px flex items-center">
+                          <el-tree-select
+                            v-model="kr.source"
+                            :data="sourceOptions"
+                            :props="defaultProps"
+                            check-strictly
+                            clearable
+                            filterable
+                            style="width: 200px"
+                            node-key="sourceId"
+                            placeholder="请选择渠道"
+                          />
+                          <!-- <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.resultType == 1"
+                            v-model="kr.targetValue"
+                            type="number"
+                            placeholder="目标值"
+                            class="ml-10px"
+                            style="width: 120px"
+                          />
+
+                          <el-select
+                            v-model="kr.executor"
+                            placeholder="选择执行人，可多选"
+                            multiple
+                            clearable
+                            filterable
+                            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 + ''"
+                              :disabled="it.status == 1"
+                            />
+                          </el-select>
+                          <el-select
+                            v-model="kr.dataScope"
+                            placeholder="选择权限"
+                            clearable
+                            filterable
+                            style="width: 120px; margin-left: 10px"
+                          >
+                            <el-option label="公开" :value="1" />
+                            <el-option label="仅上级可见" :value="2" />
+                          </el-select>
+                          <el-radio-group v-model="kr.isCount" class="ml-10px">
+                            <el-radio :label="true" :value="true">参与统计</el-radio>
+                            <el-radio :label="false" :value="false">不参与统计</el-radio>
+                          </el-radio-group>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- <div class="w-100px"></div> -->
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="子节点" name="childNode">
+              <el-table :data="childNodeList">
+                <el-table-column label="名称">
+                  <template #default="{ row }">
+                    <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.startTime"
+                      type="date"
+                      format="YYYY-MM-DD"
+                      value-format="YYYY-MM-DD"
+                      placeholder="选择日期时间"
+                      style="width: 130px"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="截止日期" width="160px">
+                  <template #default="{ row }">
+                    <el-date-picker
+                      v-model="row.endTime"
+                      type="date"
+                      format="YYYY-MM-DD"
+                      value-format="YYYY-MM-DD"
+                      placeholder="选择日期时间"
+                      style="width: 130px"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="权限" width="160px">
+                  <template #default="{ row }">
+                    <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>
+                <el-table-column label="执行人" width="300px">
+                  <template #default="{ row }">
+                    <el-select
+                      v-model="row.executor"
+                      placeholder="选择执行人，可多选"
+                      multiple
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in userOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id + ''"
+                        :disabled="item.status == 1"
+                      />
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column fixed="right" label="删除" :width="100">
+                  <template #default="{ $index }">
+                    <el-button type="danger" text @click="removeChildNode($index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup name="DialogOkrInfo">
+import {
+  getAllNodeTree,
+  getOkrNodeDetail,
+  createOkrNode,
+  updateOkrNode,
+  getAllOkrPage,
+  getDefaultOkrOptions,
+  getChannelOptions
+} from '@/api/okr/okr'
+import { listToTree } from '@/utils/tree'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const show = ref(false)
+
+watch(
+  () => show.value,
+  (newValue, oldValue) => {
+    if (oldValue && !newValue) {
+      emit('close')
+    }
+  }
+)
+
+const title = ref('')
+const formType = ref('create')
+
+const form = ref({})
+const formLoading = ref(false)
+const rules = ref({
+  nodeName: { required: true, message: '节点名称不可为空', trigger: 'blur' },
+  startTime: { required: true, message: '开始日期不可为空', trigger: 'change' },
+  endTime: { required: true, message: '截止日期不可为空', trigger: 'change' }
+})
+
+const okrKey = ref('okr')
+
+const parentNodeList = ref([])
+
+const childNodeList = ref([])
+
+const userOptions = ref([])
+const krOptions = ref([])
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+const sourceOptions = ref([])
+const objectList = ref([])
+function open(type, val, queryType) {
+  show.value = true
+  title.value = type == 'update' ? '修改Okr' : '新增Okr'
+  formType.value = type
+  resetForm()
+  getEmployeeSimpleList().then((data) => {
+    userOptions.value = data
+  })
+  getAllNodeTree().then((resp) => {
+    parentNodeList.value = listToTree(resp.tree, {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+  getDefaultOkrOptions().then((resp) => {
+    krOptions.value = resp
+  })
+  getChannelOptions().then((resp) => {
+    sourceOptions.value = listToTree(resp, {
+      id: 'sourceId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+  if (val) {
+    formLoading.value = true
+    try {
+      getOkrNodeDetail({
+        nodeId: val,
+        queryType
+      }).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
+    }
+  }
+}
+function resetForm() {
+  form.value = {
+    parentId: undefined,
+    nodeName: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    executor: [],
+    dataScope: 2
+  }
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+const formRef = ref()
+/** 提交表单 */
+const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于操作成功后的回调
+
+function addObjective() {
+  objectList.value.push({
+    objectiveName: '',
+    executor: form.value.executor || [],
+    keyResults: [],
+    dataScope: form.value.dataScope || 2
+  })
+}
+
+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,
+    isCount: false
+  })
+}
+
+function removeObj(idx) {
+  objectList.value.splice(idx, 1)
+}
+
+function removeKR(oIdx, krIdx) {
+  objectList.value[oIdx].keyResults.splice(krIdx, 1)
+}
+
+function addChildNode() {
+  childNodeList.value.push({ dataScope: 2 })
+}
+
+function removeChildNode(idx) {
+  childNodeList.value.splice(idx, 1)
+}
+
+// 读取父节点的OKR，并展示出来
+function handleChangeParent() {
+  // 通过父节点Id,查询父节点的okr，需要继承
+  if (form.value.parentId) {
+    getAllOkrPage({ nodeId: form.value.parentId }).then((resp) => {
+      objectList.value = resp
+    })
+  }
+}
+
+function getLastDayOfMonth(year, month) {
+  // 创建一个日期对象，将月份设置为指定月份的下一个月，日期设置为 0
+  const date = new Date(year, month + 1, 0)
+  // 返回该日期对象的日期部分，即指定年月的最后一天
+  return date.getDate()
+}
+
+function krChange(idx, krIdx) {
+  const kr = objectList.value[idx].keyResults[krIdx]
+  if (kr.keyResultName) {
+    const obj = krOptions.value.find((item) => item.value == kr.keyResultName)
+    if (obj) {
+      kr.isSys = true
+    } else {
+      kr.isSys = false
+    }
+  }
+}
+
+async function handleSave() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  form.value.executor = form.value.executor || []
+  if (form.value.executor.length > 1) {
+    message
+      .confirm('是否按照当前节点所选的多个执行人自动新增对应的员工节点？', {
+        type: 'warning',
+        showCancelButton: true,
+        cancelButtonText: '不新增员工节点',
+        confirmButtonText: '新增员工节点'
+      })
+      .then(() => {
+        saveOkrData(true)
+      })
+      .catch(() => {
+        saveOkrData(false)
+      })
+  } else {
+    saveOkrData(false)
+  }
+}
+
+async function saveOkrData(isAutoAddChild = false) {
+  // 提交请求
+  formLoading.value = true
+  try {
+    form.value.isAutoAddChild = isAutoAddChild
+    form.value.objectives = objectList.value
+    form.value.children = childNodeList.value
+    if (formType.value === 'create') {
+      // 创建的是一级节点,且子节点为空时，自动新增12个月子节点，并且每月添加4周的周子节点
+      if (!form.value.parentId) {
+        if (form.value.children.length == 0) {
+          const defaultTime = new Date(form.value.startTime)
+          for (let month = 0; month < 12; month++) {
+            form.value.children.push({
+              nodeName: `${month + 1}月`,
+              startTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart(2, '0')}-01`,
+              endTime: `${defaultTime.getFullYear()}-${String(month + 1).padStart(
+                2,
+                '0'
+              )}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
+              dataScope: form.value.dataScope,
+              executor: form.value.executor
+              // children: [
+              //   {
+              //     nodeName: `${month + 1}月第1周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第2周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第3周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第4周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   }
+              // ]
+            })
+          }
+        }
+      }
+      await createOkrNode(form.value)
+      message.success(t('common.createSuccess'))
+    } else {
+      await updateOkrNode(form.value)
+      message.success(t('common.updateSuccess'))
+    }
+    show.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-okr {
+  .dialog-okr-header {
+    display: flex;
+    height: 51px;
+    min-height: 51px;
+    vertical-align: middle;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    padding: 0 1.25rem;
+  }
+  .dialog-okr-body {
+    overflow-x: hidden;
+    overflow-y: auto;
+    min-width: 1064px;
+    height: calc(94vh - 85px);
+  }
+}
+</style>

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

@@ -0,0 +1,113 @@
+<template>
+  <div class="h-full flex flex-col">
+    <div class="flex items-center justify-between">
+      <el-row>
+        <el-tree-select
+          v-model="searchForm.nodeId"
+          :data="peroidList"
+          :props="defaultProps"
+          :render-after-expand="false"
+          :default-expand-all="false"
+          style="width: 400px"
+          @change="getOkrList"
+        />
+      </el-row>
+      <el-row>
+        <el-button type="info" @click="handleShowOkr(searchForm.nodeId)"> 节点详情 </el-button>
+        <el-button type="success" @click="handleUpdateProcess">更新进度</el-button>
+      </el-row>
+    </div>
+
+    <OkrTable ref="okrTableRef" canEdit />
+    <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
+    <DialogOkrInfo ref="dialogOkrInfo" />
+  </div>
+</template>
+
+<script setup name="MyDuty">
+import OkrTable from './OkrTable.vue'
+import DialogOkrInfo from './DialogOkrInfo.vue'
+import DialogOkr from './DialogOkr.vue'
+import { listToTree } from '@/utils/tree'
+
+import { getMyNodeTree, getMyOkrPage } from '@/api/okr/okr'
+
+const message = useMessage()
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const okrTableRef = ref(null)
+const searchForm = ref({
+  nodeId: undefined
+})
+
+const peroidList = ref([])
+
+// onMounted(() => {
+handleSearchPeroid()
+// })
+
+function handleSearchPeroid() {
+  getMyNodeTree().then((resp) => {
+    peroidList.value = listToTree(resp?.tree || [], {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+    searchForm.value.nodeId = resp.nodeId
+    getOkrList()
+  })
+}
+
+function getOkrList() {
+  getMyOkrPage(searchForm.value).then((resp) => {
+    const list = resp
+    if (list && list.length > 0) {
+      nextTick(() => {
+        okrTableRef.value.prepareData(list)
+      })
+    } else {
+      // 如果没有数据，清空表格
+      okrTableRef.value.prepareData([])
+    }
+  })
+}
+
+const dialogOkrInfo = ref(null)
+// function handleAddNode() {
+//   dialogOkrInfo.value.open('create', null)
+// }
+
+function handleEditOkr(nodeId = undefined) {
+  dialogOkr.value.close()
+  dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 1)
+}
+
+function handleUpdateProcess() {
+  okrTableRef.value.updateProcess(searchForm.value.nodeId).then(() => {
+    message.success('更新成功')
+    getOkrList()
+  })
+}
+
+const dialogOkr = ref(null)
+function handleShowOkr(id) {
+  dialogOkr.value.open({
+    nodeId: id,
+    canEdit: true,
+    queryType: 1
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-overlay-dialog) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

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

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

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

@@ -0,0 +1,270 @@
+<template>
+  <div style="height: 100vh">
+    <div class="flex items-center">
+      <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.nodeName ? searchForm.nodeName : '选择周期' }}
+            </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.nodeId" :label="row.nodeId">{{
+                    row.nodeName
+                  }}</el-radio>
+                </template>
+              </el-table-column>
+              <el-table-column label="开始日期" prop="startTime" width="120" />
+              <el-table-column label="截止日期" prop="endTime" width="120" />
+            </el-table>
+          </div>
+        </div>
+      </el-popover>
+      <el-button class="ml-10px" type="primary" @click="handleAddNode">新建节点</el-button>
+    </div>
+
+    <vue3-tree-org
+      ref="treeOrgRef"
+      :data="dataList"
+      center
+      collapsable
+      :default-expand-keys="lastExpendKeys"
+      :props="treeProps"
+      @on-node-click="handleClickNode"
+    >
+      <template #default="{ node }">
+        <div style="cursor: pointer">
+          <div class="tree-org-node__text node-label">
+            <el-popover placement="right" title="目标" width="270px" trigger="hover">
+              <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>
+              </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>
+                    <span style="margin-left: 0.5rem">
+                      {{ i.objectiveName }}
+                    </span>
+                  </div>
+                </div>
+              </template>
+            </el-popover>
+          </div>
+          <div class="p-5px">
+            <el-progress
+              type="line"
+              :percentage="parseInt(getNodePropData(node.id, 'progress')) || 0"
+              text-inside
+              :stroke-width="12"
+            />
+          </div>
+        </div>
+      </template>
+    </vue3-tree-org>
+    <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
+    <DialogOkrInfo ref="dialogOkrInfo" @close="openOkr" @success="resetTreeData" />
+  </div>
+</template>
+
+<script setup name="ObjectList">
+import { Vue3TreeOrg } from 'vue3-tree-org'
+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 lastExpendKeys = ref([])
+const treeProps = {
+  children: 'children',
+  label: 'nodeName',
+  id: 'nodeId',
+  pid: 'parentId'
+}
+
+const searchForm = ref({
+  nodeName: '',
+  nodeId: null
+})
+
+const peroidList = ref([])
+
+handleSearchPeroid()
+
+function handleSearchPeroid() {
+  lastExpendKeys.value = []
+  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()
+    }
+  })
+}
+
+const treeOrgRef = ref(null)
+function resetTreeData() {
+  if (treeOrgRef.value) {
+    lastExpendKeys.value = treeOrgRef.value.getExpandKeys()
+  }
+
+  // 重新获取tree数据
+  getOkrRelationTree().then((resp) => {
+    peroidList.value = resp
+    if (resp && resp.length) {
+      if (!searchForm.value.nodeId) {
+        searchForm.value.nodeId = resp[0].nodeId
+        searchForm.value.nodeName = resp[0].nodeName
+      }
+      getOkrRelationTreeChildren({
+        nodeId: searchForm.value.nodeId
+      }).then((resp) => {
+        const tree = listToTree(resp, {
+          id: 'nodeId',
+          pid: 'parentId',
+          children: 'children'
+        })
+        // // 设置展开的keys
+        // if (treeOrgRef.value) {
+        //   treeOrgRef.value.setExpandKeys(lastExpendKeys.value)
+        // }
+        helpDataList.value = resp
+        if (tree && tree.length) {
+          dataList.value = tree[0]
+        } else {
+          dataList.value = {}
+        }
+      })
+    }
+  })
+}
+
+function getOkrList() {
+  getOkrRelationTreeChildren({
+    nodeId: searchForm.value.nodeId
+  }).then((resp) => {
+    const tree = listToTree(resp, {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+    helpDataList.value = resp
+    if (tree && tree.length) {
+      dataList.value = tree[0]
+    } else {
+      dataList.value = {}
+    }
+  })
+}
+
+function handleSelectPeroid(row) {
+  searchForm.value.nodeName = row.nodeName
+  searchForm.value.nodeId = row.nodeId
+  getOkrList()
+}
+
+function getNodePropData(nodeId, prop) {
+  const nodeData = helpDataList.value.find((it) => it.nodeId == nodeId)
+  if (nodeData) {
+    return nodeData[prop]
+  } else {
+    return ''
+  }
+}
+
+function toggleExpand(data, val) {
+  if (Array.isArray(data)) {
+    data.forEach((item) => {
+      item.expand = val
+      if (item.children) {
+        toggleExpand(item.children, val)
+      }
+    })
+  } else {
+    data.expand = val
+    if (data.children) {
+      toggleExpand(data.children, val)
+    }
+  }
+}
+
+toggleExpand(dataList.value, true)
+
+const dialogOkr = ref(null)
+const clickNode = ref(null)
+function handleClickNode(node, data) {
+  clickNode.value = data
+  openOkr()
+}
+
+function openOkr() {
+  clickNode.value &&
+    dialogOkr.value.open({
+      nodeId: clickNode.value.nodeId,
+      queryType: 2,
+      canEdit: !clickNode.value.children || clickNode.value.children.length == 0
+    })
+}
+
+const dialogOkrInfo = ref(null)
+function handleAddNode() {
+  clickNode.value = null
+  dialogOkrInfo.value.open('create', null)
+}
+
+function handleEditOkr(nodeId = undefined) {
+  dialogOkr.value.close()
+  dialogOkrInfo.value.open('update', nodeId || searchForm.value.nodeId, 2)
+}
+</script>
+
+<style lang="scss" scoped>
+.peroid-select {
+  border-radius: 4px;
+  cursor: pointer;
+  &:hover {
+    border-color: var(--el-color-primary-light-5);
+  }
+}
+
+.tree-org-node__text {
+  min-width: 200px;
+  min-height: 80px;
+  text-align: left;
+  font-size: 14px;
+  border-bottom: 1px solid #ccc;
+  padding: 5px;
+}
+.tip {
+  position: relative;
+  color: #aaa;
+  font-size: 0.875rem;
+}
+:deep(.el-progress-bar__innerText) {
+  display: block;
+  font-size: 0.75rem !important;
+}
+:deep(.el-overlay-dialog) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

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

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

src/views/OKR/Management/index.vue

@@ -0,0 +1,77 @@
+<template>
+  <div :style="{ height: `${height}px` }">
+    <el-tabs tab-position="left" v-model="tabIndex" style="height: 100%">
+      <el-tab-pane disabled name="-1">
+        <template #label>
+          <div class="w-full">
+            <div style="text-align: left; transform: translateX(-10px)">目标</div>
+          </div>
+        </template>
+      </el-tab-pane>
+      <el-tab-pane label="我负责的" name="0">
+        <MyDuty v-if="tabIndex == 0" />
+      </el-tab-pane>
+      <!-- <el-tab-pane label="待办事项" name="1">
+        <WaitTarget v-if="tabIndex == 1" />
+      </el-tab-pane> -->
+      <el-tab-pane label="全部目标" name="2">
+        <AllTarget v-if="tabIndex == 2" />
+      </el-tab-pane>
+      <el-tab-pane label="目标关系树" name="3">
+        <ObjectList v-if="tabIndex == 3" />
+      </el-tab-pane>
+      <el-tab-pane disabled v-if="employeeList.length > 0">
+        <template #label>
+          <div class="w-full">
+            <el-divider
+              direction="horizontal"
+              style="width: calc(100% + 10px) !important; transform: translateX(-10px)"
+            />
+            <div style="text-align: left; transform: translateX(-10px)">成员</div>
+          </div>
+        </template>
+      </el-tab-pane>
+      <el-tab-pane
+        v-for="item in employeeList"
+        :key="item.userId"
+        :label="item.userName"
+        :name="item.userId"
+      >
+        <MySon v-if="tabIndex == item.userId" :userId="item.userId" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="OkrManagement">
+import AllTarget from './Components/AllTarget.vue'
+import MyDuty from './Components/MyDuty.vue'
+import MySon from './Components/MySon.vue'
+import ObjectList from './Components/ObjectList.vue'
+// import WaitTarget from './Components/WaitTarget.vue'
+
+import { getMyMemberList } from '@/api/okr/okr'
+
+const tabIndex = ref('0')
+const height = ref(innerHeight - 115)
+
+const employeeList = ref([])
+onMounted(() => {
+  getMyMemberList().then((res) => {
+    employeeList.value = res
+  })
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-tabs__content) {
+  height: 100%;
+}
+:deep(.el-tab-pane) {
+  height: 100%;
+}
+:deep(.el-popover__title) {
+  font-size: 0.875rem;
+  color: #aaa !important;
+}
+</style>

src/views/OKR/Meeting/MeetingInfo.vue

@@ -0,0 +1,550 @@
+<template>
+  <div>
+    <!-- <el-affix postion="top" :offset="95" v-if="!isDetail"> -->
+    <div class="flex justify-between mb-4 bg-white" v-if="!isDetail">
+      <b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
+      <div>
+        <el-button @click="submit(true)">保存至草稿</el-button>
+        <el-button type="success" @click="submit(false)">保存</el-button>
+      </div>
+    </div>
+    <!-- </el-affix> -->
+    <el-form
+      :model="form"
+      ref="formRef"
+      :rules="rules"
+      label-width="120px"
+      v-loading="loading"
+      :disabled="!!isDetail"
+    >
+      <el-row :gutter="20">
+        <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <el-form-item label="会议主题" prop="meetingSubject">
+            <el-input v-model="form.meetingSubject" placeholder="请输入会议主题" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <el-form-item label="okr节点" prop="nodeId">
+            <el-tree-select
+              v-model="form.nodeId"
+              :data="peroidList"
+              :props="defaultProps"
+              :render-after-expand="false"
+              :default-expand-all="false"
+              check-strictly
+              clearable
+              placeholder="选择OKR节点"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="会议时间" prop="startTime">
+            <el-date-picker
+              v-model="form.startTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              placeholder="请选择会议开始时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="预计结束时间" prop="expectEndTime">
+            <el-date-picker
+              v-model="form.expectEndTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              placeholder="请选择预计结束时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="会议地点" prop="meetingRoom">
+            <el-input v-model="form.meetingRoom" placeholder="请输入会议地点" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="会议状态" prop="status">
+            <el-select v-model="form.status" placeholder="请选择会议状态" style="width: 100%">
+              <el-option label="未开始" value="1" />
+              <el-option label="已结束" value="2" />
+              <el-option label="已取消" value="3" disabled />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="预约参会人员" prop="expectUsers">
+            <el-select
+              v-model="form.expectUsers"
+              placeholder="选择参会人员"
+              filterable
+              style="width: 100%"
+              multiple
+              @change="handleUserChange"
+            >
+              <el-option
+                v-for="item in userOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.status == 1 || item.id == userStore.getUser.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0" v-if="form.meetingId">
+          <el-form-item label="实际参会人员" prop="actualUsers">
+            <el-checkbox-group v-model="form.actualUsers">
+              <el-checkbox
+                v-for="item in expectUserOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0" v-if="form.meetingId && !isAllActived">
+          <el-form-item label="缺席原因" prop="absentReason">
+            <el-input v-model="form.absentReason" placeholder="请输入缺席原因" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24">
+          <el-tabs v-model="currentUserId" tab-position="top" @tab-click="userTabChange">
+            <el-tab-pane
+              v-for="item in form.meetingContentList"
+              :key="item.userId"
+              :label="item.userName"
+              :name="item.userId + ''"
+            />
+          </el-tabs>
+          <el-tabs v-model="currentContentId" tab-position="left" addable @edit="handleTabsEdit">
+            <el-tab-pane
+              v-for="(item, index) in form.meetingContentList.find(
+                (it) => it.userId == currentUserId
+              )?.userMeetingContentList"
+              :key="index"
+              :label="'内容' + (index + 1)"
+              :name="index"
+              :closable="index > 0"
+            >
+              <div v-if="!!isDetail" v-dompurify-html="item.content" class="w-full"></div>
+              <Editor v-else v-model="item.content" height="500px" style="width: 100%" />
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+        <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" v-if="!!form.meetingId">
+          <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
+          <div v-else>
+            <el-tabs v-model="summaryIdx" addable @edit="meetingSummaryEdit">
+              <el-tab-pane
+                v-for="(item, index) in form.meetingSummaryList"
+                :key="index"
+                :label="`会议纪要${index || ''}`"
+                :name="index"
+                :closable="index > 0"
+              >
+                <Editor
+                  v-model="item.summary"
+                  :toolbarConfig="toolbarConfig"
+                  height="350px"
+                  placeholder="请输入会议纪要"
+                  style="width: 100%"
+                />
+                <div class="mt-10px">
+                  <el-form-item label="是否创建待办" label-width="auto">
+                    <el-radio-group v-model="item.isCreateAgentWork">
+                      <el-radio :label="true" :value="true"> 创建待办 </el-radio>
+                      <el-radio :label="false" :value="false"> 不创建待办 </el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </div>
+                <div class="flex items-center" v-if="item.isCreateAgentWork">
+                  <el-select
+                    class="flex-1"
+                    v-model="item.agentUserList"
+                    placeholder="选择执行人"
+                    clearable
+                    filterable
+                    multiple
+                  >
+                    <el-option
+                      v-for="it in userOptions"
+                      :key="it.id"
+                      :label="it.name"
+                      :value="it.id"
+                      :disabled="it.status == 1"
+                    />
+                  </el-select>
+                  <el-date-picker
+                    class="flex-1 ml-10px"
+                    v-model="item.endDate"
+                    type="date"
+                    format="YYYY-MM-DD"
+                    value-format="YYYY-MM-DD"
+                    placeholder="选择截止时间"
+                  />
+                </div>
+              </el-tab-pane>
+            </el-tabs>
+            <el-divider />
+            <div class="text-black text-12px">
+              注：如果选择创建待办，请选择执行人及截止日期，默认每天9:00循环提醒，可于待办中修改
+            </div>
+            <div class="mt-10px">
+              <el-form-item label="会议纪要发送至群聊：" label-width="auto">
+                <el-select
+                  filterable
+                  clearable
+                  v-model="form.wxId"
+                  placeholder="请输入群聊名称"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in groupOptions"
+                    :key="item.wxGroupId"
+                    :label="item.wxGroupName"
+                    :value="item.wxGroupId"
+                  />
+                </el-select>
+              </el-form-item>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script setup name="MeetingInfo">
+import { listToTree } from '@/utils/tree'
+import { getAllNodeTree } from '@/api/okr/okr'
+import { getWaitPage } from '@/api/okr/wait'
+import * as MeetingApi from '@/api/okr/meeting'
+import { formatDate } from '@/utils/formatTime'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { useUserStore } from '@/store/modules/user'
+
+const route = useRoute()
+const message = useMessage()
+const tagsViewStore = useTagsViewStore()
+const userStore = useUserStore()
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const isDetail = route.query.isDetail
+const currentUserId = ref(undefined)
+const currentContentId = ref(0) // 默认选中第一个标签页
+const summaryIdx = ref(0) // 会议纪要的索引
+
+const toolbarConfig = {
+  toolbarKeys: []
+}
+
+onMounted(async () => {
+  getWxGroupOptions()
+  await getOptions()
+  if (route.params.id && route.params.id != 0) {
+    // 这里可以调用API获取会议详情数据
+    getMeetingInfo(route.params.id)
+  } else {
+    form.value.meetingContentList = [
+      {
+        userId: userStore.getUser.id + '',
+        userName: userStore.getUser.nickname,
+        userMeetingContentList: [
+          {
+            content: ''
+          }
+        ]
+      }
+    ]
+    currentContentId.value = 0
+    searchUserWait([userStore.getUser.id])
+  }
+})
+
+const peroidList = ref([])
+function getOptions() {
+  return Promise.all([getAllNodeTree(), getEmployeeSimpleList()])
+    .then(([okrResp, employeeResp]) => {
+      peroidList.value = listToTree(okrResp?.tree || [], {
+        id: 'nodeId',
+        pid: 'parentId',
+        children: 'children'
+      })
+      userOptions.value = employeeResp.map((it) => ({ ...it, id: it.id + '' }))
+      form.value.expectUsers = [userStore.getUser.id + ''] // 默认添加当前用户为预约参会人员
+      // form.value.actualUsers = [userStore.getUser.id + '']
+      currentUserId.value = userStore.getUser.id + '' // 默认选中当前用户
+    })
+    .catch((error) => {
+      console.error('获取数据失败:', error)
+    })
+}
+
+const form = ref({
+  meetingId: undefined,
+  meetingSubject: '',
+  startTime: '',
+  meetingRoom: '',
+  expectEndTime: '',
+  expectUsers: [],
+  actualUsers: [],
+  okrNodeName: '',
+  status: '1',
+  meetingContent: '',
+  meetingSummary: '',
+  absentReason: '',
+  meetingContentList: [],
+  meetingSummaryList: []
+})
+const rules = {
+  meetingSubject: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
+  startTime: [{ required: true, message: '请选择会议开始时间', trigger: 'change' }],
+  expectEndTime: [{ required: true, message: '请选择预计结束时间', trigger: 'change' }],
+  meetingRoom: [{ required: true, message: '请输入会议地点', trigger: 'blur' }],
+  expectUsers: [{ required: true, message: '请选择参会人员', trigger: 'change' }]
+}
+
+const formRef = ref(null)
+const userOptions = ref([])
+const expectUserOptions = ref([])
+
+const isAllActived = computed(() => {
+  // 判断实际参会人员是否包含所有预约参会人员
+  return form.value.expectUsers.every((item) => form.value.actualUsers.includes(item))
+})
+
+const loading = ref(false)
+// 获取详情
+const getMeetingInfo = async (meetingId) => {
+  try {
+    loading.value = true
+    // 调用API获取会议详情
+    const resp = await MeetingApi.getMeetingDetail({ meetingId })
+    loading.value = false
+    if (resp) {
+      let summaryList = []
+      if (resp.meetingSummaryList && resp.meetingSummaryList.length > 0) {
+        summaryList = resp.meetingSummaryList.map((item) => ({
+          ...item,
+          isCreateAgentWork: !!item.isCreateAgentWork,
+          agentUserList: item.agentUserList ? item.agentUserList.map((it) => it + '') : []
+        }))
+      } else {
+        summaryList = [
+          {
+            summary: resp.meetingSummary || '',
+            agentUserList: [],
+            endDate: '',
+            isCreateAgentWork: true
+          }
+        ]
+      }
+
+      form.value = {
+        ...form.value,
+        ...resp,
+        startTime: formatDate(resp.startTime, 'YYYY-MM-DD HH:mm'),
+        expectEndTime: formatDate(resp.expectEndTime, 'YYYY-MM-DD HH:mm'),
+        expectUsers: resp.expectUsers || [],
+        actualUsers: resp.actualUsers || [],
+        meetingSummaryList: summaryList
+      }
+      currentContentId.value = 0
+      expectUserOptions.value = userOptions.value.filter((user) =>
+        form.value.expectUsers.some((it) => it == user.id)
+      )
+    }
+  } catch (error) {
+    loading.value = false
+    console.error('获取会议详情失败:', error)
+  }
+}
+
+const groupOptions = ref([])
+
+function getWxGroupOptions() {
+  MeetingApi.refreshWxGroupList().then(() => {
+    MeetingApi.getWxGroupList()
+      .then((resp) => {
+        groupOptions.value = resp || []
+      })
+      .catch((error) => {
+        console.error('获取微信群列表失败:', error)
+      })
+  })
+}
+
+function userTabChange() {
+  currentContentId.value = 0
+}
+
+function handleTabsEdit(targetName, action) {
+  if (action === 'add') {
+    form.value.meetingContentList.forEach((item) => {
+      if (item.userId == currentUserId.value) {
+        item.userMeetingContentList.push({
+          content: ''
+        })
+      }
+    })
+  } else if (action === 'remove') {
+    form.value.meetingContentList.forEach((item) => {
+      if (item.userId == currentUserId.value) {
+        item.userMeetingContentList.splice(targetName, 1)
+        // 如果删除的是当前选中的标签页，则切换到下一个标签页
+        if (currentContentId.value == targetName) {
+          currentContentId.value = targetName - 1
+        }
+      }
+    })
+  }
+}
+
+function meetingSummaryEdit(targetName, action) {
+  if (action === 'add') {
+    form.value.meetingSummaryList.push({
+      summary: '',
+      agentUserList: [],
+      endDate: '',
+      isCreateAgentWork: true
+    })
+  } else if (action === 'remove') {
+    form.value.meetingSummaryList.splice(targetName, 1)
+    summaryIdx.value = targetName - 1
+  }
+}
+
+const checkedUsers = ref([])
+function handleUserChange(val) {
+  // 当预约参会人员变化时，更新实际参会人员选项
+  expectUserOptions.value = userOptions.value.filter((user) =>
+    form.value.expectUsers.some((it) => it == user.id)
+  )
+  if (!isDetail) {
+    form.value.actualUsers = [...form.value.expectUsers]
+  }
+  // 先过滤掉不存在的参会人员
+  form.value.meetingContentList = form.value.meetingContentList.filter((item) => {
+    return val.some((it) => it == item.userId)
+  })
+  // 再补充新增的
+  val.map((item) => {
+    if (!form.value.meetingContentList.some((it) => it.userId == item)) {
+      form.value.meetingContentList.push({
+        userId: item,
+        userName: userOptions.value.find((it) => it.id == item).name,
+        userMeetingContentList: [
+          {
+            content: ''
+          }
+        ]
+      })
+    }
+  })
+  if (!form.value.meetingId) {
+    searchUserWait(val)
+  }
+}
+
+function searchUserWait(val) {
+  val.map((item) => {
+    if (!checkedUsers.value.includes(item)) {
+      checkedUsers.value.push(item)
+      // 新增会议时，根据参会人员拉取代办事项
+      getWaitPage({
+        pageNo: 1,
+        pageSize: -1,
+        workUserId: item,
+        creator: userStore.getUser.id,
+        completeStatus: 1
+      }).then((resp) => {
+        joinContent(resp.list)
+      })
+    }
+  })
+}
+
+function joinContent(arr) {
+  arr.map((wait) => {
+    let text = '<p>未完成事项：' + wait.title + '</p>'
+    text += wait.content
+    text += `<p>执行人：${wait.userNameStr}</p>`
+    text += `<p>截止日期：${formatDate(wait.endDate, 'YYYY-MM-DD')}</p>`
+    text += '<p><br></p>'
+    form.value.meetingContentList[0].userMeetingContentList[0].content =
+      text + form.value.meetingContentList[0].userMeetingContentList[0].content
+  })
+}
+
+const router = useRouter()
+async function submit(isDraft = false) {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  try {
+    form.value.isDraft = isDraft
+    // 提交表单数据
+    if (form.value.meetingId) {
+      if (
+        form.value.status == 2 &&
+        form.value.meetingSummaryList.some((it) => it.summary.trim() == '')
+      ) {
+        message.error('会议结束时，会议纪要不能为空')
+        return
+      } else {
+        let text = ''
+        form.value.meetingSummaryList.map((item, index) => {
+          if (form.value.meetingSummaryList.length > 1) {
+            text += '<p>会议纪要' + (index + 1) + '：</p>'
+          }
+          text += item.summary
+          if (item.isCreateAgentWork) {
+            text += `<p>执行人：`
+            item.agentUserList.map((it) => {
+              if (it) {
+                text += `${userOptions.value.find((user) => user.id == it).name} `
+              }
+            })
+            text += '</p>'
+            text += `<p>截止日期：${item.endDate}</p>`
+          }
+          text += '<p><br></p>'
+        })
+        form.value.meetingSummary = text
+      }
+      // 更新会议
+      await MeetingApi.updateMeeting(form.value)
+      message.success('会议更新成功')
+    } else {
+      form.value.actualUsers = []
+      // 新增会议
+      await MeetingApi.createMeeting(form.value)
+      message.success('会议创建成功')
+    }
+    tagsViewStore.delView(route)
+    const visitedViews = tagsViewStore.getVisitedViews
+    const latestView = visitedViews.slice(-1)[0]
+    router.push(latestView)
+  } catch (error) {
+    console.error('保存会议数据失败:', error)
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/OKR/Meeting/index.vue

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

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

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

src/views/OKR/Wait/index.vue

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

src/views/Profile/Index.vue

@@ -22,16 +22,16 @@
           <el-tab-pane :label="t('profile.info.resetPwd')" name="resetPwd">
             <ResetPwd />
           </el-tab-pane>
-          <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
+          <!-- <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
             <UserSocial />
-          </el-tab-pane>
+          </el-tab-pane> -->
         </el-tabs>
       </div>
     </el-card>
   </div>
 </template>
 <script setup lang="ts" name="Profile">
-import { BasicInfo, ProfileUser, ResetPwd, UserSocial } from './components/'
+import { BasicInfo, ProfileUser, ResetPwd } from './components/'
 const { t } = useI18n()
 
 const activeName = ref('basicInfo')

src/views/Profile/components/BasicInfo.vue

@@ -26,14 +26,14 @@ const { t } = useI18n()
 // 表单校验
 const rules = reactive<FormRules>({
   nickname: [{ required: true, message: t('profile.rules.nickname'), trigger: 'blur' }],
-  email: [
-    { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
-    {
-      type: 'email',
-      message: t('profile.rules.truemail'),
-      trigger: ['blur', 'change']
-    }
-  ],
+  // email: [
+  //   { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
+  //   {
+  //     type: 'email',
+  //     message: t('profile.rules.truemail'),
+  //     trigger: ['blur', 'change']
+  //   }
+  // ],
   mobile: [
     { required: true, message: t('profile.rules.phone'), trigger: 'blur' },
     {
@@ -59,6 +59,11 @@ const schema = reactive<FormSchema[]>([
     label: t('profile.user.email'),
     component: 'Input'
   },
+  {
+    field: 'wxAlias',
+    label: '微信号',
+    component: 'Input'
+  },
   {
     field: 'sex',
     label: t('profile.user.sex'),

src/views/Profile/components/UserSocial.vue

@@ -61,8 +61,8 @@ const bindSocial = () => {
   })
 }
 const bind = (row) => {
-  message.info('暂未开放，敬请期待')
-  return
+  // message.info('暂未开放，敬请期待')
+  // return
   const redirectUri = location.origin + '/user/profile?type=' + row.type
   // 进行跳转
   socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => {

src/views/SchoolManagement/Place/index.vue

@@ -309,7 +309,7 @@ async function initMap() {
   }
   defaultCity.value = cityInfo.locationName
   AMapLoader.load({
-    key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+    key: import.meta.env.VITE_AMAP_KEY, //设置您的key
     version: '2.0',
     plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
   }).then((AMap) => {

src/views/XjApplet/Resell/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <el-form :model="searchForm" label-width="0" inline @submit.prevent>
+      <el-form-item>
+        <el-input v-model="searchForm.phone" placeholder="请输入手机号" />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.name" placeholder="请输入姓名" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="searchList" v-hasPermi="['xj-applet:resell:search']">查询</el-button>
+        <el-button type="primary" @click="handleAdd" v-hasPermi="['xj-applet:resell:add']"
+          >新增</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="tableData" max-height="calc(100vh - 200px)">
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="phone" label="手机号" />
+      <el-table-column prop="name" label="姓名" />
+      <el-table-column prop="mark" label="标记" />
+      <el-table-column prop="memberName" label="赠送会员" />
+      <el-table-column prop="discountDiscription" label="赠送折扣" />
+      <el-table-column label="小程序码" align="center" width="120px">
+        <template #default="{ row }">
+          <img :src="row.appletUrl" style="width: 80px; height: 80px" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="120px">
+        <template #default="{ row }">
+          <el-button
+            type="primary"
+            link
+            @click="handleEdit(row)"
+            v-hasPermi="['xj-applet:resell:update']"
+            >修改</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="searchForm.pageNo"
+      v-model:limit="searchForm.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog title="分销配置" v-model="showDialog" width="500px">
+      <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" maxlength="11" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" />
+        </el-form-item>
+        <el-form-item label="标记" prop="mark">
+          <el-input v-model="form.mark" />
+        </el-form-item>
+        <el-form-item label="赠送会员" prop="memberId">
+          <el-select v-model="form.memberId" clearable filterable style="width: 100%">
+            <el-option
+              v-for="item in vipOptions"
+              :key="item.memberId"
+              :label="item.memberName"
+              :value="item.memberId"
+            >
+              <span style="float: left">{{ item.memberName }}</span>
+              <span style="float: right; color: #aaa">{{ item.carName }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="赠送折扣" prop="discountId">
+          <el-select v-model="form.discountId" clearable filterable style="width: 100%">
+            <el-option
+              v-for="item in discountOptions"
+              :key="item.id"
+              :label="item.description"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span>
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="handleSave">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Resell">
+import { getResellList, addResell, updateResell } from '@/api/xjapplet/resell'
+import { getVipDiscountOptions } from '@/api/xjapplet/discount'
+import { getVipTypeOptions } from '@/api/xjapplet/vip'
+
+const message = useMessage()
+
+const searchForm = ref({
+  pageNo: 1,
+  pageSize: 50,
+  phone: '',
+  name: ''
+})
+
+const tableData = ref([])
+const total = ref(0)
+
+const loading = ref(false)
+const showDialog = ref(false)
+
+const form = ref({
+  phone: '',
+  name: '',
+  mark: '',
+  discountId: undefined,
+  memberId: undefined
+})
+
+const rules = {
+  phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入姓名', trigger: 'blur' }]
+}
+
+const vipOptions = ref([])
+const discountOptions = ref([])
+
+onMounted(() => {
+  searchList()
+  getVipDiscountOptions().then((response) => {
+    discountOptions.value = response
+  })
+  getVipTypeOptions({ carTypeId: searchForm.value.carTypeId }).then((response) => {
+    vipOptions.value = response
+  })
+})
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  getResellList(searchForm.value).then((response) => {
+    tableData.value = response.list
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+function handleAdd() {
+  showDialog.value = true
+  form.value = {
+    phone: '',
+    name: '',
+    mark: '',
+    discountId: undefined,
+    memberId: undefined
+  }
+}
+function handleEdit(row) {
+  form.value = { ...row }
+  showDialog.value = true
+}
+
+const formRef = ref(null)
+async function handleSave() {
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 调用接口
+  if (form.value.distributionId) {
+    updateResell(form.value).then(() => {
+      message.success('修改成功')
+      showDialog.value = false
+      searchList()
+    })
+  } else {
+    addResell(form.value).then(() => {
+      message.success('新增成功')
+      showDialog.value = false
+      searchList()
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/XjApplet/Vip/components/Recharge.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <el-form :model="searchForm" inline @submit.prevent>
+      <el-form-item>
+        <el-input v-model="searchForm.phone" placeholder="学员手机号" />
+      </el-form-item>
+      <el-form-item>
+        <el-select
+          v-model="searchForm.distributionId"
+          placeholder="选择分销人"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="item in distributionOptions"
+            :key="item.distributionId"
+            :label="item.name"
+            :value="item.distributionId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          type="daterange"
+          range-separator="-"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          start-placeholder="充值日期"
+          end-placeholder="充值日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="searchList">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="tableList" height="calc(100vh - 260px)">
+      <el-table-column type="index" width="55" align="center" />
+      <el-table-column label="手机号" align="left" prop="phone" width="140" />
+      <el-table-column label="会员名" align="left" prop="memberName" min-width="140" />
+      <el-table-column label="支付金额" align="left" prop="money" min-width="100" />
+      <el-table-column label="车型" prop="carName" align="left" width="100" />
+      <el-table-column label="科目" align="left" prop="subjects" width="100" />
+      <el-table-column label="充值日期" align="left" prop="payTime" min-width="120" />
+      <el-table-column label="截止日期" align="left" prop="endDate" min-width="120" />
+      <el-table-column label="分销人" align="left" prop="distributionName" min-width="100" />
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="searchForm.pageNo"
+      v-model:limit="searchForm.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="Recharge">
+import { getRechargeRecords } from '@/api/xjapplet/vip'
+import { getResellSimpleList } from '@/api/xjapplet/resell'
+
+const searchForm = ref({
+  distributionId: undefined,
+  phone: undefined,
+  createDate: [],
+  pageNo: 1,
+  pageSize: 50
+})
+
+const loading = ref(false)
+const tableList = ref([])
+const total = ref(0)
+
+const distributionOptions = ref([])
+
+onMounted(() => {
+  changeCarType()
+})
+
+function changeCarType() {
+  getResellSimpleList().then((response) => {
+    distributionOptions.value = response
+  })
+  searchList()
+}
+
+function searchList() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  if (searchForm.value.createDate && searchForm.value.createDate.length > 0) {
+    searchForm.value.payTimeBegin = searchForm.value.createDate[0] + ' 00:00:00'
+    searchForm.value.payTimeEnd = searchForm.value.createDate[1] + ' 23:59:59'
+  } else {
+    searchForm.value.payTimeBegin = undefined
+    searchForm.value.payTimeEnd = undefined
+  }
+  getRechargeRecords(searchForm.value).then((response) => {
+    tableList.value = response.list
+    total.value = response.total
+    loading.value = false
+  })
+}
+</script>
+
+<style lang="scss" scoped></style>