sc

2025-08-20 11:46:34 +08:00 · 2025-08-12 11:05:11 +08:00 · 2025-08-11 18:39:20 +08:00 · 2025-08-11 18:17:59 +08:00 · 2025-08-11 18:04:34 +08:00 · 2025-08-05 17:15:53 +08:00
138 changed files with 9237 additions and 1709 deletions
--- a/.env.base
+++ b/.env.base
@@ -4,11 +4,13 @@ VITE_NODE_ENV=development
 VITE_DEV=true

 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
-# VITE_BASE_URL='http://114.55.169.15:48080'
+# VITE_BASE_URL='http://localhost:48080'
+
+VITE_BASE_URL='http://47.98.161.246:48080'
+# VITE_BASE_URL='http://114.215.207.150: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_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'

 # 接口前缀
--- a/.env.dev
+++ b/.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=/oa-api
--- a/.env.front
+++ b/.env.front
@@ -4,10 +4,10 @@ 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_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=/oa-api
--- a/.env.stage
+++ b/.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=/oa-api
--- a/.env.static
+++ b/.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=/oa-api
--- a/.env.test
+++ b/.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=/oa-api
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "i18n-ally.localesPaths": [
+        "src/locales"
+    ]
+}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ss-oa-manage",
-  "version": "1.0.0",
+  "version": "1.0.1",
  "description": "莳松oa管理系统",
  "author": "ss",
  "private": false,
@@ -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",
@@ -72,6 +73,7 @@
    "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",
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,19 +2,19 @@
 import { isDark } from '@/utils/is'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import routerSearch from '@/components/RouterSearch/index.vue'
+import cache from '@/plugins/cache'

 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('app')
 const appStore = useAppStore()
 const currentSize = computed(() => appStore.getCurrentSize)
 const greyMode = computed(() => appStore.getGreyMode)
-const { wsCache } = useCache()

 // 根据浏览器当前主题设置系统主题色
 const setDefaultTheme = () => {
-  let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
+  let isDarkTheme = cache.local.get(CACHE_KEY.IS_DARK)
  if (isDarkTheme === null) {
    isDarkTheme = isDark()
  }
--- a/src/api/call/index.js
+++ b/src/api/call/index.js
@@ -1,13 +0,0 @@
-import request from '@/config/axios'
-
-export default {
-  callLogin(data) {
-    return request.post({ url: '/call-api/openapi/V2.0.4/agentLogin', data })
-  },
-  callUserStatus(data) {
-    return request.post({ url: '/call-api/openapi/V2.0.4/getAgentStatus', data })
-  },
-  callNumber(data) {
-    return request.post({ url: '/call-api/openapi/V2.0.4/callNumber', data })
-  }
-}
--- a/src/api/clue/afterSale.js
+++ b/src/api/clue/afterSale.js
@@ -1,39 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getAfterSaleList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-after-sale/list', params })
-}
-
-// 查询（精简)列表
-export const getAfterSalePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-after-sale/page', params })
-}
-
-// 新增
-export const createAfterSale = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sign-after-sale/create',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 审核
-export const auditAfterSale = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-after-sale/check', data })
-}
-
-export const batchAuditAfterSale = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-after-sale/batch/check', data })
-}
-
-// 撤销
-export const cancelApplyAfterSale = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-after-sale/revoke', params: data })
-}
-
-// 查询详情
-export const getAfterSaleDetail = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-after-sale/get', params })
-}
--- a/src/api/clue/clueCache.js
+++ b/src/api/clue/clueCache.js
@@ -1,11 +0,0 @@
-import request from '@/config/axios'
-
-// 查询用户配置
-export const getClueCache = async (params) => {
-  return await request.get({ url: '/admin-api/crm/param-user-setting/get-by-user', params })
-}
-
-// 保存用户配置
-export const setClueCache = async (data) => {
-  return await request.post({ url: '/admin-api/crm/param-user-setting/save', data })
-}
--- a/src/api/clue/clueField.js
+++ b/src/api/clue/clueField.js
@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-// 创建
-export const createField = (data) => {
-  return request.post({ url: '/admin-api/crm/param/create', data: { ...data, module: 1 } })
-}
-
-// 更新
-export const updateField = (data) => {
-  return request.put({ url: '/admin-api/crm/param/update', data })
-}
-
-// 删除
-export const deleteField = (id) => {
-  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
-}
-
-// 获得
-export const getField = (id) => {
-  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
-}
-
-// 获得精简信息列表
-export const getSimpleFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 1 } })
-}
-
-// 获取自定义字段
-export const getDiyFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 1 } })
-}
-
-// 状态修改
-export const updateFieldStatus = (signParamId, status) => {
-  const data = {
-    signParamId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
-}
--- a/src/api/clue/clueGetSet.js
+++ b/src/api/clue/clueGetSet.js
@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 线索获取规则
-export const getClueGainRuleList = () => {
-  return request.get({ url: '/admin-api/crm/sch-clue-gain-rule/list' })
-}
-
-// 删除
-export const deleteClueGainRule = (id) => {
-  return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
-}
-
-// 线索获取规则保存
-export const saveClueGainRule = (data) => {
-  return request.put({ url: '/admin-api/crm/sch-clue-gain-rule/batchUpdate', data })
-}
-
-// 线索规则
-export const getClueDistributeRuleByUser = (params) => {
-  return request.get({ url: '/admin-api/crm/sch-clue-distribution-rule/queryByUserId', params })
-}
-
-// 删除
-export const deleteClueDistributeRule = (id) => {
-  return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
-}
--- a/src/api/clue/delivery.js
+++ b/src/api/clue/delivery.js
@@ -1,21 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getDeliveryList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-send/list', params })
-}
-
-// 查询分页列表
-export const getDeliveryPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-send/page', params })
-}
-
-// 新增
-export const createDelivery = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-send/create', data, isSubmitForm: true })
-}
-
-// 查询详情
-export const getDeliveryDetail = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-send/get', params })
-}
--- a/src/api/clue/followRecord.js
+++ b/src/api/clue/followRecord.js
@@ -1,20 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getFollowList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/clue-follow-record/list', params })
-}
-
-// 新增
-export const createFollow = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/clue-follow-record/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 删除
-export const deleteFollow = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/clue-follow-record/delete?id=' + id })
-}
--- a/src/api/clue/index.js
+++ b/src/api/clue/index.js
@@ -1,60 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getSimpleClueList = async () => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/list-all-simple' })
-}
-
-// 查询列表
-export const getCluePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/page', params })
-}
-
-// 查询详情
-export const getClue = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/get?id=' + id })
-}
-
-// 新增
-export const createClue = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-clue/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateClue = async (params) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/update', data: params })
-}
-
-// 删除
-export const deleteClue = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sch-clue/delete?id=' + id })
-}
-
-// 释放
-export const releaseClue = async (data) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/public/save', data })
-}
-
-// 通用查询数量
-export const getClueCount = async () => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/get-clue-num' })
-}
-
-// 获取操作记录
-export const getOpearateRecord = async (params) => {
-  return await request.get({ url: '/admin-api/crm/clue-operate-record/list', params })
-}
-
-// 获取公海线索
-export const getPublicClue = async (data) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/public/save', data })
-}
-
-// 获得线索跟进用户信息
-export const getFollowUserList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-clue/get-follow-user', params })
-}
--- a/src/api/clue/orderField.js
+++ b/src/api/clue/orderField.js
@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-// 创建
-export const createField = (data) => {
-  return request.post({ url: '/admin-api/crm/param/create', data: { ...data, module: 2 } })
-}
-
-// 更新
-export const updateField = (data) => {
-  return request.put({ url: '/admin-api/crm/param/update', data })
-}
-
-// 删除
-export const deleteField = (id) => {
-  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
-}
-
-// 获得
-export const getField = (id) => {
-  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
-}
-
-// 获得精简信息列表
-export const getSimpleFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 2 } })
-}
-
-// 获取自定义字段
-export const getDiyFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 2 } })
-}
-
-// 状态修改
-export const updateFieldStatus = (signParamId, status) => {
-  const data = {
-    signParamId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
-}
--- a/src/api/clue/payment.js
+++ b/src/api/clue/payment.js
@@ -1,39 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-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 })
-}
-
-// 新增
-export const createPayment = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sign-pay-record/create',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 审核
-export const auditPayment = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-pay-record/check', data })
-}
-
-export const batchAuditPayment = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-pay-record/batch/check', data })
-}
-
-// 撤销
-export const cancelApplyPayment = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-pay-record/revoke', params: data })
-}
-
-// 查询详情
-export const getPaymentDetail = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-pay-record/get', params })
-}
--- a/src/api/clue/settle.js
+++ b/src/api/clue/settle.js
@@ -1,16 +0,0 @@
-import request from '@/config/axios'
-
-// 查询列表
-export const getSettlePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/page', params })
-}
-
-// 查询详情
-export const getSettle = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/get?id=' + id })
-}
-
-// 批量结算
-export const batchSaveSettle = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data })
-}
--- a/src/api/clue/sign.js
+++ b/src/api/clue/sign.js
@@ -1,31 +0,0 @@
-import request from '@/config/axios'
-
-// 查询列表
-export const getSignPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign/page', params })
-}
-
-// 查询详情
-export const getSign = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sign/get?id=' + id })
-}
-
-// 新增
-export const createSign = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign/create', data: data, isSubmitForm: true })
-}
-
-// 取消登记
-export const cancelDeal = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sign/delete?id=' + id })
-}
-
-// 新增支出
-export const signAddPay = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign/extra-pay/save', data: data })
-}
-
-// 查询支出
-export const getSignExtraPayList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
-}
--- a/src/api/clue/skill.js
+++ b/src/api/clue/skill.js
@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 获得列表
-export const getSkillPage = (params) => {
-  return request.get({ url: '/admin-api/crm/skill/page', params })
-}
-
-// 创建
-export const createSkill = (data) => {
-  return request.post({ url: '/admin-api/crm/skill/create', data, isSubmitForm: true })
-}
-
-// 更新
-export const updateSkill = (data) => {
-  return request.put({ url: '/admin-api/crm/skill/update', data })
-}
-
-// 删除
-export const deleteSkill = (id) => {
-  return request.delete({ url: `/admin-api/crm/skill/delete?id=${id}` })
-}
-
-// 获得
-export const getSkill = (id) => {
-  return request.get({ url: `/admin-api/crm/skill/get?id=${id}` })
-}
--- a/src/api/clue/source.js
+++ b/src/api/clue/source.js
@@ -1,31 +0,0 @@
-import request from '@/config/axios'
-
-// 查询（精简)列表
-export const getSimpleSourceList = async () => {
-  return await request.get({ url: '/admin-api/crm/source/list' })
-}
-
-// 查询列表
-export const getSourcePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/source/list', params })
-}
-
-// 查询详情
-export const getSource = async (id) => {
-  return await request.get({ url: '/admin-api/crm/source/get?id=' + id })
-}
-
-// 新增
-export const createSource = async (data) => {
-  return await request.post({ url: '/admin-api/crm/source/create', data: data, isSubmitForm: true })
-}
-
-// 修改
-export const updateSource = async (params) => {
-  return await request.put({ url: '/admin-api/crm/source/update', data: params })
-}
-
-// 删除
-export const deleteSource = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/source/delete?id=' + id })
-}
--- a/src/api/finance/plan.js
+++ b/src/api/finance/plan.js
@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 获取提成结算参数
+export const getCommissionParams = async () => {
+  return await request.get({ url: '/admin-api/oa/percentage/get-percentage-param' })
+}
+
+// 创建
+export const createPlan = (data) => {
+  return request.post({ url: '/admin-api/oa/percentage/create', data, isSubmitForm: true })
+}
+
+// 修改
+export const updatePlan = (data) => {
+  return request.put({ url: '/admin-api/oa/percentage/update', data })
+}
+
+//  修改状态
+export const updatePlanStatus = (data) => {
+  return request.put({ url: '/admin-api/oa/percentage/status/update', data })
+}
+
+// 分页
+export const getPlanPage = (params) => {
+  return request.get({ url: '/admin-api/oa/percentage/page', params })
+}
+
+// 列表
+export const getPlanSimpleList = (params) => {
+  return request.get({ url: '/admin-api/oa/percentage/simple-list', params })
+}
+
+// 详情
+export const getPlanDetail = (id) => {
+  return request.get({ url: '/admin-api/oa/percentage/get', params: { id } })
+}
+
+// 删除
+export const deletePlan = (id) => {
+  return request.delete({ url: '/admin-api/oa/percentage/delete', params: { id } })
+}
--- a/src/api/finance/salary.js
+++ b/src/api/finance/salary.js
@@ -0,0 +1,39 @@
+import request from '@/config/axios'
+
+// 创建
+export const createSalary = (data) => {
+  return request.post({ url: '/admin-api/oa/user-salary/create', data, isSubmitForm: true })
+}
+
+// 修改
+export const updateSalary = (data) => {
+  return request.put({ url: '/admin-api/oa/user-salary/update', data })
+}
+
+//  修改状态
+export const updateSalaryStatus = (data) => {
+  return request.put({ url: '/admin-api/oa/user-salary/status/update', data })
+}
+
+// 分页
+export const getSalaryPage = (params) => {
+  return request.get({ url: '/admin-api/oa/user-salary/page', params })
+}
+
+// 列表
+export const getSalarySimpleList = (params) => {
+  return request.get({ url: '/admin-api/oa/user-salary/simple-list', params })
+}
+
+// 详情
+export const getSalaryDetail = (id) => {
+  return request.get({
+    url: '/admin-api/oa/user-salary/getByEmployeeId',
+    params: { employeeId: id }
+  })
+}
+
+// 删除
+export const deleteSalary = (id) => {
+  return request.delete({ url: '/admin-api/oa/user-salary/delete', params: { id } })
+}
--- a/src/api/home/falseDiligence.js
+++ b/src/api/home/falseDiligence.js
@@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+// 查询列表
+export const getPage = async (data) => {
+  return await request.post({ url: '/admin-api/oa/dingtalk/attendance/periodPage', data })
+}
+
+// 同步假勤数据
+export const syncFalseDiligence = async (params) => {
+  return await request.get({ url: '/admin-api/oa/dingtalk/attendance/sync', params })
+}
+
+// 修改考勤数据
+export const updateFalseDiligence = async (data) => {
+  return await request.put({ url: '/admin-api/oa/dingtalk/attendance/batchUpdate', data })
+}
+
+// 封存考勤数据
+export const saveFalseDiligence = async (params) => {
+  return await request.get({ url: '/admin-api/oa/dingtalk/attendance/confirm', params })
+}
--- a/src/api/home/index.js
+++ b/src/api/home/index.js
@@ -1,20 +0,0 @@
-import request from '@/config/axios'
-// 线索情况
-export const getUserClueCount = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-user-count', params })
-}
-
-// 成交率
-export const getClueSignSignRate = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-sign-rate', params })
-}
-
-// 成交率
-export const getClueSignSignRank = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-sign-top10', params })
-}
-
-// 成交率
-export const getClueFollowRank = async (params) => {
-  return await request.get({ url: '/admin-api/crm/home/get-follow-top10', params })
-}
--- a/src/api/home/salary.js
+++ b/src/api/home/salary.js
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+// 查询工资条
+export const getSalaryPage = async (params) => {
+  return await request.get({ url: '/admin-api/oa/user-salary-grant/periodPage', params })
+}
+
+// 生成工资条
+export const createSalarySlip = async (data) => {
+  return await request.upload({
+    url: '/admin-api/oa/user-salary-grant/import',
+    data,
+    isSubmitForm: true
+  })
+}
+
+// 导入工资条
+export const importSalarySlip = async (data) => {
+  return await request.upload({ url: '/admin-api/oa/user-salary-grant/import/history', data })
+}
+
+// 修改工资条
+export const updateSalarySlip = async (data) => {
+  return await request.put({ url: '/admin-api/oa/user-salary-grant/batchUpdate', data })
+}
+
+// 封存
+export const sealupSalarySlip = async (data) => {
+  return await request.post({ url: '/admin-api/oa/user-salary-grant/confirm', data })
+}
+
+// 获取考勤模板链接
+export const getLinkAttendance = async () => {
+  return await request.download({
+    url: '/admin-api/oa/user-attendance/get-import-template'
+  })
+}
+
+// 获取奖金模板
+export const getLinkReward = async () => {
+  return await request.download({
+    url: '/admin-api/oa/user-salary-grant/get-import-template'
+  })
+}
+
+// 获取历史工资条模板
+export const getLinkHistorySalary = async () => {
+  return await request.download({
+    url: '/admin-api/oa/user-salary-grant/get-import-template/history'
+  })
+}
+
+// 查询提成明细
+export const getCommissionDetail = async (params) => {
+  return await request.get({ url: '/admin-api/oa/user-salary-grant/detail', params })
+}
+
+// 发送工资条通知
+export const sendSalaryNotice = (data) => {
+  return request.post({ url: '/admin-api/oa/user-salary-grant/pushUserSalaryGrantDetail', data })
+}
--- a/src/api/kpi/index.js
+++ b/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'
+  })
+}
--- a/src/api/kpi/score.js
+++ b/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 })
+}
--- a/src/api/mall/product/brand.ts
+++ b/src/api/mall/product/brand.ts
@@ -1,61 +0,0 @@
-import request from '@/config/axios'
-
-/**
- * 商品品牌
- */
-export interface BrandVO {
-  /**
-   * 品牌编号
-   */
-  id?: number
-  /**
-   * 品牌名称
-   */
-  name: string
-  /**
-   * 品牌图片
-   */
-  picUrl: string
-  /**
-   * 品牌排序
-   */
-  sort?: number
-  /**
-   * 品牌描述
-   */
-  description?: string
-  /**
-   * 开启状态
-   */
-  status: number
-}
-
-// 创建商品品牌
-export const createBrand = (data: BrandVO) => {
-  return request.post({ url: '/admin-api/crm/erp-product-brand/create', data, isSubmitForm: true })
-}
-
-// 更新商品品牌
-export const updateBrand = (data: BrandVO) => {
-  return request.put({ url: '/admin-api/crm/erp-product-brand/update', data })
-}
-
-// 删除商品品牌
-export const deleteBrand = (id: number) => {
-  return request.delete({ url: `/admin-api/crm/erp-product-brand/delete?id=${id}` })
-}
-
-// 获得商品品牌
-export const getBrand = (id: number) => {
-  return request.get({ url: `/admin-api/crm/erp-product-brand/get?id=${id}` })
-}
-
-// 获得商品品牌列表
-export const getBrandParam = (params: PageParam) => {
-  return request.get({ url: '/admin-api/crm/erp-product-brand/page', params })
-}
-
-// 获得商品品牌精简信息列表
-export const getSimpleBrandList = () => {
-  return request.get({ url: '/admin-api/crm/erp-product-brand/simple-list' })
-}
--- a/src/api/mall/product/category.ts
+++ b/src/api/mall/product/category.ts
@@ -1,69 +0,0 @@
-import request from '@/config/axios'
-
-/**
- * 产品分类
- */
-export interface CategoryVO {
-  /**
-   * 分类编号
-   */
-  id?: number
-  /**
-   * 父分类编号
-   */
-  parentId?: number
-  /**
-   * 分类名称
-   */
-  name: string
-  /**
-   * 移动端分类图
-   */
-  picUrl: string
-  /**
-   * PC 端分类图
-   */
-  bigPicUrl?: string
-  /**
-   * 分类排序
-   */
-  sort: number
-  /**
-   * 开启状态
-   */
-  status: number
-}
-
-// 创建商品分类
-export const createCategory = (data: CategoryVO) => {
-  return request.post({
-    url: '/admin-api/crm/erp-product-category/create',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 更新商品分类
-export const updateCategory = (data: CategoryVO) => {
-  return request.put({ url: '/admin-api/crm/erp-product-category/update', data })
-}
-
-// 删除商品分类
-export const deleteCategory = (id: number) => {
-  return request.delete({ url: `/admin-api/crm/erp-product-category/delete?id=${id}` })
-}
-
-// 获得商品分类
-export const getCategory = (id: number) => {
-  return request.get({ url: `/admin-api/crm/erp-product-category/get?id=${id}` })
-}
-
-// 获得商品分类列表
-export const getCategoryList = (params: any) => {
-  return request.get({ url: '/admin-api/crm/erp-product-category/list', params })
-}
-
-// 获得商品分类列表
-export const getCategorySimpleList = (params: any) => {
-  return request.get({ url: '/admin-api/crm/erp-product-category/simple-list', params })
-}
--- a/src/api/mall/product/index.js
+++ b/src/api/mall/product/index.js
@@ -1,33 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getProductPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-product/page', params })
-}
-
-// 查询详情
-export const getProduct = async (id) => {
-  return await request.get({ url: '/admin-api/crm/erp-product/get?id=' + id })
-}
-
-// 新增
-export const createProduct = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-product/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateProduct = async (params) => {
-  return await request.put({ url: '/admin-api/crm/erp-product/update', data: params })
-}
-
-// 删除
-export const deleteProduct = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/erp-product/delete?id=' + id })
-}
-
-export const getSimpleProductList = async () => {
-  return await request.get({ url: '/admin-api/crm/erp-product/simple-list' })
-}
--- a/src/api/mall/product/productField.js
+++ b/src/api/mall/product/productField.js
@@ -1,44 +0,0 @@
-import request from '@/config/axios'
-
-// 创建
-export const createField = (data) => {
-  return request.post({
-    url: '/admin-api/crm/param/create',
-    data: { ...data, module: 3 },
-    isSubmitForm: true
-  })
-}
-
-// 更新
-export const updateField = (data) => {
-  return request.put({ url: '/admin-api/crm/param/update', data })
-}
-
-// 删除
-export const deleteField = (id) => {
-  return request.delete({ url: `/admin-api/crm/param/delete?id=${id}` })
-}
-
-// 获得
-export const getField = (id) => {
-  return request.get({ url: `/admin-api/crm/param/get?id=${id}` })
-}
-
-// 获得精简信息列表
-export const getSimpleFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/simple-list', params: { module: 3 } })
-}
-
-// 获取自定义字段
-export const getDiyFieldList = () => {
-  return request.get({ url: '/admin-api/crm/param/get-diy-param', params: { module: 3 } })
-}
-
-// 状态修改
-export const updateFieldStatus = (signParamId, status) => {
-  const data = {
-    signParamId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/param/status/update', data: data })
-}
--- a/src/api/mall/product/property.ts
+++ b/src/api/mall/product/property.ts
@@ -1,107 +0,0 @@
-import request from '@/config/axios'
-
-/**
- * 商品属性
- */
-export interface PropertyVO {
-  id?: number
-  /** 名称 */
-  name: string
-  /** 备注 */
-  remark?: string
-}
-
-/**
- * 属性值
- */
-export interface PropertyValueVO {
-  id?: number
-  /** 属性项的编号 */
-  propertyId?: number
-  /** 名称 */
-  name: string
-  /** 备注 */
-  remark?: string
-}
-
-/**
- * 商品属性值的明细
- */
-export interface PropertyValueDetailVO {
-  /** 属性项的编号 */
-  propertyId: number // 属性的编号
-  /** 属性的名称 */
-  propertyName: string
-  /** 属性值的编号 */
-  valueId: number
-  /** 属性值的名称 */
-  valueName: string
-}
-
-// ------------------------ 属性项 -------------------
-
-// 创建属性项
-export const createProperty = (data: PropertyVO) => {
-  return request.post({
-    url: '/admin-api/crm/erp-product-property/create',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 更新属性项
-export const updateProperty = (data: PropertyVO) => {
-  return request.put({ url: '/product/property/update', data })
-}
-
-// 删除属性项
-export const deleteProperty = (id: number) => {
-  return request.delete({ url: `/product/property/delete?id=${id}` })
-}
-
-// 获得属性项
-export const getProperty = (id: number): Promise<PropertyVO> => {
-  return request.get({ url: `/product/property/get?id=${id}` })
-}
-
-// 获得属性项分页
-export const getPropertyPage = (params: PageParam) => {
-  return request.get({ url: '/product/property/page', params })
-}
-
-// 获得属性项列表
-export const getPropertyList = (params: any) => {
-  return request.get({ url: '/product/property/list', params })
-}
-
-// 获得属性项列表
-export const getPropertyListAndValue = (data: any) => {
-  return request.post({ url: '/product/property/get-value-list', data })
-}
-
-// ------------------------ 属性值 -------------------
-
-// 获得属性值分页
-export const getPropertyValuePage = (params: PageParam & any) => {
-  return request.get({ url: '/product/property/value/page', params })
-}
-
-// 获得属性值
-export const getPropertyValue = (id: number): Promise<PropertyValueVO> => {
-  return request.get({ url: `/product/property/value/get?id=${id}` })
-}
-
-// 创建属性值
-export const createPropertyValue = (data: PropertyValueVO) => {
-  return request.post({ url: '/admin-api/crm/erp-product-property-value/create', data })
-}
-
-// 更新属性值
-export const updatePropertyValue = (data: PropertyValueVO) => {
-  return request.put({ url: '/product/property/value/update', data })
-}
-
-// 删除属性值
-export const deletePropertyValue = (id: number) => {
-  return request.delete({ url: `/product/property/value/delete?id=${id}` })
-}
--- a/src/api/mall/purchase/index.js
+++ b/src/api/mall/purchase/index.js
@@ -1,29 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getPurchasePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-purchase/page', params })
-}
-
-// 新增
-export const createPurchase = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-purchase/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updatePurchase = async (params) => {
-  return await request.put({ url: '/admin-api/crm/erp-purchase/update', data: params })
-}
-
-// 删除
-export const deletePurchase = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/erp-purchase/delete?id=' + id })
-}
-
-// 审核
-export const auditPurchase = async (data) => {
-  return await request.post({ url: '/admin-api/crm/erp-purchase/audit', data })
-}
--- a/src/api/mall/trade/delivery/express/index.ts
+++ b/src/api/mall/trade/delivery/express/index.ts
@@ -1,40 +0,0 @@
-import request from '@/config/axios'
-
-export interface DeliveryExpressVO {
-  id: number
-  code: string
-  name: string
-  logo: string
-  sort: number
-  status: number
-}
-
-// 查询快递公司列表
-export const getDeliveryExpressPage = async (params: PageParam) => {
-  return await request.get({ url: '/trade/delivery/express/page', params })
-}
-
-// 查询快递公司详情
-export const getDeliveryExpress = async (id: number) => {
-  return await request.get({ url: '/trade/delivery/express/get?id=' + id })
-}
-
-// 新增快递公司
-export const createDeliveryExpress = async (data: DeliveryExpressVO) => {
-  return await request.post({ url: '/trade/delivery/express/create', data })
-}
-
-// 修改快递公司
-export const updateDeliveryExpress = async (data: DeliveryExpressVO) => {
-  return await request.put({ url: '/trade/delivery/express/update', data })
-}
-
-// 删除快递公司
-export const deleteDeliveryExpress = async (id: number) => {
-  return await request.delete({ url: '/trade/delivery/express/delete?id=' + id })
-}
-
-// 导出快递公司 Excel
-export const exportDeliveryExpressApi = async (params) => {
-  return await request.download({ url: '/trade/delivery/express/export-excel', params })
-}
--- a/src/api/mall/trade/delivery/expressTemplate/index.ts
+++ b/src/api/mall/trade/delivery/expressTemplate/index.ts
@@ -1,54 +0,0 @@
-import request from '@/config/axios'
-
-export interface DeliveryExpressTemplateVO {
-  id: number
-  name: string
-  chargeMode: number
-  sort: number
-  templateCharge: ExpressTemplateChargeVO[]
-  templateFree: ExpressTemplateFreeVO[]
-}
-
-export declare type ExpressTemplateChargeVO = {
-  areaIds: number[]
-  startCount: number
-  startPrice: number
-  extraCount: number
-  extraPrice: number
-}
-
-export declare type ExpressTemplateFreeVO = {
-  areaIds: number[]
-  freeCount: number
-  freePrice: number
-}
-
-// 查询快递运费模板列表
-export const getDeliveryExpressTemplatePage = async (params: PageParam) => {
-  return await request.get({ url: '/trade/delivery/express-template/page', params })
-}
-
-// 查询快递运费模板详情
-export const getDeliveryExpressTemplate = async (id: number) => {
-  return await request.get({ url: '/trade/delivery/express-template/get?id=' + id })
-}
-
-// 新增快递运费模板
-export const createDeliveryExpressTemplate = async (data: DeliveryExpressTemplateVO) => {
-  return await request.post({ url: '/trade/delivery/express-template/create', data })
-}
-
-// 修改快递运费模板
-export const updateDeliveryExpressTemplate = async (data: DeliveryExpressTemplateVO) => {
-  return await request.put({ url: '/trade/delivery/express-template/update', data })
-}
-
-// 删除快递运费模板
-export const deleteDeliveryExpressTemplate = async (id: number) => {
-  return await request.delete({ url: '/trade/delivery/express-template/delete?id=' + id })
-}
-
-// 导出快递运费模板 Excel
-export const exportDeliveryExpressTemplateApi = async (params) => {
-  return await request.download({ url: '/trade/delivery/express-template/export-excel', params })
-}
--- a/src/api/mall/warehouse/index.js
+++ b/src/api/mall/warehouse/index.js
@@ -1,49 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getWarehousePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-warehouse/page', params })
-}
-
-// 新增
-export const createWarehouse = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-warehouse/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateWarehouse = async (params) => {
-  return await request.put({ url: '/admin-api/crm/erp-warehouse/update', data: params })
-}
-
-// 删除
-export const deleteWarehouse = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/erp-warehouse/delete?id=' + id })
-}
-
-// 获取仓库
-export const getWarehouse = async (id) => {
-  return await request.get({ url: '/admin-api/crm/erp-warehouse/get?id=' + id })
-}
-
-// 获取仓库列表
-export const getSimpleWarehouseList = async () => {
-  return await request.get({ url: '/admin-api/crm/erp-warehouse/simple-list' })
-}
-
-// 获取库存
-export const getInventoryList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-inventory/page', params })
-}
-
-// 获取库存变动记录
-export const getInventoryRecord = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-inventory-record/page', params })
-}
-
-// 获取剩余库存
-export const getRemainInventoryList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/erp-inventory-detail/list', params })
-}
--- a/src/api/okr/comment.js
+++ b/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 }
+  })
+}
--- a/src/api/okr/meeting.js
+++ b/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 }
+  })
+}
--- a/src/api/okr/okr.js
+++ b/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 }
+  })
+}
--- a/src/api/okr/wait.js
+++ b/src/api/okr/wait.js
@@ -0,0 +1,83 @@
+import request from '@/config/axios'
+
+// 创建
+export const createWait = (data) => {
+  return request.post({
+    url: '/admin-api/okr/agent-work/create',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 修改
+export const updateWait = (data) => {
+  return request.put({
+    url: '/admin-api/okr/agent-work/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 分页
+export const getWaitPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/page',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 详情
+export const getWaitDetail = (id) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/get',
+    params: { id }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 删除
+export const deleteWait = (id) => {
+  return request.delete({
+    url: '/admin-api/okr/agent-work/delete',
+    params: { id }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 催办
+export const urgeWait = (workId) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/urge',
+    params: { workId }
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 跟进待办
+export const followWait = (data) => {
+  return request.post({
+    url: '/admin-api/okr/agent-work-follow/create',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 查询跟进记录
+export const getFollowWaitPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work-follow/list',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+export const getWaitCount = (params) => {
+  return request.get({
+    url: '/admin-api/okr/agent-work/getAgentWorkNum',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
--- a/src/api/pers/attendancePlan.js
+++ b/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 } })
+}
--- a/src/api/pers/employee.js
+++ b/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 })
+}
--- a/src/api/school/class/index.js
+++ b/src/api/school/class/index.js
@@ -1,54 +0,0 @@
-import request from '@/config/axios'
-
-// 查询列表-分页
-export const getClassTypePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-class-type/page', params })
-}
-
-export const getClassTypeList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-class-type/list', params })
-}
-
-// 查询详情
-export const getClassType = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sch-class-type/get?id=' + id })
-}
-
-// 新增
-export const createClassType = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-class-type/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateClassType = async (params) => {
-  return await request.put({ url: '/admin-api/crm/sch-class-type/update', data: params })
-}
-
-// 删除
-export const deleteClassType = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sch-class-type/delete?id=' + id })
-}
-
-// 修改状态
-export const updateClassTypeStatus = async (data) => {
-  return request.put({ url: '/admin-api/crm/sch-class-type/status/update', data })
-}
-
-// 批量修改状态
-export const batchUpdateClassTypeStatus = async (data) => {
-  return request.put({ url: '/admin-api/crm/sch-class-type/status/batch-update', data })
-}
-
-// 批量删除
-export const batchDeleteClassType = async (ids) => {
-  return await request.delete({ url: '/admin-api/crm/sch-class-type/batch-delete?ids=' + ids })
-}
-
-// 获取提成结算参数
-export const getCommissionParams = async () => {
-  return await request.get({ url: '/admin-api/crm/sch-class-type/get-percentage-param' })
-}
--- a/src/api/school/place/index.js
+++ b/src/api/school/place/index.js
@@ -1,43 +0,0 @@
-import request from '@/config/axios'
-
-// 查询列表-分页
-export const getPlacePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-place/page', params })
-}
-
-// 查询列表-不分页
-export const getPlaceList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-place/list', params })
-}
-
-// 查询详情
-export const getPlace = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sch-place/get?id=' + id })
-}
-
-// 新增
-export const createPlace = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-place/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updatePlace = async (params) => {
-  return await request.put({ url: '/admin-api/crm/sch-place/update', data: params })
-}
-
-// 删除
-export const deletePlace = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sch-place/delete?id=' + id })
-}
-
-export const updatePlaceStatus = async (placeId, status) => {
-  const data = {
-    placeId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
-}
--- a/src/api/school/sch/index.js
+++ b/src/api/school/sch/index.js
@@ -1,37 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getSchoolPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sch-school/page', params })
-}
-
-// 查询详情
-export const getSchool = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sch-school/get?id=' + id })
-}
-
-// 新增
-export const createSchool = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-school/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateSchool = async (params) => {
-  return await request.put({ url: '/admin-api/crm/sch-school/update', data: params })
-}
-
-// 删除
-export const deleteSchool = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sch-school/delete?id=' + id })
-}
-
-export const updateSchoolStatus = async (schoolId, status) => {
-  const data = {
-    schoolId,
-    status
-  }
-  return request.put({ url: '/admin-api/crm/sch-school/status/update', data: data })
-}
--- a/src/api/system/app/index.js
+++ b/src/api/system/app/index.js
@@ -0,0 +1,5 @@
+import request from '@/config/axios'
+
+export const getSimpleAppList = async () => {
+  return await request.get({ url: '/admin-api/system/serviceInstance/simple-list' })
+}
--- a/src/api/system/dept/index.ts
+++ b/src/api/system/dept/index.ts
@@ -13,8 +13,8 @@ export interface DeptVO {
 }

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

 // 查询部门列表
--- a/src/api/system/dict/dict.data.ts
+++ b/src/api/system/dict/dict.data.ts
@@ -47,3 +47,8 @@ export const deleteDictData = (id: number) => {
 export const exportDictData = (params) => {
  return request.get({ url: '/admin-api/oa/dict-data/export', params })
 }
+
+// 获取通用字典数据
+export const getGeneralSysDictData = (dictType: string) => {
+  return request.get({ url: '/admin-api/system/dict-data/get-by-type', params: { dictType } })
+}
--- a/src/api/system/library/index.js
+++ b/src/api/system/library/index.js
@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 查询知识库列表
-export const getLibraryPage = (params) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib/page', params })
-}
-
-// 查询知识库详情
-export const getLibrary = (id) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib/get?id=' + id })
-}
-
-// 新增知识库
-export const createLibrary = (data) => {
-  return request.post({ url: '/admin-api/crm/knowledge-lib/create', data })
-}
-
-// 修改知识库
-export const updateLibrary = (data) => {
-  return request.put({ url: '/admin-api/crm/knowledge-lib/update', data })
-}
-
-// 删除知识库
-export const deleteLibrary = (id) => {
-  return request.delete({ url: '/admin-api/crm/knowledge-lib/delete?id=' + id })
-}
--- a/src/api/system/library/resource.js
+++ b/src/api/system/library/resource.js
@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 查询资源列表
-export const getResourcePage = (params) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib-info/page', params })
-}
-
-// 查询资源详情
-export const getResource = (id) => {
-  return request.get({ url: '/admin-api/crm/knowledge-lib-info/get?id=' + id })
-}
-
-// 新增资源
-export const createResource = (data) => {
-  return request.post({ url: '/admin-api/crm/knowledge-lib-info/create', data })
-}
-
-// 修改资源
-export const updateResource = (data) => {
-  return request.put({ url: '/admin-api/crm/knowledge-lib-info/update', data })
-}
-
-// 删除资源
-export const deleteResource = (id) => {
-  return request.delete({ url: '/admin-api/crm/knowledge-lib-info/delete?id=' + id })
-}
--- a/src/api/system/notify/message/index.ts
+++ b/src/api/system/notify/message/index.ts
@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import qs from 'qs'

 export interface NotifyMessageVO {
  id: number
@@ -16,35 +15,39 @@ export interface NotifyMessageVO {
 }

 // 查询站内信消息列表
-export const getNotifyMessagePage = async (params: PageParam) => {
+export const getNotifyMessagePage = async (params: any) => {
  return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }

 // 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: PageParam) => {
+export const getMyNotifyMessagePage = async (params: any) => {
  return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }

 // 批量标记已读
-export const updateNotifyMessageRead = async (ids) => {
+export const updateNotifyMessageRead = async (data: any) => {
  return await request.put({
-    url:
-      '/admin-api/system/notify-message/update-read?' +
-      qs.stringify({ ids: ids }, { indices: false })
+    url: '/admin-api/system/notify-message/update-read?',
+    data
  })
 }

 // 标记所有站内信为已读
-export const updateAllNotifyMessageRead = async () => {
-  return await request.put({ url: '/admin-api/system/notify-message/update-all-read' })
+export const updateAllNotifyMessageRead = async (data: any) => {
+  return await request.put({ url: '/admin-api/system/notify-message/update-all-read', data })
 }

 // 获取当前用户的最新站内信列表
-export const getUnreadNotifyMessageList = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list' })
+export const getUnreadNotifyMessageList = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list', params })
 }

 // 获得当前用户的未读站内信数量
-export const getUnreadNotifyMessageCount = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
+export const getUnreadNotifyMessageCount = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count', params })
+}
+
+// 获取详情
+export const getNotifyMessageDetail = async (id: number) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get', params: { id } })
 }
--- a/src/assets/imgs/flag/flag_black.png
+++ b/src/assets/imgs/flag/flag_black.png
--- a/src/assets/imgs/flag/flag_blue.png
+++ b/src/assets/imgs/flag/flag_blue.png
--- a/src/assets/imgs/flag/flag_green.png
+++ b/src/assets/imgs/flag/flag_green.png
--- a/src/assets/imgs/flag/flag_purple.png
+++ b/src/assets/imgs/flag/flag_purple.png
--- a/src/assets/imgs/flag/flag_red.png
+++ b/src/assets/imgs/flag/flag_red.png
--- a/src/assets/imgs/flag/flag_yellow.png
+++ b/src/assets/imgs/flag/flag_yellow.png
--- a/src/assets/imgs/flag/position_black.png
+++ b/src/assets/imgs/flag/position_black.png
--- a/src/assets/imgs/flag/position_blue.png
+++ b/src/assets/imgs/flag/position_blue.png
--- a/src/assets/imgs/flag/position_green.png
+++ b/src/assets/imgs/flag/position_green.png
--- a/src/assets/imgs/flag/position_purple.png
+++ b/src/assets/imgs/flag/position_purple.png
--- a/src/assets/imgs/flag/position_red.png
+++ b/src/assets/imgs/flag/position_red.png
--- a/src/assets/imgs/flag/position_yellow.png
+++ b/src/assets/imgs/flag/position_yellow.png
--- a/src/assets/imgs/login2.gif
+++ b/src/assets/imgs/login2.gif
--- a/src/assets/imgs/shisong.jpg
+++ b/src/assets/imgs/shisong.jpg
--- a/src/components/Crontab/src/Crontab.vue
+++ b/src/components/Crontab/src/Crontab.vue
@@ -542,10 +542,10 @@ const submit = () => {
          <el-form>
            <el-form-item label="类型">
              <el-radio-group v-model="cronValue.second.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
              </el-radio-group>
            </el-form-item>
            <el-form-item v-if="cronValue.second.type == '1'" label="范围">
@@ -601,10 +601,10 @@ const submit = () => {
          <el-form>
            <el-form-item label="类型">
              <el-radio-group v-model="cronValue.minute.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
              </el-radio-group>
            </el-form-item>
            <el-form-item v-if="cronValue.minute.type == '1'" label="范围">
@@ -660,10 +660,10 @@ const submit = () => {
          <el-form>
            <el-form-item label="类型">
              <el-radio-group v-model="cronValue.hour.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
              </el-radio-group>
            </el-form-item>
            <el-form-item v-if="cronValue.hour.type == '1'" label="范围">
@@ -719,12 +719,12 @@ const submit = () => {
          <el-form>
            <el-form-item label="类型">
              <el-radio-group v-model="cronValue.day.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
-                <el-radio-button label="4">本月最后一天</el-radio-button>
-                <el-radio-button label="5">不指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
+                <el-radio-button value="4">本月最后一天</el-radio-button>
+                <el-radio-button value="5">不指定</el-radio-button>
              </el-radio-group>
            </el-form-item>
            <el-form-item v-if="cronValue.day.type == '1'" label="范围">
@@ -780,10 +780,10 @@ const submit = () => {
          <el-form>
            <el-form-item label="类型">
              <el-radio-group v-model="cronValue.month.type">
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
              </el-radio-group>
            </el-form-item>
            <el-form-item v-if="cronValue.month.type == '1'" label="范围">
@@ -840,12 +840,12 @@ const submit = () => {
            <el-form>
              <el-form-item label="类型">
                <el-radio-group v-model="cronValue.week.type">
-                  <el-radio-button label="0">任意值</el-radio-button>
-                  <el-radio-button label="1">范围</el-radio-button>
-                  <el-radio-button label="2">间隔</el-radio-button>
-                  <el-radio-button label="3">指定</el-radio-button>
-                  <el-radio-button label="4">本月最后一周</el-radio-button>
-                  <el-radio-button label="5">不指定</el-radio-button>
+                  <el-radio-button value="0">任意值</el-radio-button>
+                  <el-radio-button value="1">范围</el-radio-button>
+                  <el-radio-button value="2">间隔</el-radio-button>
+                  <el-radio-button value="3">指定</el-radio-button>
+                  <el-radio-button value="4">本月最后一周</el-radio-button>
+                  <el-radio-button value="5">不指定</el-radio-button>
                </el-radio-group>
              </el-form-item>
              <el-form-item v-if="cronValue.week.type == '1'" label="范围">
@@ -919,11 +919,11 @@ const submit = () => {
          <el-form>
            <el-form-item label="类型">
              <el-radio-group v-model="cronValue.year.type">
-                <el-radio-button label="-1">忽略</el-radio-button>
-                <el-radio-button label="0">任意值</el-radio-button>
-                <el-radio-button label="1">范围</el-radio-button>
-                <el-radio-button label="2">间隔</el-radio-button>
-                <el-radio-button label="3">指定</el-radio-button>
+                <el-radio-button value="-1">忽略</el-radio-button>
+                <el-radio-button value="0">任意值</el-radio-button>
+                <el-radio-button value="1">范围</el-radio-button>
+                <el-radio-button value="2">间隔</el-radio-button>
+                <el-radio-button value="3">指定</el-radio-button>
              </el-radio-group>
            </el-form-item>
            <el-form-item v-if="cronValue.year.type == '1'" label="范围">
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -24,7 +24,31 @@ const props = defineProps({
    default: () => undefined
  },
  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)
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -4,9 +4,8 @@
    v-show="total > 0"
    v-model:current-page="currentPage"
    v-model:page-size="pageSize"
-    :small="small"
    :background="true"
-    :page-sizes="[10, 20, 30, 50, 100]"
+    :page-sizes="[10, 20, 50, 100, 200]"
    :pager-count="pagerCount"
    :total="total"
    class="float-right mt-15px mb-15px"
@@ -43,10 +42,6 @@ const props = defineProps({
  layout: {
    type: String,
    default: 'total, sizes, prev, pager, next, jumper'
-  },
-  small: {
-    type: Boolean,
-    default: false
  }
 })

--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -22,13 +22,16 @@
      class="upload-file-uploader"
    >
      <el-button type="primary"><Icon icon="ep:upload-filled" />选取文件</el-button>
-      <template v-if="isShowTip" #tip>
-        <div style="font-size: 12px">
-          大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
-        </div>
-        <div style="font-size: 12px">
-          格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
-        </div>
+      <template #tip>
+        <template v-if="isShowTip">
+          <div style="font-size: 12px">
+            大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+          </div>
+          <div style="font-size: 12px">
+            格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
+          </div>
+        </template>
+        <slot name="tip"></slot>
      </template>
    </el-upload>
  </div>
@@ -47,7 +50,7 @@ const props = defineProps({
  // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
  fileType: propTypes.array.def([]),
  accept: propTypes.string.def('*'),
-  fileSize: propTypes.number.def(5), // 大小限制(MB)
+  fileSize: propTypes.number.def(10), // 大小限制(MB)
  limit: propTypes.number.def(5), // 数量限制
  autoUpload: propTypes.bool.def(true), // 自动上传
  drag: propTypes.bool.def(false), // 拖拽上传
--- a/src/config/axios/index.ts
+++ b/src/config/axios/index.ts
@@ -5,7 +5,7 @@ import { config } from './config'
 const { default_headers } = config

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

 import { resetRouter } from '@/router'
-import { useCache } from '@/hooks/web/useCache'
 import cache from '@/plugins/cache'

 const { result_code, base_url, request_timeout } = config
@@ -67,7 +66,8 @@ service.interceptors.request.use(

    // 设置实例
    const appId = getAppId()
-    if (appId) (config as Recordable).headers['instance-id'] = appId
+    if (appId && !(config as Recordable).headers['instance-id'])
+      (config as Recordable).headers['instance-id'] = appId

    const params = config.params || {}
    const data = config.data || false
@@ -79,7 +79,7 @@ service.interceptors.request.use(
      config.data = qs.stringify(data)
    }
    // get参数编码
-    if (config.method?.toUpperCase() === 'GET' && params) {
+    if (config.method?.toUpperCase() === 'GET' && Object.keys(params).length > 0) {
      config.params = {}
      const paramsStr = qs.stringify(params, { allowDots: true })
      if (paramsStr) {
@@ -137,8 +137,8 @@ service.interceptors.response.use(
    const code = data.code || result_code
    // 二进制数据则直接返回
    if (
-      response.request.responseType === 'blob' ||
-      response.request.responseType === 'arraybuffer'
+      response?.request?.responseType === 'blob' ||
+      response?.request?.responseType === 'arraybuffer'
    ) {
      return response.data
    }
@@ -213,11 +213,10 @@ service.interceptors.response.use(
            type: 'warning'
          }).then(() => {
            // 无访问权限，退出登录
-            const { wsCache } = useCache()
-            const tenantId = wsCache.get('TENANT_ID')
-            const appId = wsCache.get('App_ID')
+            const tenantId = cache.local.get('TENANT_ID')
+            const appId = cache.local.get('App_ID')
            resetRouter() // 重置静态路由表
-            wsCache.clear()
+            cache.local.clear()
            removeToken()
            window.location.href = `/oa/login?tenantId=${tenantId}&appId=${appId}`
          })
@@ -259,11 +258,10 @@ const handleAuthorized = () => {
      confirmButtonText: t('login.relogin'),
      type: 'warning'
    }).then(() => {
-      const { wsCache } = useCache()
-      const tenantId = wsCache.get('TENANT_ID')
-      const appId = wsCache.get('App_ID')
+      const tenantId = cache.local.get('TENANT_ID')
+      const appId = cache.local.get('App_ID')
      resetRouter() // 重置静态路由表
-      wsCache.clear()
+      cache.local.clear()
      removeToken()
      isRelogin.show = false
      // 干掉token后再走一次路由让它过router.beforeEach的校验
--- a/src/directives/permission/hasPermi.ts
+++ b/src/directives/permission/hasPermi.ts
@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'

 const { t } = useI18n() // 国际化

 export function hasPermi(app: App<Element>) {
  app.directive('hasPermi', (el, binding) => {
-    const { wsCache } = useCache()
    const { value } = binding
    const all_permission = '*:*:*'
-    const permissions = wsCache.get(CACHE_KEY.USER).permissions
+    const permissions = cache.local.get(CACHE_KEY.USER)?.permissions || []

    if (value && value instanceof Array && value.length > 0) {
      const permissionFlag = value
--- a/src/directives/permission/hasRole.ts
+++ b/src/directives/permission/hasRole.ts
@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'

 const { t } = useI18n() // 国际化

 export function hasRole(app: App<Element>) {
  app.directive('hasRole', (el, binding) => {
-    const { wsCache } = useCache()
    const { value } = binding
    const super_admin = 'admin'
-    const roles = wsCache.get(CACHE_KEY.USER).roles
+    const roles = cache.local.get(CACHE_KEY.USER).roles

    if (value && value instanceof Array && value.length > 0) {
      const roleFlag = value
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -1,7 +1,9 @@
 <script lang="ts" name="Message" setup>
 import { formatDate } from '@/utils/formatTime'
-import * as NotifyMessageApi from '@/api/system/notify/message'
+// import * as NotifyMessageApi from '@/api/system/notify/message'
+// import { useUserStore } from '@/store/modules/user'

+// const userStore = useUserStore()
 const { push } = useRouter()
 const activeName = ref('notice')
 const unreadCount = ref(0) // 未读消息数量
@@ -9,17 +11,21 @@ const list = ref<any[]>([]) // 消息列表

 // 获得消息列表
 const getList = async () => {
-  list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
+  // list.value = await NotifyMessageApi.getUnreadNotifyMessageList({
+  //   roleId: userStore.getUser?.currentRole
+  // })
  // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
  unreadCount.value = 0
 }

 // 获得未读消息数
-const getUnreadCount = async () => {
-  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
-    unreadCount.value = data
-  })
-}
+// const getUnreadCount = async () => {
+// NotifyMessageApi.getUnreadNotifyMessageCount({ roleId: userStore.getUser?.currentRole }).then(
+//   (data) => {
+//     unreadCount.value = data
+//   }
+// )
+// }

 // 跳转我的站内信
 const goMyList = () => {
@@ -32,7 +38,7 @@ const goMyList = () => {
 const msgInterval = ref<any>(null)
 onMounted(() => {
  // 首次加载小红点
-  getUnreadCount()
+  // getUnreadCount()
  // 轮询刷新小红点
  // msgInterval.value = setInterval(() => {
  //   getUnreadCount()
--- a/src/layout/components/Setting/src/Setting.vue
+++ b/src/layout/components/Setting/src/Setting.vue
@@ -2,7 +2,7 @@
 // import { ElMessage } from 'element-plus'
 // import { useClipboard, useCssVar } from '@vueuse/core'
 import { useCssVar } from '@vueuse/core'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'

 import { setCssVar, trim } from '@/utils'
@@ -13,6 +13,7 @@ import ColorRadioPicker from './components/ColorRadioPicker.vue'
 // import InterfaceDisplay from './components/InterfaceDisplay.vue'
 // import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
 import { useWatermark } from '@/hooks/web/useWatermark'
+import cache from '@/plugins/cache'

 const { setWatermark } = useWatermark()

@@ -195,10 +196,9 @@ watch(

 // 清空缓存
 const clear = () => {
-  const { wsCache } = useCache()
-  wsCache.delete(CACHE_KEY.LAYOUT)
-  wsCache.delete(CACHE_KEY.THEME)
-  wsCache.delete(CACHE_KEY.IS_DARK)
+  cache.local.delete(CACHE_KEY.LAYOUT)
+  cache.local.delete(CACHE_KEY.THEME)
+  cache.local.delete(CACHE_KEY.IS_DARK)
  window.location.reload()
 }
 </script>
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -1,7 +1,7 @@
 <script lang="ts" name="UserInfo" setup>
 import { ElMessageBox } from 'element-plus'

-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
@@ -9,11 +9,10 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
 import { getTenantId, getAppId } from '@/utils/auth'

 import { Setting } from '@/layout/components/Setting'
+import cache from '@/plugins/cache'

 const { t } = useI18n()

-const { wsCache } = useCache()
-
 const { push, replace } = useRouter()

 const userStore = useUserStore()
@@ -24,7 +23,7 @@ const { getPrefixCls } = useDesign()

 const prefixCls = getPrefixCls('user-info')

-const user = wsCache.get(CACHE_KEY.USER)
+const user = cache.local.get(CACHE_KEY.USER)

 const avatar = user.user.avatar ? user.user.avatar : avatarImg

--- a/src/main.js
+++ b/src/main.js
@@ -41,9 +41,14 @@ 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)
--- a/src/permission.js
+++ b/src/permission.js
@@ -7,7 +7,8 @@ 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 { useAppStoreWithOut } from '@/store/modules/app'
+import { getTenantId, getAppId, setTenantId, setAppId } from '@/utils/auth'

 const { start, done } = useNProgress()

@@ -19,13 +20,20 @@ const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/regis
 router.beforeEach(async (to, from, next) => {
  start()
  loadStart()
+  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) {
        await dictStore.setDictMap()
@@ -41,7 +49,10 @@ router.beforeEach(async (to, from, next) => {
        })
        const redirectPath = from.query.redirect || to.path
        const redirect = decodeURIComponent(redirectPath)
-        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        const nextData =
+          to.path === redirect
+            ? { ...to, replace: true, query: to.query }
+            : { path: redirect, query: to.query }
        next(nextData)
      } else {
        next()
@@ -51,17 +62,48 @@ router.beforeEach(async (to, from, next) => {
    if (whiteList.indexOf(to.path) !== -1) {
      next()
    } else {
-      const tenantId = getTenantId()
-      const appId = getAppId()
+      const tenantId = getTenantId() || to.query?.tenantId
+      const appId = getAppId() || to.query?.appId
      if (tenantId && appId) {
-        next(`/oa/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        let redirectPath = to.fullPath
+        const p = to.fullPath.split('?')
+        if (p.length > 1) {
+          // 过滤掉query参数中的tenantId和appId
+          redirectPath =
+            p[0] +
+            '?' +
+            p[1]
+              .split('&')
+              .filter((item) => !item.startsWith('tenantId=') && !item.startsWith('appId='))
+              .join('&')
+        }
+
+        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${redirectPath}`) // 否则全部重定向到登录页
      } else {
-        next(`/oa/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        // next(`/login?redirect=${to.fullPath}`)
+        // 否则全部重定向到平台登陆页
+        window.location.href = 'https://cloud.ahduima.com/ss/login'
      }
    }
  }
 })

+async function waitTime(seconds) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve()
+    }, seconds)
+  })
+}
+
+function setApp(tenantId, appId) {
+  setTenantId(tenantId)
+
+  setAppId(appId)
+  const appStore = useAppStoreWithOut()
+  appStore.setAppInfo(appId)
+}
+
 router.afterEach((to) => {
  useTitle(to?.meta?.title)
  done() // 结束Progress
--- a/src/plugins/cache/index.js
+++ b/src/plugins/cache/index.js
@@ -26,7 +26,7 @@ const sessionCache = {
    let storage = storageStr ? JSON.parse(storageStr) : {}
    return storage[key]
  },
-  remove(key) {
+  delete(key) {
    if (!sessionStorage) {
      return null
    }
@@ -62,7 +62,7 @@ const localCache = {
    let storage = storageStr ? JSON.parse(storageStr) : {}
    return storage[key]
  },
-  remove(key) {
+  delete(key) {
    if (!localStorage) {
      return null
    }
@@ -73,6 +73,10 @@ const localCache = {
    let storage = storageStr ? JSON.parse(storageStr) : {}
    delete storage[key]
    localStorage.setItem(name, JSON.stringify(storage))
+  },
+  clear() {
+    let storage = {}
+    localStorage.setItem(name, JSON.stringify(storage))
  }
 }

--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -110,7 +110,9 @@ const remainingRouter: AppRouteRecordRaw[] = [
  //   path: '/Basic',
  //   component: Layout,
  //   name: 'Basic',
-  //   meta: {},
+  //   meta: {
+  //     title: '菜单管理'
+  //   },
  //   redirect: '/Basic/menu',
  //   children: [
  //     {
@@ -119,7 +121,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
  //       name: 'Menu',
  //       meta: {
  //         canTo: true,
-  //         hidden: true,
+  //         // hidden: true,
  //         noTagsView: false,
  //         icon: 'ep:user',
  //         title: '菜单管理'
@@ -137,6 +139,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
      noTagsView: true
    }
  },
+  {
+    path: '/meeting-summary',
+    component: () => import('@/views/OKR/Meeting/MeetingSummary.vue'),
+    name: 'MeetingSummary',
+    meta: {
+      hidden: true,
+      title: '会议纪要',
+      noTagsView: true
+    }
+  },
  {
    path: '/sso',
    component: () => import('@/views/Login/Login.vue'),
--- a/src/router/modules/static.ts
+++ b/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
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -2,14 +2,13 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { ElementPlusSize } from '@/types/elementPlus'
 import { LayoutType } from '@/types/layout'
 import { ThemeTypes } from '@/types/theme'
 import { getAppInfo } from '@/api/login'

-const { wsCache } = useCache()
-
+import cache from '@/plugins/cache'
 interface AppState {
  breadcrumb: boolean
  breadcrumbIcon: boolean
@@ -46,7 +45,7 @@ export const useAppStore = defineStore('app', {
      sizeMap: ['default', 'large', 'small'],
      mobile: false, // 是否是移动端
      title: import.meta.env.VITE_APP_TITLE, // 标题
-      appInfo: wsCache.get('appInfo'),
+      appInfo: cache.local.get('appInfo'),
      pageLoading: false, // 路由跳转loading

      breadcrumb: true, // 面包屑
@@ -57,19 +56,19 @@ export const useAppStore = defineStore('app', {
      screenfull: true, // 全屏图标
      size: false, // 尺寸图标
      locale: false, // 多语言图标
-      message: true, // 消息图标
+      message: false, // 消息图标
      tagsView: true, // 标签页
      tagsViewIcon: false, // 是否显示标签图标
      logo: true, // logo
      fixedHeader: true, // 固定toolheader
      footer: false, // 显示页脚
      greyMode: false, // 是否开始灰色模式，用于特殊悼念日
-      fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
+      fixedMenu: cache.local.get('fixedMenu') || false, // 是否固定菜单

-      layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
-      isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
-      currentSize: wsCache.get('default') || 'default', // 组件尺寸
-      theme: wsCache.get(CACHE_KEY.THEME) || {
+      layout: cache.local.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
+      isDark: cache.local.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
+      currentSize: cache.local.get('default') || 'default', // 组件尺寸
+      theme: cache.local.get(CACHE_KEY.THEME) || {
        // 主题色
        elColorPrimary: '#409eff',
        // 左侧菜单边框颜色
@@ -225,7 +224,7 @@ export const useAppStore = defineStore('app', {
      this.greyMode = greyMode
    },
    setFixedMenu(fixedMenu: boolean) {
-      wsCache.set('fixedMenu', fixedMenu)
+      cache.local.set('fixedMenu', fixedMenu)
      this.fixedMenu = fixedMenu
    },
    setPageLoading(pageLoading: boolean) {
@@ -237,7 +236,7 @@ export const useAppStore = defineStore('app', {
        return
      }
      this.layout = layout
-      wsCache.set(CACHE_KEY.LAYOUT, this.layout)
+      cache.local.set(CACHE_KEY.LAYOUT, this.layout)
    },
    setTitle(title: string) {
      this.title = title
@@ -251,18 +250,18 @@ export const useAppStore = defineStore('app', {
        document.documentElement.classList.add('light')
        document.documentElement.classList.remove('dark')
      }
-      wsCache.set(CACHE_KEY.IS_DARK, this.isDark)
+      cache.local.set(CACHE_KEY.IS_DARK, this.isDark)
    },
    setCurrentSize(currentSize: ElementPlusSize) {
      this.currentSize = currentSize
-      wsCache.set('currentSize', this.currentSize)
+      cache.local.set('currentSize', this.currentSize)
    },
    setMobile(mobile: boolean) {
      this.mobile = mobile
    },
    setTheme(theme: ThemeTypes) {
      this.theme = Object.assign(this.theme, theme)
-      wsCache.set(CACHE_KEY.THEME, this.theme)
+      cache.local.set(CACHE_KEY.THEME, this.theme)
    },
    setCssVarTheme() {
      for (const key in this.theme) {
@@ -274,7 +273,7 @@ export const useAppStore = defineStore('app', {
    },
    async setAppInfo(appId: number) {
      const appInfo = await getAppInfo(appId)
-      wsCache.set('appInfo', appInfo)
+      cache.local.set('appInfo', appInfo)
      this.appInfo = appInfo
      return appInfo
    }
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -2,9 +2,9 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 // @ts-ignore
 import { DictDataVO } from '@/api/system/dict/types'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-const { wsCache } = useCache('sessionStorage')
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { listSimpleDictData } from '@/api/system/dict/dict.data'
+import cache from '@/plugins/cache'

 export interface DictValueType {
  value: any
@@ -28,7 +28,7 @@ export const useDictStore = defineStore('dict', {
  }),
  getters: {
    getDictMap(): Recordable {
-      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
      if (dictMap) {
        this.dictMap = dictMap
      }
@@ -40,12 +40,12 @@ export const useDictStore = defineStore('dict', {
  },
  actions: {
    async setDictMap() {
-      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
      if (dictMap) {
        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) => {
@@ -64,7 +64,7 @@ export const useDictStore = defineStore('dict', {
        })
        this.dictMap = dictDataMap
        this.isSetDict = true
-        wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
+        cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
      }
    },
    getDictByType(type: string) {
@@ -74,8 +74,8 @@ export const useDictStore = defineStore('dict', {
      return this.dictMap[type]
    },
    async resetDict() {
-      wsCache.delete(CACHE_KEY.DICT_CACHE)
-      const res = await listSimpleDictData()
+      cache.session.delete(CACHE_KEY.DICT_CACHE)
+      const res = (await listSimpleDictData()) || []
      // 设置数据
      const dictDataMap = new Map<string, any>()
      res.forEach((dictData: DictDataVO) => {
@@ -94,7 +94,7 @@ export const useDictStore = defineStore('dict', {
      })
      this.dictMap = dictDataMap
      this.isSetDict = true
-      wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
+      cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
    }
  }
 })
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -2,10 +2,11 @@ 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, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'

-const { wsCache } = useCache()
+import cache from '@/plugins/cache'

 export interface PermissionState {
  routers: AppRouteRecordRaw[]
@@ -34,9 +35,28 @@ export const usePermissionStore = defineStore('permission', {
    async generateRoutes(): Promise<unknown> {
      return new Promise<void>(async (resolve) => {
        let res: AppCustomRouteRecordRaw[] = []
-        if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
-          res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+        if (cache.local.get(CACHE_KEY.ROLE_ROUTERS)) {
+          res = cache.local.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
        }
+        const staticRouters = cloneDeep(staticRouter)
+        // 与动态路由比较，首先判断目录是否存在，如果存在就合并，并替换动态路由中的目录
+        staticRouters.forEach((item) => {
+          const index = res.findIndex((item2) => item2.path === item.path)
+          if (index !== -1) {
+            const arr = []
+            if (!item.children || item.children.length === 0) {
+              item.children = arr
+            }
+            if (res[index].children && res[index].children.length > 0) {
+              item.children = item.children.concat(res[index].children)
+            }
+            // routerMap[index].children = item.children
+            // 插入动态路由数组的第二位
+            res[index] = { ...res, ...item }
+          } else {
+            res = [...staticRouters, ...res]
+          }
+        })
        const routerMap: AppRouteRecordRaw[] = generateRoute(res)
        // 动态路由，404一定要放到最后面
        this.addRouters = routerMap.concat([
@@ -50,6 +70,7 @@ export const usePermissionStore = defineStore('permission', {
            }
          }
        ])
+
        // 渲染菜单的所有路由
        this.routers = cloneDeep(remainingRouter).concat(routerMap)
        resolve()
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,10 +1,10 @@
 import { store } from '../index'
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { getInfo, loginOut } from '@/api/login'

-const { wsCache } = useCache()
+import cache from '@/plugins/cache'

 interface UserVO {
  id: number
@@ -49,21 +49,21 @@ export const useUserStore = defineStore('admin-user', {
        this.resetState()
        return null
      }
-      let userInfo = wsCache.get(CACHE_KEY.USER)
-      if (!userInfo) {
+      let userInfo = cache.local.get(CACHE_KEY.USER)
+      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
        userInfo = await getInfo({})
      }
      this.permissions = userInfo.permissions
      this.roles = userInfo.roles
      this.user = userInfo.user
      this.isSetUser = true
-      wsCache.set(CACHE_KEY.USER, userInfo)
-      wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
+      cache.local.set(CACHE_KEY.USER, userInfo)
+      cache.local.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
    },
    async loginOut() {
      await loginOut()
      removeToken()
-      wsCache.clear()
+      // cache.local.clear()
      this.resetState()
    },
    resetState() {
@@ -75,9 +75,10 @@ export const useUserStore = defineStore('admin-user', {
        avatar: '',
        nickname: ''
      }
+      cache.local.delete(CACHE_KEY.USER)
    },
    refresh() {
-      wsCache.delete(CACHE_KEY.USER)
+      cache.local.delete(CACHE_KEY.USER)
      this.resetState()
      window.location.href = ''
    }
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -69,3 +69,41 @@
    width: 100%;
  }
 }
+
+
+.dialog-okr {
+  width: 94vw;
+  height: 94vh;
+  max-width: 1800px;
+  max-height: 1000px;
+  margin: 0;
+}
+.dialog-okr .el-dialog__header {
+  padding: 0 !important;
+}
+.okr-info-dialog {
+  .el-dialog__body {
+    padding-top: 0;
+  }
+}
+
+/* 去除 Chrome、Safari、Edge、Opera 中的指示器 */
+.el-input__inner::-webkit-outer-spin-button,
+.el-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* 去除 Firefox 中的指示器 */
+.el-input__inner[type='number'] {
+  -moz-appearance: textfield;
+}
+.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;
+}
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,8 +1,7 @@
-import { useCache } from '@/hooks/web/useCache'
 import { TokenType } from '@/api/login/types'
 import { decrypt, encrypt } from '@/utils/jsencrypt'

-const { wsCache } = useCache()
+import cache from '@/plugins/cache'

 const AccessTokenKey = 'ACCESS_TOKEN'
 const RefreshTokenKey = 'REFRESH_TOKEN'
@@ -10,24 +9,34 @@ const RefreshTokenKey = 'REFRESH_TOKEN'
 // 获取token
 export const getAccessToken = () => {
  // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.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 wsCache.get(RefreshTokenKey)
+  return localStorage.getItem(RefreshTokenKey)
+  // return cache.local.get(RefreshTokenKey)
 }

 // 设置token
 export const setToken = (token: TokenType) => {
-  wsCache.set(RefreshTokenKey, token.refreshToken, { exp: token.expiresTime })
-  wsCache.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 = () => {
-  wsCache.delete(AccessTokenKey)
-  wsCache.delete(RefreshTokenKey)
+  localStorage.removeItem(AccessTokenKey)
+  localStorage.removeItem(RefreshTokenKey)
+  // cache.local.delete(AccessTokenKey)
+  // cache.local.delete(RefreshTokenKey)
 }

 /** 格式化token（jwt格式） */
@@ -47,7 +56,7 @@ export type LoginFormType = {
 }

 export const getLoginForm = () => {
-  const loginForm: LoginFormType = wsCache.get(LoginFormKey)
+  const loginForm: LoginFormType = cache.local.get(LoginFormKey)
  if (loginForm) {
    loginForm.password = decrypt(loginForm.password) as string
  }
@@ -56,11 +65,11 @@ export const getLoginForm = () => {

 export const setLoginForm = (loginForm: LoginFormType) => {
  loginForm.password = encrypt(loginForm.password) as string
-  wsCache.set(LoginFormKey, loginForm, { exp: 30 * 24 * 60 * 60 })
+  cache.local.set(LoginFormKey, loginForm)
 }

 export const removeLoginForm = () => {
-  wsCache.delete(LoginFormKey)
+  cache.local.delete(LoginFormKey)
 }

 // ========== 租户相关 ==========
@@ -69,52 +78,52 @@ const TenantIdKey = 'TENANT_ID'
 const TenantNameKey = 'TENANT_NAME'

 export const getTenantName = () => {
-  return wsCache.get(TenantNameKey)
+  return cache.local.get(TenantNameKey)
 }

 export const setTenantName = (username: string) => {
-  wsCache.set(TenantNameKey, username, { exp: 30 * 24 * 60 * 60 })
+  cache.local.set(TenantNameKey, username)
 }

 export const removeTenantName = () => {
-  wsCache.delete(TenantNameKey)
+  cache.local.delete(TenantNameKey)
 }

 export const getTenantId = () => {
-  return wsCache.get(TenantIdKey)
+  return cache.local.get(TenantIdKey)
 }

 export const setTenantId = (username: string) => {
-  wsCache.set(TenantIdKey, username)
+  cache.local.set(TenantIdKey, username)
 }

 export const removeTenantId = () => {
-  wsCache.delete(TenantIdKey)
+  cache.local.delete(TenantIdKey)
 }

 const AppIdKey = 'App_ID'
 const AppNameKey = 'App_NAME'

 export const getAPPName = () => {
-  return wsCache.get(AppNameKey)
+  return cache.local.get(AppNameKey)
 }

 export const setAppName = (name: string) => {
-  wsCache.set(AppNameKey, name, { exp: 30 * 24 * 60 * 60 })
+  cache.local.set(AppNameKey, name)
 }

 export const removeAppName = () => {
-  wsCache.delete(AppNameKey)
+  cache.local.delete(AppNameKey)
 }

 export const getAppId = () => {
-  return wsCache.get(AppIdKey)
+  return cache.local.get(AppIdKey)
 }

 export const setAppId = (id: number) => {
-  wsCache.set(AppIdKey, id)
+  cache.local.set(AppIdKey, id)
 }

 export const removeAppId = () => {
-  wsCache.delete(AppIdKey)
+  cache.local.delete(AppIdKey)
 }
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -1,6 +1,7 @@
 const download0 = (data: Blob, fileName: string, mineType: string) => {
  // 创建 blob
  const blob = new Blob([data], { type: mineType })
+
  // 创建 href 超链接，点击进行下载
  window.URL = window.URL || window.webkitURL
  const href = URL.createObjectURL(blob)
@@ -15,7 +16,11 @@ const download0 = (data: Blob, fileName: string, mineType: string) => {
 const download = {
  // 下载 Excel 方法
  excel: (data: Blob, fileName: string) => {
-    download0(data, fileName, 'application/vnd.ms-excel')
+    download0(
+      data,
+      fileName,
+      'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+    )
  },
  // 下载 Word 方法
  word: (data: Blob, fileName: string) => {
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -213,10 +213,37 @@ export const fenToYuan = (amount: string | number): number => {
 export const removeNullField = (obj: Object) => {
  for (const key in obj) {
    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (obj[key] == '') {
+      if (obj[key] === '' || obj[key] === null || obj[key] === undefined) {
        delete obj[key]
      }
    }
  }
  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
+  // });
+}
--- a/src/utils/permission.ts
+++ b/src/utils/permission.ts
@@ -1,4 +1,5 @@
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'

 const { t } = useI18n() // 国际化

@@ -9,10 +10,9 @@ const { t } = useI18n() // 国际化
 */
 export function checkPermi(value: string[]) {
  if (value && value instanceof Array && value.length > 0) {
-    const { wsCache } = useCache()
    const permissionDatas = value
    const all_permission = '*:*:*'
-    const permissions = wsCache.get(CACHE_KEY.USER).permissions
+    const permissions = cache.local.get(CACHE_KEY.USER).permissions
    const hasPermission = permissions.some((permission) => {
      return all_permission === permission || permissionDatas.includes(permission)
    })
@@ -30,10 +30,9 @@ export function checkPermi(value: string[]) {
 */
 export function checkRole(value: string[]) {
  if (value && value instanceof Array && value.length > 0) {
-    const { wsCache } = useCache()
    const permissionRoles = value
    const super_admin = 'admin'
-    const roles = wsCache.get(CACHE_KEY.USER).roles
+    const roles = cache.local.get(CACHE_KEY.USER).roles
    const hasRole = roles.some((role) => {
      return super_admin === role || permissionRoles.includes(role)
    })
--- a/src/views/Basic/Dept/DeptForm.vue
+++ b/src/views/Basic/Dept/DeptForm.vue
@@ -30,11 +30,18 @@
      <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
+              filterable
+              placeholder="请输入负责人"
+            >
              <el-option
-                v-for="item in userList"
+                v-for="item in employeeOptions"
                :key="item.id"
-                :label="item.nickname"
+                :disabled="item.status == 1"
+                :label="item.name"
                :value="item.id"
              />
            </el-select>
@@ -43,8 +50,8 @@
        <el-col :span="12" :offset="0">
          <el-form-item label="状态" prop="status">
            <el-radio-group v-model="formData.status">
-              <el-radio :label="0"> 启用 </el-radio>
-              <el-radio :label="1"> 禁用 </el-radio>
+              <el-radio :value="0"> 启用 </el-radio>
+              <el-radio :value="1"> 禁用 </el-radio>
            </el-radio-group>
          </el-form-item>
        </el-col>
@@ -55,6 +62,24 @@
            <el-input-number v-model="formData.sort" :min="0" />
          </el-form-item>
        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="业务系统" prop="instanceId">
+            <el-select
+              v-model="formData.instanceId"
+              placeholder="选择主业务系统"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in instanceIdOptions"
+                :key="item.instanceId"
+                :label="item.instanceName"
+                :disabled="item.status == 1"
+                :value="item.instanceId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
      </el-row>
      <el-row :gutter="20">
        <el-col :span="24" :offset="0">
@@ -73,8 +98,9 @@
 <script lang="ts" name="SystemDeptForm" setup>
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
-import * as UserApi from '@/api/system/user'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
 import { CommonStatusEnum } from '@/utils/constants'
+import { getSimpleAppList } from '@/api/system/app'

 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -83,15 +109,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  parentId: undefined,
-  name: undefined,
-  sort: 1,
-  leaderUserId: undefined,
-  status: CommonStatusEnum.ENABLE,
-  remark: undefined
-})
+const formData = ref<any>({})
 const formRules = reactive<any>({
  parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
  name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
@@ -104,7 +122,8 @@ const formRules = reactive<any>({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const employeeOptions = ref<any>([]) // 用户列表
+const instanceIdOptions = ref<any>([]) // 实例ids

 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -117,12 +136,23 @@ const open = async (type: string, id?: number) => {
    formLoading.value = true
    try {
      formData.value = await DeptApi.getDept(id)
+      formData.value.remark = formData.value.remark || ''
+      formData.value.leaderUserId = formData.value.leaderUserId?.map((it) => it + '') || []
    } finally {
      formLoading.value = false
    }
  }
  // 获得用户列表
-  userList.value = await UserApi.getSimpleUserList()
+  getEmployeeSimpleList().then((data) => {
+    employeeOptions.value = data.map((it) => ({
+      ...it,
+      id: it.id + ''
+    }))
+  })
+  //实例
+  getSimpleAppList().then((data) => {
+    instanceIdOptions.value = data
+  })
  // 获得部门树
  await getTree()
 }
@@ -161,9 +191,10 @@ const resetForm = () => {
    parentId: undefined,
    name: undefined,
    sort: 1,
-    leaderUserId: undefined,
+    leaderUserId: [],
    status: CommonStatusEnum.ENABLE,
-    remark: undefined
+    remark: undefined,
+    instanceId: undefined
  }
  formRef.value?.resetFields()
 }
@@ -171,7 +202,7 @@ const resetForm = () => {
 /** 获得部门树 */
 const getTree = async () => {
  deptTree.value = []
-  const data = await DeptApi.getSimpleDeptList()
+  const data = await DeptApi.getSimpleDeptList({ allFlag: true })
  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
  dept.children = handleTree(data)
  deptTree.value.push(dept)
--- a/src/views/Basic/Dept/index.vue
+++ b/src/views/Basic/Dept/index.vue
@@ -21,9 +21,16 @@
  <!-- 列表 -->
  <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="sort" label="排序" width="200" />
-    <el-table-column prop="status" label="状态" width="100" />
+    <el-table-column prop="leaderUserName" label="负责人" width="120" />
+    <el-table-column prop="instanceName" label="业务系统" width="200" />
+    <el-table-column prop="sort" label="排序" width="80" />
+    <el-table-column prop="status" label="状态" width="100">
+      <template #default="scope">
+        <el-tag :type="scope.row.status == 0 ? 'success' : 'danger'">
+          {{ scope.row.status == 0 ? '正常' : '停用' }}
+        </el-tag>
+      </template>
+    </el-table-column>
    <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
    <el-table-column label="操作" class-name="fixed-width" width="160">
      <template #default="scope">
@@ -61,6 +68,7 @@ const { t } = useI18n() // 国际化
 const loading = ref(true) // 列表的加载中
 const list = ref() // 列表的数据
 const queryParams = reactive({
+  allFlag: true,
  name: undefined
 })
 const queryFormRef = ref() // 搜索的表单
--- a/src/views/Basic/Menu/MenuForm.vue
+++ b/src/views/Basic/Menu/MenuForm.vue
@@ -32,9 +32,9 @@
      </el-form-item>
      <el-form-item label="菜单类型" prop="type">
        <el-radio-group v-model="formData.type">
-          <el-radio-button :label="1"> 目录 </el-radio-button>
-          <el-radio-button :label="2"> 菜单 </el-radio-button>
-          <el-radio-button :label="3"> 按钮 </el-radio-button>
+          <el-radio-button :value="1"> 目录 </el-radio-button>
+          <el-radio-button :value="2"> 菜单 </el-radio-button>
+          <el-radio-button :value="3"> 按钮 </el-radio-button>
        </el-radio-group>
      </el-form-item>
      <el-form-item v-if="formData.type !== 3" label="菜单图标">
@@ -69,8 +69,8 @@
      </el-form-item>
      <el-form-item label="菜单状态" prop="status">
        <el-radio-group v-model="formData.status">
-          <el-radio :label="0"> 启用 </el-radio>
-          <el-radio :label="1"> 禁用 </el-radio>
+          <el-radio :value="0"> 启用 </el-radio>
+          <el-radio :value="1"> 禁用 </el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item v-if="formData.type !== 3" label="显示状态" prop="visible">
@@ -116,11 +116,11 @@
 <script lang="ts" name="SystemMenuForm" setup>
 // import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as MenuApi from '@/api/system/menu'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import { CommonStatusEnum, SystemMenuTypeEnum } from '@/utils/constants'
 import { defaultProps, handleTree } from '@/utils/tree'
+import cache from '@/plugins/cache'

-const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

@@ -218,7 +218,7 @@ const submitForm = async () => {
  } finally {
    formLoading.value = false
    // 清空，从而触发刷新
-    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
+    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
  }
 }

--- a/src/views/Basic/Menu/index.vue
+++ b/src/views/Basic/Menu/index.vue
@@ -88,8 +88,8 @@
 import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-const { wsCache } = useCache()
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

@@ -145,7 +145,7 @@ const refreshMenu = async () => {
  try {
    await message.confirm('即将更新缓存刷新浏览器！', '刷新菜单缓存')
    // 清空，从而触发刷新
-    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
+    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
    // 刷新浏览器
    location.reload()
  } catch {}
--- a/src/views/Basic/Role/Comp/RoleEmployee.vue
+++ b/src/views/Basic/Role/Comp/RoleEmployee.vue
@@ -9,6 +9,18 @@
        :label="col.label"
        :width="col.width"
      />
+      <el-table-column label="状态" key="status">
+        <template #default="scope">
+          <el-switch
+            v-model="scope.row.status"
+            :active-value="0"
+            active-text="在职"
+            inactive-text="离职"
+            :inactive-value="1"
+            disabled
+          />
+        </template>
+      </el-table-column>
    </el-table>
    <Pagination
      v-model:limit="pageSize"
--- a/src/views/Basic/User/UserForm.vue
+++ b/src/views/Basic/User/UserForm.vue
@@ -13,11 +13,11 @@
            <el-input v-model="formData.nickname" placeholder="请输入用户姓名" />
          </el-form-item>
        </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
          <el-form-item label="用户性别">
            <el-radio-group v-model="formData.sex">
-              <el-radio :label="1"> 男 </el-radio>
-              <el-radio :label="2"> 女 </el-radio>
+              <el-radio :value="1"> 男 </el-radio>
+              <el-radio :value="2"> 女 </el-radio>
            </el-radio-group>
          </el-form-item>
        </el-col>
@@ -34,7 +34,7 @@
              placeholder="请选择归属部门"
            />
          </el-form-item>
-        </el-col>
+        </el-col> -->
        <el-col :span="12">
          <el-form-item label="角色" prop="role">
            <el-select
@@ -84,7 +84,7 @@
          </el-form-item>
        </el-col>
      </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
        <el-col :span="12" :offset="0">
          <el-form-item label="入职日期" prop="hireDate">
            <el-date-picker
@@ -96,7 +96,7 @@
            />
          </el-form-item>
        </el-col>
-      </el-row>
+      </el-row> -->
      <el-row :gutter="20">
        <el-col :span="24">
          <el-form-item label="备注">
@@ -113,7 +113,8 @@
 </template>
 <script lang="ts" name="SystemUserForm" setup>
 import { CommonStatusEnum } from '@/utils/constants'
-import { defaultProps, handleTree } from '@/utils/tree'
+// import { defaultProps, handleTree } from '@/utils/tree'
+import { handleTree } from '@/utils/tree'
 import { formatDate } from '@/utils/formatTime'

 import * as RoleApi from '@/api/system/role'
@@ -174,7 +175,7 @@ const open = async (type: string, id?: number) => {
    }
  }
  // 加载部门树
-  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList({ allFlag: false }))
  // 加载岗位列表
  roleOptions.value = await RoleApi.getSimpleRoleList()
 }
--- a/src/views/Basic/User/index.vue
+++ b/src/views/Basic/User/index.vue
@@ -1,103 +1,100 @@
 <template>
-  <el-row :gutter="20">
-    <!-- 左侧部门树 -->
-    <el-col :span="4" :xs="24">
+  <!-- <el-row :gutter="20"> -->
+  <!-- 左侧部门树 -->
+  <!-- <el-col :span="4" :xs="24">
      <DeptTree @node-click="handleDeptNodeClick" />
    </el-col>
-    <el-col :span="20" :xs="24">
-      <!-- 搜索 -->
-      <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
-        <el-form-item label="登录账号" prop="username">
-          <el-input
-            v-model="queryParams.username"
-            placeholder="请输入登录账号"
-            clearable
-            @keyup.enter="handleQuery"
-            class="!w-240px"
-          />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="mobile">
-          <el-input
-            v-model="queryParams.mobile"
-            placeholder="请输入手机号码"
-            clearable
-            @keyup.enter="handleQuery"
-            class="!w-240px"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
-          <el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
-          <el-button
-            type="primary"
-            plain
-            @click="openForm('create')"
-            v-hasPermi="['basic:employee:add']"
-          >
-            新增
-          </el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" :data="list">
-        <el-table-column label="用户编号" key="id" prop="id" />
-        <el-table-column label="登录账号" prop="username" />
-        <el-table-column label="用户姓名" prop="nickname" />
-        <el-table-column label="部门" key="deptName" prop="deptName" />
-        <el-table-column label="手机号码" prop="mobile" width="120" />
-        <el-table-column label="状态" key="status">
-          <template #default="scope">
-            <el-switch
-              v-model="scope.row.status"
-              :active-value="0"
-              :inactive-value="1"
-              v-hasPermi="['basic:employee:update']"
-              @change="handleStatusChange(scope.row)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="createTime"
-          width="180"
-          :formatter="dateFormatter"
-        />
-        <el-table-column label="操作" width="260">
-          <template #default="scope">
-            <el-button
-              type="primary"
-              link
-              @click="openForm('update', scope.row.id)"
-              v-hasPermi="['basic:employee:update']"
-            >
-              修改
-            </el-button>
-            <el-button
-              type="primary"
-              link
-              @click="handleDelete(scope.row.id)"
-              v-hasPermi="['basic:employee:delete']"
-            >
-              删除
-            </el-button>
-            <el-button
-              type="primary"
-              link
-              @click="handleResetPwd(scope.row)"
-              v-hasPermi="['basic:employee:password']"
-            >
-              重置密码
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getList"
+    <el-col :span="20" :xs="24"> -->
+  <!-- 搜索 -->
+  <el-form :model="queryParams" ref="queryFormRef" inline label-width="0">
+    <el-form-item prop="nickname">
+      <el-input
+        v-model="queryParams.nickname"
+        placeholder="请输入姓名"
+        clearable
+        @keyup.enter="handleQuery"
+        class="!w-240px"
      />
-    </el-col>
-  </el-row>
+    </el-form-item>
+    <el-form-item prop="mobile">
+      <el-input
+        v-model="queryParams.mobile"
+        placeholder="请输入手机号码"
+        clearable
+        @keyup.enter="handleQuery"
+        class="!w-240px"
+      />
+    </el-form-item>
+    <el-form-item>
+      <el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
+      <el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
+      <el-button
+        type="primary"
+        plain
+        @click="openForm('create')"
+        v-hasPermi="['basic:employee:add']"
+      >
+        新增
+      </el-button>
+    </el-form-item>
+  </el-form>
+  <el-table v-loading="loading" :data="list">
+    <el-table-column label="用户编号" key="id" prop="id" />
+    <el-table-column label="登录账号" prop="username" />
+    <el-table-column label="用户姓名" prop="nickname" />
+    <!-- <el-table-column label="部门" key="deptName" prop="deptName" /> -->
+    <el-table-column label="手机号码" prop="mobile" width="120" />
+    <el-table-column label="状态" key="status">
+      <template #default="scope">
+        <el-switch
+          v-model="scope.row.status"
+          :active-value="0"
+          :inactive-value="1"
+          active-text="在职"
+          inactive-text="离职"
+          v-hasPermi="['basic:employee:update']"
+          @change="handleStatusChange(scope.row)"
+        />
+      </template>
+    </el-table-column>
+    <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
+    <el-table-column label="操作" width="260">
+      <template #default="scope">
+        <el-button
+          type="primary"
+          link
+          @click="openForm('update', scope.row.id)"
+          v-hasPermi="['basic:employee:update']"
+        >
+          修改
+        </el-button>
+        <el-button
+          type="primary"
+          link
+          @click="handleDelete(scope.row.id)"
+          v-hasPermi="['basic:employee:delete']"
+        >
+          删除
+        </el-button>
+        <el-button
+          type="primary"
+          link
+          @click="handleResetPwd(scope.row)"
+          v-hasPermi="['basic:employee:password']"
+        >
+          重置密码
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  <Pagination
+    :total="total"
+    v-model:page="queryParams.pageNo"
+    v-model:limit="queryParams.pageSize"
+    @pagination="getList"
+  />
+  <!-- </el-col> -->
+  <!-- </el-row> -->

  <!-- 添加或修改用户对话框 -->
  <UserForm ref="formRef" @success="getList" />
@@ -107,7 +104,7 @@ import { CommonStatusEnum } from '@/utils/constants'
 import { dateFormatter } from '@/utils/formatTime'
 import * as UserApi from '@/api/system/user'
 import UserForm from './UserForm.vue'
-import DeptTree from './DeptTree.vue'
+// import DeptTree from './DeptTree.vue'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化

@@ -118,6 +115,7 @@ const queryParams = reactive({
  pageNo: 1,
  pageSize: 10,
  username: undefined,
+  nickname: undefined,
  mobile: undefined,
  deptId: undefined
 })
@@ -147,11 +145,11 @@ const resetQuery = () => {
  handleQuery()
 }

-/** 处理部门被点击 */
-const handleDeptNodeClick = async (row) => {
-  queryParams.deptId = row.id
-  await getList()
-}
+// /** 处理部门被点击 */
+// const handleDeptNodeClick = async (row) => {
+//   queryParams.deptId = row.id
+//   await getList()
+// }

 /** 添加/修改操作 */
 const formRef = ref()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
qsh	183416a1b3	sc	2025-08-20 11:46:34 +08:00
qsh	c786995532	sc	2025-08-12 11:05:11 +08:00
qsh	1d3b4944e5	sc	2025-08-11 18:39:20 +08:00
qsh	7f10d7bcd7	sc	2025-08-11 18:17:59 +08:00
qsh	21b8f1bb12	sc	2025-08-11 18:04:34 +08:00
qsh	5c53cabf22	sc	2025-08-05 17:15:53 +08:00
qsh	9b68a06bae	sc	2025-07-17 14:42:31 +08:00
qsh	e620cc5cd6	sc	2025-06-17 10:35:05 +08:00
qsh	c4c4e49b39	sc	2025-06-13 15:18:00 +08:00
qsh	f0020d5c82	sc	2025-06-13 10:40:03 +08:00
qsh	03467e1d6e	sc	2025-06-09 18:26:44 +08:00
qsh	15f83f7193	sc	2025-06-09 18:15:36 +08:00
qsh	e45cf7db0c	sc	2025-06-06 11:15:05 +08:00
qsh	80d9e93e46	sc	2025-06-05 18:25:04 +08:00
qsh	ec34235cc2	sc	2025-06-04 18:05:16 +08:00
qsh	0409e9ef11	sc	2025-06-03 18:12:32 +08:00
qsh	f3293ef14d	sc	2025-06-03 14:49:59 +08:00
qsh	26ff7cd434	sc	2025-06-03 12:16:54 +08:00
qsh	b15e0d0f8f	sc	2025-05-29 16:18:18 +08:00
qsh	e5e86e24e5	sc	2025-05-28 12:04:02 +08:00
qsh	33965c55f9	sc	2025-05-27 10:54:59 +08:00
qsh	683bfa0d38	sc	2025-05-23 17:23:49 +08:00
qsh	83793b6591	sc	2025-05-19 14:26:58 +08:00
qsh	ab4d644526	sc	2025-05-19 11:38:58 +08:00
qsh	3e8a9220f6	sc	2025-05-19 11:26:55 +08:00
qsh	8f20e04701	sc	2025-04-29 18:46:16 +08:00
qsh	e007be1f2d	sc	2025-04-28 16:18:48 +08:00
qsh	1f29e02135	sc	2025-04-27 18:24:56 +08:00
qsh	8f2ac77fd1	sc	2025-04-27 16:47:47 +08:00
qsh	dc449979fa	sc	2025-04-25 19:07:50 +08:00
qsh	ff3f4d9e47	sc	2025-04-22 15:18:08 +08:00
qsh	5098a5cf01	sc	2025-04-21 10:23:34 +08:00
qsh	5ee61f7f6b	sc	2025-04-16 01:31:23 +08:00
qsh	51140a3c41	sc	2025-04-15 18:46:03 +08:00
qsh	53d66f9676	sc	2025-04-15 15:27:37 +08:00
qsh	f2f14789f0	sc	2025-04-15 12:45:33 +08:00
qsh	f93e1f7187	sc	2025-04-14 17:07:21 +08:00
zcx	74efe8409f	Merge pull request '部门修改' (#7 ) from dev-zcx into main Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web/pulls/7	2025-04-14 14:21:30 +08:00
zcx	85f5b87f84	部门修改	2025-04-12 20:23:07 +08:00
qsh	0253dfa47f	sc	2025-04-11 18:50:46 +08:00
qsh	81a3847992	sc	2025-04-11 17:24:41 +08:00
qsh	49b5d302a9	sc	2025-04-07 16:57:03 +08:00
qsh	8a2d976552	sc	2025-03-31 17:45:00 +08:00
qsh	f1d2449599	sc	2025-03-31 12:26:37 +08:00
qsh	e97de4342c	sc	2025-03-31 12:21:54 +08:00
qsh	bfdbef4bd7	sc	2025-03-31 12:12:41 +08:00
qsh	c519172f5e	sc	2025-03-28 15:18:52 +08:00
qsh	41d52f4ce7	sc	2025-03-27 19:25:08 +08:00
qsh	79530d221f	sc	2025-03-25 17:14:54 +08:00
qsh	d6bfbcf96a	sc	2025-03-25 16:27:52 +08:00
qsh	b155d3ce9e	sc	2025-03-21 11:37:25 +08:00
qsh	5097cf38f6	sc	2025-03-12 12:06:16 +08:00
qsh	ae11ac4dc7	sc	2025-03-12 11:51:36 +08:00
qsh	b0573fdf17	sc	2025-03-11 18:22:40 +08:00
qsh	b91fe3b05a	sc	2025-03-10 17:37:22 +08:00
qsh	75572f6104	sc	2025-03-10 14:01:38 +08:00
qsh	a712e3f85f	sc	2025-02-19 11:25:35 +08:00
qsh	a5a64b7131	sc	2025-02-17 14:12:34 +08:00
qsh	b196135ddb	sc	2025-01-17 11:59:20 +08:00
qsh	34de068ffa	sc	2025-01-16 16:06:12 +08:00
qsh	b1feb33c00	sc	2025-01-14 17:40:36 +08:00
qsh	853a18df9b	sc	2024-12-30 18:05:46 +08:00
qsh	288770adce	sc	2024-12-30 17:42:54 +08:00
qsh	7bb3a74095	sc	2024-12-26 17:11:17 +08:00
qsh	34a1fc56d3	sc	2024-12-25 17:05:06 +08:00
qsh	926cefaee9	sc	2024-12-24 17:28:34 +08:00
qsh	e5e141fb84	sc	2024-12-24 11:34:58 +08:00
qsh	ca10366398	sc	2024-12-23 17:51:29 +08:00
qsh	d39ea3270e	sc	2024-12-23 15:05:40 +08:00
qsh	4726770e3f	sc	2024-12-11 16:27:31 +08:00
qsh	514b602599	sc	2024-12-10 17:39:40 +08:00
qsh	17208922ad	sc	2024-12-10 17:17:14 +08:00
qsh	82f7d4be5e	sc	2024-12-03 17:14:23 +08:00
qsh	30655c4219	sc	2024-12-03 16:05:36 +08:00
qsh	3db8be1280	sc	2024-12-02 14:51:03 +08:00
qsh	aa84bb69f3	sc	2024-11-20 15:16:06 +08:00
qsh	15b589ab03	sc	2024-11-15 09:17:33 +08:00
qsh	0b26cf8b28	sc	2024-11-12 11:12:21 +08:00
qsh	a8e41fe889	sc	2024-11-11 16:32:21 +08:00
qsh	d1c4632f72	sc	2024-08-14 15:02:43 +08:00
qsh	70dcf5bc28	sc	2024-08-14 14:55:37 +08:00
qsh	2af1282718	tj	2024-08-14 11:27:24 +08:00
qsh	a97f5bf79e	sc	2024-08-14 11:19:41 +08:00
qsh	a2adf2ce20	sc	2024-08-09 18:27:18 +08:00
qsh	e5418f4019	tj	2024-08-06 17:06:58 +08:00
qsh	aa5382f199	sc	2024-08-02 10:27:43 +08:00
qsh	e59ba74c12	tj	2024-08-01 18:55:41 +08:00
qsh	6c035fa0d8	上传	2024-07-31 18:37:38 +08:00
qsh	518cddc93c	tj	2024-07-30 14:58:58 +08:00
qsh	0a484253a5	上传	2024-07-27 13:29:59 +08:00
qsh	af34798896	上传	2024-07-26 17:51:18 +08:00
qsh	f8a6617a7a	上传	2024-07-25 14:45:44 +08:00
qsh	9180d14ede	上传	2024-07-23 16:05:55 +08:00
qsh	0c555e8473	上传	2024-07-23 16:02:04 +08:00
qsh	3aa44fa60a	接口调试	2024-07-23 11:45:55 +08:00
qsh	9dada27bd0	上传	2024-07-22 20:07:53 +08:00
qsh	8142e05543	上传	2024-07-22 16:04:19 +08:00
qsh	d80be0d7f1	上传	2024-07-19 16:05:50 +08:00
qsh	274fc2f435	上传	2024-07-19 16:03:07 +08:00
qsh	ab2da33ebc	上传	2024-07-19 11:36:14 +08:00
qsh	72a049b7b8	上传	2024-07-19 10:45:50 +08:00
qsh	f56305505f	上传	2024-07-18 18:17:47 +08:00
qsh	f45123126d	上传	2024-07-18 15:11:37 +08:00
qsh	df36d1da35	上传	2024-07-18 15:00:55 +08:00
qsh	9ade90355b	上传	2024-07-18 14:28:05 +08:00
qsh	fc71e47903	上传	2024-07-18 12:34:01 +08:00
qsh	c91a2b608f	上传	2024-07-17 10:10:57 +08:00
qsh	ab63082327	上传	2024-07-17 10:07:10 +08:00
qsh	a9c5d16926	上传	2024-07-16 16:49:01 +08:00
qsh	f3b5079fbe	上传	2024-07-16 11:56:37 +08:00
qsh	880eabb761	上传	2024-07-16 11:54:40 +08:00
qsh	77134be7ff	上传	2024-07-16 11:53:13 +08:00