Merge remote-tracking branch 'origin/main' into dev-cl

Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl
2024-06-06 19:00:17 +08:00 · 2024-06-05 18:42:28 +08:00 · 2024-05-30 19:38:25 +08:00 · 2024-05-29 18:51:14 +08:00 · 2024-05-27 21:31:02 +08:00 · 2024-05-25 12:51:47 +08:00
182 changed files with 3895 additions and 14117 deletions
--- a/.env.base
+++ b/.env.base
@@ -1,21 +1,20 @@
 # 本地开发环境
-VITE_NODE_ENV=development
+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://api-dashboard.yudao.iocoder.cn'
+VITE_BASE_URL='http://localhost:48080'

 # 上传路径
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
-# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'

 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=/dev-api

 # 接口地址
 VITE_API_URL=/admin-api

 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/
--- a/.env.dev
+++ b/.env.dev
@@ -10,13 +10,13 @@ VITE_BASE_URL='http://localhost:48080'
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'

 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=/dev-api

 # 接口地址
 VITE_API_URL=/admin-api

 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/

 # 是否删除debugger
 VITE_DROP_DEBUGGER=false
--- a/.env.front
+++ b/.env.front
@@ -10,13 +10,13 @@ VITE_BASE_URL='http://118.31.23.45:48080'
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'

 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=/dev-api

 # 接口地址
 VITE_API_URL=/admin-api

 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/

 # 项目本地运行端口号, 与.vscode/launch.json配合
 VITE_PORT=80
--- a/.env.pro
+++ b/.env.pro
@@ -4,13 +4,13 @@ VITE_NODE_ENV=production
 VITE_DEV=false

 # 请求路径
-VITE_BASE_URL='/crm-api'
+VITE_BASE_URL='http://localhost:48080'

 # 上传路径
-VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload'
+VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'

 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=

 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false

 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/

 # 输出路径
 VITE_OUT_DIR=dist-pro
--- a/.env.stage
+++ b/.env.stage
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'

 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=

 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false

 # 打包路径
-VITE_BASE_PATH='/crm'
+VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'

 # 输出路径
 VITE_OUT_DIR=dist-stage
--- a/.env.static
+++ b/.env.static
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080'
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'

 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=

 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false

 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/admin-ui-vue3/

 # 输出路径
 VITE_OUT_DIR=dist-dev
--- a/.env.test
+++ b/.env.test
@@ -10,7 +10,7 @@ VITE_BASE_URL='http://localhost:48080'
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'

 # 接口前缀
-VITE_API_BASEPATH=/crm-api
+VITE_API_BASEPATH=

 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=false
 VITE_SOURCEMAP=true

 # 打包路径
-VITE_BASE_PATH=/crm/
+VITE_BASE_PATH=/

 # 输出路径
 VITE_OUT_DIR=dist-test
--- a/index.html
+++ b/index.html
@@ -141,7 +141,7 @@
    <script type="module" src="/src/main.js"></script>
    <script type="text/javascript">
      window._AMapSecurityConfig = {
-        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab' // 你的密钥
+        securityJsCode: 'a2f0d14a4c5c1e387f9271b1045a781d' // 你的密钥
      }
    </script>
  </body>
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- 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 } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } 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 = cache.local.get(CACHE_KEY.IS_DARK)
+  let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
  if (isDarkTheme === null) {
    isDarkTheme = isDark()
  }
--- 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/extraFee.js
+++ b/src/api/clue/extraFee.js
@@ -1,30 +0,0 @@
-import request from '@/config/axios'
-
-// 获得列表
-export const getExtraFeePage = (params) => {
-  return request.get({ url: '/admin-api/crm/extra-pay/page', params })
-}
-
-// 创建
-export const createExtraFee = (data) => {
-  return request.post({ url: '/admin-api/crm/extra-pay/create', data, isSubmitForm: true })
-}
-
-// 更新
-export const updateExtraFee = (data) => {
-  return request.put({ url: '/admin-api/crm/extra-pay/update', data })
-}
-
-// 删除
-export const deleteExtraFee = (id) => {
-  return request.delete({ url: `/admin-api/crm/extra-pay/delete?id=${id}` })
-}
-
-// 获得
-export const getExtraFee = (id) => {
-  return request.get({ url: `/admin-api/crm/extra-pay/get?id=${id}` })
-}
-
-export const getExtraFeeSimpleList = async () => {
-  return await request.get({ url: '/admin-api/crm/extra-pay/simple-list' })
-}
--- 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,64 +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 (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-clue/page', data })
-}
-
-// 查询详情
-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 })
-}
-
-export const batchUpdateFollowUser = async (data) => {
-  return await request.put({ url: '/admin-api/crm/sch-clue/batchUpdateFollowUser', data })
-}
--- 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,47 +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 })
-}
-
-// 撤销
-export const updateApplyPayment = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sign-pay-record/updateRecordMoney',
-    data
-  })
-}
--- a/src/api/clue/settle.js
+++ b/src/api/clue/settle.js
@@ -1,31 +0,0 @@
-import request from '@/config/axios'
-
-// 查询招生结算列表
-export const getSchoolSettlePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/sch/page', params })
-}
-
-// 查询招生结算详情
-export const getSchoolSettleDetail = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/sch/get?id=' + id })
-}
-
-// 查询进销存结算列表
-export const getMallSettlePage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/erp/page', params })
-}
-
-// 查询进销存结算详情
-export const getMallSettleDetail = async (id) => {
-  return await request.get({ url: '/admin-api/crm/sign-settlement/erp/get?id=' + id })
-}
-
-// 批量结算
-export const batchSaveSettle = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data })
-}
-
-// 修改结算
-export const updateSettle = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-settlement/update/money', data })
-}
--- a/src/api/clue/sign.js
+++ b/src/api/clue/sign.js
@@ -1,53 +0,0 @@
-import request from '@/config/axios'
-
-// 查询列表
-export const getSignPage = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign/page', data })
-}
-
-// 查询详情
-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 })
-}
-
-// 安装状态修改
-export const updateInstallStatus = (signIdList, installStatus) => {
-  const data = {
-    signIdList,
-    installStatus
-  }
-  return request.post({ url: '/admin-api/crm/sign/install-status/batchSave', data: data })
-}
-
-// 修改生产状态
-export const updateProduceStatus = (data) => {
-  return request.put({ url: '/admin-api/crm/sign-prodcut/update', data: data })
-}
-
-export const updateProduceSort = (data) => {
-  return request.post({ url: '/admin-api/crm/sign-prodcut/adjust/sort', data: data })
-}
-
-export const getSignProfit = (params) => {
-  return request.get({ url: '/admin-api/crm/sign/profit', 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/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/reportChannel.js
+++ b/src/api/home/reportChannel.js
@@ -1,8 +0,0 @@
-import request from '@/config/axios'
-export const getList = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/report', data })
-}
-
-export const getPeriodList = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/period/report', data })
-}
--- a/src/api/home/reportSignDetail.js
+++ b/src/api/home/reportSignDetail.js
@@ -1,8 +0,0 @@
-import request from '@/config/axios'
-export const getInfo = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/one', data })
-}
-
-export const getList = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/two', data })
-}
--- a/src/api/home/reportSignRate.js
+++ b/src/api/home/reportSignRate.js
@@ -1,4 +0,0 @@
-import request from '@/config/axios'
-export const getList = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-clue/signRate/report', data })
-}
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -71,10 +71,3 @@ export const getAppInfo = (instanceId: number) => {
    url: '/admin-api/system/serviceInstance/getInstanceInfo?instanceId=' + instanceId
  })
 }
-
-export const bindWx = (data: any) => {
-  return request.post({
-    url: '/admin-api/system/user/bind/wx',
-    data
-  })
-}
--- a/src/api/mall/product/brand.ts
+++ b/src/api/mall/product/brand.ts
@@ -32,7 +32,7 @@ export interface BrandVO {

 // 创建商品品牌
 export const createBrand = (data: BrandVO) => {
-  return request.post({ url: '/admin-api/crm/erp-product-brand/create', data, isSubmitForm: true })
+  return request.post({ url: '/admin-api/crm/erp-product-brand/create', data })
 }

 // 更新商品品牌
--- a/src/api/mall/product/category.ts
+++ b/src/api/mall/product/category.ts
@@ -36,11 +36,7 @@ export interface CategoryVO {

 // 创建商品分类
 export const createCategory = (data: CategoryVO) => {
-  return request.post({
-    url: '/admin-api/crm/erp-product-category/create',
-    data,
-    isSubmitForm: true
-  })
+  return request.post({ url: '/admin-api/crm/erp-product-category/create', data })
 }

 // 更新商品分类
--- a/src/api/mall/product/index.js
+++ b/src/api/mall/product/index.js
@@ -11,11 +11,7 @@ export const getProduct = async (id) => {

 // 新增
 export const createProduct = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-product/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/erp-product/create', data: data })
 }

 // 修改
--- 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
@@ -42,11 +42,7 @@ export interface PropertyValueDetailVO {

 // 创建属性项
 export const createProperty = (data: PropertyVO) => {
-  return request.post({
-    url: '/admin-api/crm/erp-product-property/create',
-    data,
-    isSubmitForm: true
-  })
+  return request.post({ url: '/admin-api/crm/erp-product-property/create', data })
 }

 // 更新属性项
--- a/src/api/mall/purchase/index.js
+++ b/src/api/mall/purchase/index.js
@@ -6,11 +6,7 @@ export const getPurchasePage = async (params) => {

 // 新增
 export const createPurchase = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-purchase/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/erp-purchase/create', data: data })
 }

 // 修改
@@ -24,6 +20,6 @@ export const deletePurchase = async (id) => {
 }

 // 审核
-export const auditPurchase = async (data) => {
-  return await request.post({ url: '/admin-api/crm/erp-purchase/audit', data })
+export const auditPurchase = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-purchase/audit', params })
 }
--- a/src/api/mall/warehouse/index.js
+++ b/src/api/mall/warehouse/index.js
@@ -6,11 +6,7 @@ export const getWarehousePage = async (params) => {

 // 新增
 export const createWarehouse = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/erp-warehouse/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/erp-warehouse/create', data: data })
 }

 // 修改
@@ -42,8 +38,3 @@ export const getInventoryList = async (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/school/class/index.js
+++ b/src/api/school/class/index.js
@@ -5,10 +5,6 @@ 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 })
@@ -16,11 +12,7 @@ export const getClassType = async (id) => {

 // 新增
 export const createClassType = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-class-type/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/sch-class-type/create', data: data })
 }

 // 修改
@@ -30,7 +22,7 @@ export const updateClassType = async (params) => {

 // 删除
 export const deleteClassType = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/sch-class-type/delete?id=' + id })
+  return await request.delete({ url: '/admin-api/crm/sch-class-type/delete?typeId=' + id })
 }

 // 修改状态
--- a/src/api/school/place/index.js
+++ b/src/api/school/place/index.js
@@ -17,11 +17,7 @@ export const getPlace = async (id) => {

 // 新增
 export const createPlace = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-place/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/sch-place/create', data: data })
 }

 // 修改
@@ -34,10 +30,10 @@ export const deletePlace = async (id) => {
  return await request.delete({ url: '/admin-api/crm/sch-place/delete?id=' + id })
 }

-export const updatePlaceStatus = async (placeId, status) => {
+export const updatePlaceStatus = async (id, status) => {
  const data = {
-    placeId,
+    id,
    status
  }
-  return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
+  return request.put({ url: '/admin-api/crm/sch-place/update-status', data: data })
 }
--- a/src/api/school/sch/index.js
+++ b/src/api/school/sch/index.js
@@ -11,11 +11,7 @@ export const getSchool = async (id) => {

 // 新增
 export const createSchool = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/sch-school/create',
-    data: data,
-    isSubmitForm: true
-  })
+  return await request.post({ url: '/admin-api/crm/sch-school/create', data: data })
 }

 // 修改
@@ -28,10 +24,10 @@ export const deleteSchool = async (id) => {
  return await request.delete({ url: '/admin-api/crm/sch-school/delete?id=' + id })
 }

-export const updateSchoolStatus = async (schoolId, status) => {
+export const updateSchoolStatus = async (id, status) => {
  const data = {
-    schoolId,
+    id,
    status
  }
-  return request.put({ url: '/admin-api/crm/sch-school/status/update', data: data })
+  return request.put({ url: '/admin-api/crm/sch-school/update-status', data: data })
 }
--- a/src/api/school/setting/area.js
+++ b/src/api/school/setting/area.js
@@ -1,33 +0,0 @@
-import request from '@/config/axios'
-// 查询列表
-export const getAreaPage = async (params) => {
-  return await request.get({ url: '/admin-api/crm/area/page', params })
-}
-
-export const getAreaSimpleList = async (params) => {
-  return await request.get({ url: '/admin-api/crm/area/simple-list', params })
-}
-
-// 查询详情
-export const getArea = async (id) => {
-  return await request.get({ url: '/admin-api/crm/area/get?id=' + id })
-}
-
-// 新增
-export const createArea = async (data) => {
-  return await request.post({
-    url: '/admin-api/crm/area/create',
-    data: data,
-    isSubmitForm: true
-  })
-}
-
-// 修改
-export const updateArea = async (params) => {
-  return await request.put({ url: '/admin-api/crm/area/update', data: params })
-}
-
-// 删除
-export const deleteArea = async (id) => {
-  return await request.delete({ url: '/admin-api/crm/area/delete?id=' + id })
-}
--- a/src/api/system/dept/index.ts
+++ b/src/api/system/dept/index.ts
@@ -41,13 +41,3 @@ export const updateDept = async (params: DeptVO) => {
 export const deleteDept = async (id: number) => {
  return await request.delete({ url: '/admin-api/system/dept/delete?id=' + id })
 }
-
-// 获取部门业务指标
-export const getDeptTarget = async (deptId: number) => {
-  return await request.get({ url: '/admin-api/crm/dept-target/get', params: { deptId } })
-}
-
-// 更新部门业务指标
-export const updateDeptTarget = async (data: any) => {
-  return await request.put({ url: '/admin-api/crm/dept-target/save', data, isSubmitForm: true })
-}
--- a/src/api/system/dict/dict.data.ts
+++ b/src/api/system/dict/dict.data.ts
@@ -44,11 +44,6 @@ export const deleteDictData = (id: number) => {
 }

 // 导出字典类型数据
-export const exportDictData = (params: any) => {
+export const exportDictData = (params) => {
  return request.get({ url: '/admin-api/crm/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/menu/index.ts
+++ b/src/api/system/menu/index.ts
@@ -17,10 +17,7 @@ export interface MenuVO {
  alwaysShow?: boolean
  createTime: Date
 }
-// 获取服务列表
-export const getServiceAppList = () => {
-  return request.get({ url: '/admin-api/system/service/list' })
-}
+
 // 查询菜单（精简）列表
 export const getSimpleMenusList = () => {
  return request.get({ url: '/admin-api/system/menu/list-all-simple' })
--- a/src/api/system/notify/message/index.ts
+++ b/src/api/system/notify/message/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import qs from 'qs'

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

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

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

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

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

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

 // 获得当前用户的未读站内信数量
-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 } })
+export const getUnreadNotifyMessageCount = async () => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
 }
--- a/src/api/system/role/daliyReport.js
+++ b/src/api/system/role/daliyReport.js
@@ -1,25 +0,0 @@
-import request from '@/config/axios'
-
-// 获取角色快报配置
-export const getRoleDaliyReport = async (roleId) => {
-  return await request.get({
-    url: '/admin-api/system/role-message-setting/get',
-    params: { roleId }
-  })
-}
-
-// 保存角色每日快报配置
-export const updateRoleDaliyReport = async (data) => {
-  return await request.post({
-    url: '/admin-api/system/role-message-setting/save',
-    data,
-    isSubmitForm: true
-  })
-}
-
-// 获取每日快报发送内容
-export const getDaliyReportContent = async () => {
-  return await request.get({
-    url: '/admin-api/system/message-item/list-all-simple'
-  })
-}
--- a/src/api/system/set/index.js
+++ b/src/api/system/set/index.js
@@ -1,16 +0,0 @@
-import request from '@/config/axios'
-
-// 通过key，查询内容
-export const getConfigByConfigKey = (params) => {
-  return request.get({ url: '/admin-api/crm/config/getConfigByConfigKey', params })
-}
-
-// 保存配置项
-export const updateConfig = (data) => {
-  return request.put({ url: '/admin-api/crm/config/batchUpdateConfigValue', data })
-}
-
-// 根据模块获取配置列表
-export const getConfigList = (params) => {
-  return request.get({ url: '/admin-api/crm/config/query', params })
-}
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -74,13 +74,3 @@ export const updateUserStatus = (id: number, status: number) => {
 export const getSimpleUserList = (): Promise<UserVO[]> => {
  return request.get({ url: '/admin-api/system/user/list-all-simple' })
 }
-
-// 获取所有用户列表-无权限限制
-export const getAllUserList = (): Promise<UserVO[]> => {
-  return request.get({ url: '/admin-api/system/user/no/permission/list-all-simple' })
-}
-
-// 获取所有包括离职的用户
-export const getAllUserListWithHire = (): Promise<UserVO[]> => {
-  return request.get({ url: '/admin-api/system/user/no/permission/list-all' })
-}
--- a/src/components/ConfigGlobal/src/ConfigGlobal.vue
+++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue
@@ -22,13 +22,13 @@ onMounted(() => {
  appStore.setCssVarTheme()
 })

-const { width, height } = useWindowSize()
+const { width } = useWindowSize()

 // 监听窗口变化
 watch(
  () => width.value,
  (width: number) => {
-    if (width < 768 || height.value < 450) {
+    if (width < 768) {
      !appStore.getMobile ? appStore.setMobile(true) : undefined
      setCssVar('--left-menu-min-width', '0')
      appStore.setCollapse(true)
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -27,8 +27,7 @@ const props = defineProps({
  data: {
    type: Object as PropType<any>,
    default: () => ({})
-  },
-  defaultShow: propTypes.bool.def(true)
+  }
 })

 const { getPrefixCls } = useDesign()
@@ -58,7 +57,7 @@ const getBindItemValue = (item: DescriptionsSchema) => {
 }

 // 折叠
-const show = ref(props.defaultShow)
+const show = ref(true)

 const toggleClick = () => {
  if (props.collapse) {
@@ -78,7 +77,7 @@ const toggleClick = () => {
      v-if="title"
      :class="[
        `${prefixCls}-header`,
-        'h-40px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
+        'h-50px flex justify-between items-center border-bottom-1 border-solid border-[var(--tags-view-border-color)] px-10px cursor-pointer dark:border-[var(--el-border-color)]'
      ]"
      @click="toggleClick"
    >
@@ -132,7 +131,7 @@ const toggleClick = () => {
                <DictTag :type="item.dictType" :value="data[item.field] + ''" />
              </slot>
              <slot v-else-if="item.isEditor">
-                <div v-if="data[item.field]" v-dompurify-html="data[item.field]"></div>
+                <div v-dompurify-html="data[item.field]"></div>
              </slot>
              <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
            </template>
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -55,8 +55,6 @@ const dialogStyle = computed(() => {
    height: unref(dialogHeight)
  }
 })
-
-const emit = defineEmits(['close'])
 </script>

 <template>
@@ -67,25 +65,20 @@ const emit = defineEmits(['close'])
    destroy-on-close
    draggable
    lock-scroll
-    append-to-body
    v-bind="getBindValue"
-    @close="emit('close')"
  >
    <template #header>
      <div class="flex justify-between">
        <slot name="title">
          {{ title }}
        </slot>
-        <div class="flex items-center">
-          <slot name="btn"></slot>
-          <Icon
-            v-if="fullscreen"
-            :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
-            class="mr-22px cursor-pointer is-hover z-10"
-            color="var(--el-color-info)"
-            @click="toggleFull"
-          />
-        </div>
+        <Icon
+          v-if="fullscreen"
+          :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
+          class="mr-22px cursor-pointer is-hover mt-2px z-10"
+          color="var(--el-color-info)"
+          @click="toggleFull"
+        />
      </div>
    </template>

--- a/src/components/Echart/src/Echart.vue
+++ b/src/components/Echart/src/Echart.vue
@@ -66,7 +66,6 @@ watch(
  (options) => {
    if (echartRef) {
      echartRef?.setOption(options)
-      resizeHandler()
    }
  },
  {
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -51,8 +51,7 @@ export default defineComponent({
    // 表单label宽度
    labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
    // 是否 loading 数据中 add by 芋艿
-    vLoading: propTypes.bool.def(false),
-    inlineBlock: propTypes.bool.def(false)
+    vLoading: propTypes.bool.def(false)
  },
  emits: ['register'],
  setup(props, { slots, expose, emit }) {
@@ -78,10 +77,7 @@ export default defineComponent({
    })

    // 对表单赋值
-    const setValues = (data: Recordable = {}, isReset: Boolean = false) => {
-      if (isReset) {
-        formModel.value = initModel(unref(getProps).schema, unref(formModel))
-      }
+    const setValues = (data: Recordable = {}) => {
      formModel.value = Object.assign(unref(formModel), data)
    }

@@ -185,7 +181,11 @@ export default defineComponent({
      const slotsMap: Recordable = {
        ...setItemComponentSlots(slots, item?.componentProps?.slots, item.field)
      }
-      if (item?.component !== 'SelectV2' && item?.component !== 'Cascader' && item?.options) {
+      if (
+        item?.component !== 'SelectV2' &&
+        item?.component !== 'Cascader' &&
+        item?.componentProps?.options
+      ) {
        slotsMap.default = () => renderOptions(item)
      }

@@ -236,9 +236,6 @@ export default defineComponent({
                  vModel={formModel.value[item.field]}
                  {...(autoSetPlaceholder && setTextPlaceholder(item))}
                  {...setComponentProps(item)}
-                  filterable
-                  format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
-                  value-format={item.component == 'DatePicker' ? 'YYYY-MM-DD' : null}
                  style={baseSty + item.componentProps?.style}
                  // eslint-disable-next-line prettier/prettier
                  {...(notRenderOptions.includes(item?.component as string) && item?.componentProps?.options
@@ -294,7 +291,6 @@ export default defineComponent({
        model={props.isCustom ? props.model : formModel}
        class={prefixCls}
        v-loading={props.vLoading}
-        style={props.inlineBlock ? 'display: inline' : ''}
      >
        {{
          // 如果需要自定义，就什么都不渲染，而是提供默认插槽
--- a/src/components/Form/src/components/useRenderCheckbox.tsx
+++ b/src/components/Form/src/components/useRenderCheckbox.tsx
@@ -5,12 +5,12 @@ import { defineComponent } from 'vue'
 export const useRenderCheckbox = () => {
  const renderCheckboxOptions = (item: FormSchema) => {
    // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
    const Com = (item.component === 'Checkbox' ? ElCheckbox : ElCheckboxButton) as ReturnType<
      typeof defineComponent
    >
-    return item?.options?.map((option) => {
+    return item?.componentProps?.options?.map((option) => {
      const { ...other } = option
      return (
        <Com {...other} label={option[valueAlias || 'value']}>
--- a/src/components/Form/src/components/useRenderRadio.tsx
+++ b/src/components/Form/src/components/useRenderRadio.tsx
@@ -5,12 +5,12 @@ import { defineComponent } from 'vue'
 export const useRenderRadio = () => {
  const renderRadioOptions = (item: FormSchema) => {
    // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField
    const Com = (item.component === 'Radio' ? ElRadio : ElRadioButton) as ReturnType<
      typeof defineComponent
    >
-    return item?.options?.map((option) => {
+    return item?.componentProps?.options?.map((option) => {
      const { ...other } = option
      return (
        <Com {...other} label={option[valueAlias || 'value']}>
--- a/src/components/Form/src/components/useRenderSelect.tsx
+++ b/src/components/Form/src/components/useRenderSelect.tsx
@@ -9,12 +9,12 @@ export const useRenderSelect = (slots: Slots) => {
  const renderSelectOptions = (item: FormSchema) => {
    // 如果有别名，就取别名
    const labelAlias = item?.componentProps?.optionsAlias?.labelField
-    return item?.options?.map((option) => {
-      if (option?.length) {
+    return item?.componentProps?.options?.map((option) => {
+      if (option?.options?.length) {
        return (
          <ElOptionGroup label={option[labelAlias || 'label']}>
            {() => {
-              return option?.map((v) => {
+              return option?.options?.map((v) => {
                return renderSelectOptionItem(item, v)
              })
            }}
@@ -29,8 +29,8 @@ export const useRenderSelect = (slots: Slots) => {
  // 渲染 select option item
  const renderSelectOptionItem = (item: FormSchema, option: ComponentOptions) => {
    // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField

    const { label, value, ...other } = option

--- a/src/components/SSTable/index.vue
+++ b/src/components/SSTable/index.vue
@@ -1,14 +1,7 @@
 <template>
  <div>
    <div class="flex">
-      <el-table
-        :data="tableObject.tableList"
-        :row-key="rowkey"
-        :expand-row-keys="expandRowKeys"
-        border
-        style="flex: 1"
-        @selection-change="handleSelectionChange"
-      >
+      <el-table :data="tableObject.tableList" border style="flex: 1">
        <slot></slot>
      </el-table>
      <el-button
@@ -35,7 +28,7 @@
            @end="onDragEnd"
          >
            <template #item="{ element: item }">
-              <el-checkbox :key="item.id" :label="item.id">
+              <el-checkbox :key="item.field" :label="item.field">
                {{ item.label }}
              </el-checkbox>
            </template>
@@ -55,18 +48,18 @@

 <script setup>
 import draggable from 'vuedraggable'
-import * as ClueCacheApi from '@/api/clue/clueCache'
+import { useUserStore } from '@/store/modules/user'
 import { useRoute } from 'vue-router'
+import cache from '@/plugins/cache'

 const props = defineProps({
  tableObject: { type: Object, default: () => ({ tableList: [] }) },
-  tableColumns: { type: Array, default: () => [] },
-  rowkey: { type: String, default: 'id' },
-  expandRowKeys: { type: Array, default: () => [] }
+  tableColumns: { type: Array, default: () => [] }
 })

-const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])
+const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns'])
 const route = useRoute()
+const { id: userId } = useUserStore().user //取用户ID

 const pageNo = ref(props.tableObject?.pageNo || 1)

@@ -75,7 +68,7 @@ const pageSize = ref(props.tableObject?.pageSize || 20)
 const ColumnSetting = ref()
 const TableColumnPop = ref()
 // 展示在设置里的所有表格列，由于会排序，所以使用新属性，不直接修改原值
-const allColumns = ref([...props.tableColumns])
+const allColumns = ref({})
 // 已勾选的选项
 const checkedColumns = ref([])

@@ -92,54 +85,67 @@ const clickSetting = () => {
  unref(TableColumnPop).TableColumnPop?.delayHide?.()
 }

-const routeMap = {
-  CluePool: 1,
-  ClueOrder: 2
+// 获取所有的表格列，注意如果本地有缓存使用缓存数据，因为用户可能已对表格列排序，并且不依赖网络请求，可更快渲染表头
+function getAllColumns() {
+  // 1. 先获取缓存表头
+  const localData = getColumn('TableColumnAll')[route.name] || []
+  // 2. 如果有缓存的表头，直接使用，并将新增的标题加入，如果没有缓存，那就得用获取到的表头
+  if (localData && localData) {
+    const newColumns = props.tableColumns.filter(
+      (item) => !localData.some((it) => it.field == item.field)
+    )
+    allColumns.value = [...localData, ...newColumns]
+  } else {
+    allColumns.value = [...props.tableColumns]
+  }
+}
+// 获取缓存的表头
+function getColumn(name = 'shitTable') {
+  return cache.local.get(`${name}-${userId}`) || {}
+}
+// 设置表头缓存
+function setColumn(val, name = 'shitTable') {
+  cache.local.set(`${name}-${userId}`, val)
 }
-
 // 获取用户已勾选的表头
-async function getUserCheckedColumns() {
-  checkedColumns.value = await ClueCacheApi.getClueCache({
-    settingType: 2,
-    model: routeMap[route.name]
-  })
-  // 回显到表格中
+function getUserCheckedColumns() {
+  // 1. 先获取缓存
+  const localData = getColumn('shitTable')[route.name]
+  // 2. 如果有缓存，使用缓存表头，否则使用默认的所有表头
+  if (localData && localData.length) {
+    checkedColumns.value = localData
+  } else {
+    checkedColumns.value = allColumns.value.map((it) => it.field)
+  }
+  // 3. 回显到表格中
  emitColumns()
 }

 // 表格列排序
 function onDragEnd() {
-  ClueCacheApi.setClueCache({
-    settingType: 2,
-    model: routeMap[route.name],
-    clueParamId: checkedColumns.value
-  })
-
-  // 表格回显
+  const obj = getColumn('TableColumnAll')
+  obj[route.name] = allColumns.value
+  // 1. 设置缓存
+  setColumn(obj, 'TableColumnAll')
+  // 2. 表格回显
  emitColumns()
 }

-function handleSelectionChange(val) {
-  emit('selection-change', val)
-}
-
 // 勾选确认
 function confirm() {
-  ClueCacheApi.setClueCache({
-    settingType: 2,
-    model: routeMap[route.name],
-    clueParamId: checkedColumns.value
-  })
-  // usedSchema.value = allColumns.value.filter((it) => checkedColumns.value.includes(it.id))
+  const obj = getColumn()
+  obj[route.name] = checkedColumns.value
+  setColumn(obj, 'shitTable')
  emitColumns()
 }

 // 将表头数据返回至父组件
 function emitColumns() {
-  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.id))
+  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.field))
  emit('getCheckedColumns', arr)
 }

+getAllColumns()
 getUserCheckedColumns()

 defineExpose({ getUserCheckedColumns })
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -7,10 +7,12 @@ import { findIndex } from '@/utils'
 import { cloneDeep } from 'lodash-es'
 import { FormSchema } from '@/types/form'

+import { useUserStore } from '@/store/modules/user'
 import { useRoute } from 'vue-router'
-import * as ClueCacheApi from '@/api/clue/clueCache'
+import cache from '@/plugins/cache'

 const route = useRoute()
+const { id: userId } = useUserStore().user //取用户ID

 const { t } = useI18n()

@@ -38,14 +40,13 @@ const props = defineProps({
  // 伸缩的界限字段
  expandField: propTypes.string.def(''),
  inline: propTypes.bool.def(true),
-  inlineBlock: propTypes.bool.def(false),
  model: {
    type: Object as PropType<Recordable>,
    default: () => ({})
  }
 })

-// const emit = defineEmits(['search', 'reset'])
+const emit = defineEmits(['search', 'reset'])

 const visible = ref(true)

@@ -59,11 +60,6 @@ const usedSchema = ref([])

 const newSchema = computed(() => {
  let schema: FormSchema[] = cloneDeep(usedSchema.value)
-  schema.forEach((item: FormSchema) => {
-    if (item.component == 'TreeSelect') {
-      item.componentProps['check-strictly'] = true
-    }
-  })
  if (props.expand && props.expandField && !unref(visible)) {
    const index = findIndex(schema, (v: FormSchema) => v.field === props.expandField)
    if (index > -1) {
@@ -84,26 +80,37 @@ const newSchema = computed(() => {
  return schema
 })

-const routeMap = {
-  CluePool: 1,
-  ClueOrder: 2
-}
-async function initSearch() {
+function initSearch() {
  reset()
-  checkedSchema.value = await ClueCacheApi.getClueCache({
-    settingType: 1,
-    model: routeMap[route.name]
-  })
-  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
+  // 1. 先获取缓存
+  const localData = getColumn('Schema')[route.name]
+  // 2. 如果有缓存，使用缓存表头，否则使用默认的所有表头
+  if (localData && localData.length) {
+    usedSchema.value = localData
+  } else {
+    const obj = getColumn('Schema')
+    obj[route.name] = [props.schema[0]]
+    setSchema(obj)
+    usedSchema.value = [props.schema[0]]
+  }
+  checkedSchema.value = usedSchema.value.map((it) => it.field)
 }

 function changeSearch() {
-  ClueCacheApi.setClueCache({
-    settingType: 1,
-    model: routeMap[route.name],
-    clueParamId: checkedSchema.value
-  })
-  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
+  const obj = getColumn('Schema')
+  obj[route.name] = props.schema.filter((item) => checkedSchema.value.includes(item.field))
+  setSchema(obj)
+  initSearch()
+}
+
+// 获取缓存的查询条件
+function getColumn(name = 'Schema') {
+  return cache.local.get(`${name}-${userId}`) || {}
+}
+
+// 设置查询条件缓存
+function setSchema(val: Array<Object>, name = 'Schema') {
+  cache.local.set(`${name}-${userId}`, val)
 }

 function setSearch() {
@@ -114,34 +121,23 @@ const { register, elFormRef, methods } = useForm({
  model: props.model || {}
 })

-// const search = async () => {
-//   await unref(elFormRef)?.validate(async (isValid) => {
-//     if (isValid) {
-//       const { getFormData } = methods
-//       const model = await getFormData()
-//       emit('search', model)
-//     }
-//   })
-// }
+const search = async () => {
+  await unref(elFormRef)?.validate(async (isValid) => {
+    if (isValid) {
+      const { getFormData } = methods
+      const model = await getFormData()
+      emit('search', model)
+    }
+  })
+}

 const reset = async () => {
  unref(elFormRef)?.resetFields()
-  // const { getFormData } = methods
-  // const model = await getFormData()
-  // emit('reset', model)
-}
-
-async function getFormModel() {
  const { getFormData } = methods
  const model = await getFormData()
-  return model
+  emit('reset', model)
 }

-defineExpose({
-  getFormModel,
-  reset
-})
-
 const bottonButtonStyle = computed(() => {
  return {
    textAlign: props.buttomPosition as unknown as 'left' | 'center' | 'right'
@@ -160,7 +156,6 @@ initSearch()
  <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
  <Form
    :inline="inline"
-    :inlineBlock="inlineBlock"
    :is-col="isCol"
    :is-custom="false"
    isSearch
@@ -173,7 +168,10 @@ initSearch()
  >
    <template #action>
      <div v-if="layout === 'inline'">
-        <ElButton ref="SchemaSetting" @click="setSearch"> 查询设置 </ElButton>
+        <ElButton ref="SchemaSetting" @click="setSearch">
+          <!-- <Icon class="mr-5px" icon="ep:setting" /> -->
+          查询设置
+        </ElButton>
        <el-popover
          ref="SettingPop"
          :virtual-ref="SchemaSetting"
@@ -183,7 +181,7 @@ initSearch()
          virtual-triggering
        >
          <el-checkbox-group v-model="checkedSchema" @change="changeSearch">
-            <el-checkbox v-for="item in schema" :key="item.id" :label="item.id">
+            <el-checkbox v-for="item in schema" :key="item.field" :label="item.field">
              {{ item.label }}
            </el-checkbox>
          </el-checkbox-group>
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -23,10 +23,10 @@
    >
      <el-button type="primary"><Icon icon="ep:upload-filled" />选取文件</el-button>
      <template v-if="isShowTip" #tip>
-        <div style="font-size: 12px">
+        <div style="font-size: 8px">
          大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
        </div>
-        <div style="font-size: 12px">
+        <div style="font-size: 8px">
          格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
        </div>
      </template>
@@ -44,10 +44,9 @@ const props = defineProps({
  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
  title: propTypes.string.def('文件上传'),
  updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
-  // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: propTypes.array.def([]),
+  fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
  accept: propTypes.string.def('*'),
-  fileSize: propTypes.number.def(100), // 大小限制(MB)
+  fileSize: propTypes.number.def(5), // 大小限制(MB)
  limit: propTypes.number.def(5), // 数量限制
  autoUpload: propTypes.bool.def(true), // 自动上传
  drag: propTypes.bool.def(false), // 拖拽上传
--- a/src/config/axios/config.ts
+++ b/src/config/axios/config.ts
@@ -7,7 +7,7 @@ const config: {
  /**
   * api请求基础路径
   */
-  base_url: import.meta.env.VITE_API_BASEPATH,
+  base_url: 'http://localhost' + import.meta.env.VITE_API_BASEPATH,
  /**
   * 接口成功返回状态码
   */
--- a/src/config/axios/index.ts
+++ b/src/config/axios/index.ts
@@ -5,11 +5,10 @@ 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 } = option
  return service({
    url: url,
    method,
-    isSubmitForm,
    params,
    data,
    responseType: responseType,
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -20,7 +20,7 @@ import {
 import errorCode from './errorCode'

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

 const { result_code, base_url, request_timeout } = config

@@ -62,11 +62,15 @@ service.interceptors.request.use(
    }
    // 设置租户
    const tenantId = getTenantId()
-    if (tenantId) (config as Recordable).headers['tenant-id'] = tenantId
+    if (tenantId) {
+      ;(config as Recordable).headers['tenant-id'] = tenantId
+    }

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

    const params = config.params || {}
    const data = config.data || false
@@ -79,39 +83,27 @@ service.interceptors.request.use(
    }
    // get参数编码
    if (config.method?.toUpperCase() === 'GET' && params) {
-      config.params = {}
-      const paramsStr = qs.stringify(params, { allowDots: true })
-      if (paramsStr) {
-        config.url = config.url + '?' + paramsStr
-      }
-    }
-    // 是否提交表单型的接口，如果是，不要频繁调接口
-    if (config?.isSubmitForm) {
-      const requestObj = {
-        url: config.url,
-        data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
-        time: new Date().getTime()
-      }
-      const sessionObj = cache.session.get('sessionObj')
-      if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-        cache.session.set('sessionObj', requestObj)
-      } else {
-        const s_url = sessionObj.url // 请求地址
-        const s_data = sessionObj.data // 请求数据
-        const s_time = sessionObj.time // 请求时间
-        const interval = 1000 // 间隔时间(ms)，小于此时间视为重复提交
-        if (
-          s_data === requestObj.data &&
-          requestObj.time - s_time < interval &&
-          s_url === requestObj.url
-        ) {
-          const message = '数据正在处理，请勿重复提交'
-          console.warn(`[${s_url}]: ` + message)
-          return Promise.reject(new Error(message))
-        } else {
-          cache.session.set('sessionObj', requestObj)
+      let url = config.url + '?'
+      for (const propName of Object.keys(params)) {
+        const value = params[propName]
+        if (value !== void 0 && value !== null && typeof value !== 'undefined') {
+          if (typeof value === 'object') {
+            for (const val of Object.keys(value)) {
+              const params = propName + '[' + val + ']'
+              const subPart = encodeURIComponent(params) + '='
+              url += subPart + encodeURIComponent(value[val]) + '&'
+            }
+          } else {
+            url += `${propName}=${encodeURIComponent(value)}&`
+          }
        }
      }
+      // 给 get 请求加上时间戳参数，避免从缓存中拿数据
+      // const now = new Date().getTime()
+      // params = params.substring(0, url.length - 1) + `?_t=${now}`
+      url = url.slice(0, -1)
+      config.params = {}
+      config.url = url
    }
    return config
  },
@@ -187,7 +179,7 @@ service.interceptors.response.use(
        })
      }
    } else if (code === 500) {
-      ElMessage.error(t(msg || 'sys.api.errMsg500'))
+      ElMessage.error(t('sys.api.errMsg500'))
      return Promise.reject(new Error(msg))
    } else if (code === 901) {
      ElMessage.error({
@@ -205,23 +197,8 @@ service.interceptors.response.use(
      if (msg === '无效的刷新令牌') {
        // hard coding：忽略这个提示，直接登出
        console.log(msg)
-      } else if (code == 18888) {
-        return { data }
      } else {
        ElNotification.error({ title: msg })
-        if (code == 403) {
-          ElMessageBox.confirm(`${msg},是否重新登陆`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            // 无访问权限，退出登录
-            const tenantId = cache.local.get('TENANT_ID')
-            const appId = cache.local.get('App_ID')
-            resetRouter() // 重置静态路由表
-            cache.local.clear()
-            removeToken()
-            window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
-          })
-        }
      }
      return Promise.reject('error')
    } else {
@@ -259,15 +236,16 @@ const handleAuthorized = () => {
      confirmButtonText: t('login.relogin'),
      type: 'warning'
    }).then(() => {
-      const tenantId = cache.local.get('TENANT_ID')
-      const appId = cache.local.get('App_ID')
+      const { wsCache } = useCache()
+      const tenantId = wsCache.get('TENANT_ID')
+      const appId = wsCache.get('App_ID')
      resetRouter() // 重置静态路由表
-      cache.local.clear()
+      wsCache.clear()
      removeToken()
      isRelogin.show = false
      // 干掉token后再走一次路由让它过router.beforeEach的校验
      // window.location.href = window.location.href
-      window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
+      window.location.href = `/login?tenantId=${tenantId}&appId=${appId}`
    })
  }
  return Promise.reject(t('sys.api.timeoutMessage'))
--- a/src/directives/permission/hasPermi.ts
+++ b/src/directives/permission/hasPermi.ts
@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'

 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 = cache.local.get(CACHE_KEY.USER)?.permissions || []
+    const permissions = wsCache.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 } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'

 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 = cache.local.get(CACHE_KEY.USER).roles
+    const roles = wsCache.get(CACHE_KEY.USER).roles

    if (value && value instanceof Array && value.length > 0) {
      const roleFlag = value
--- a/src/hooks/web/useCrudSchemas.ts
+++ b/src/hooks/web/useCrudSchemas.ts
@@ -119,8 +119,7 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
        componentProps: comonentProps,
        ...schemaItem.search,
        field: schemaItem.field,
-        label: schemaItem.search?.label || schemaItem.label,
-        id: schemaItem.clueParamId
+        label: schemaItem.search?.label || schemaItem.label
      }
      if (searchSchemaItem.api) {
        searchRequestTask.push(async () => {
@@ -166,8 +165,7 @@ const filterTableSchema = (crudSchema: CrudSchema[]): TableColumn[] => {
        }
        return {
          ...schema.table,
-          ...schema,
-          id: schema.clueParamId
+          ...schema
        }
      }
    }
@@ -229,7 +227,6 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
        value: defaultValue,
        ...schemaItem.form,
        field: schemaItem.field,
-        isRequired: schemaItem.isRequired,
        label: schemaItem.form?.label || schemaItem.label
      }

--- a/src/hooks/web/useMessage.ts
+++ b/src/hooks/web/useMessage.ts
@@ -13,12 +13,7 @@ export const useMessage = () => {
    },
    // 成功消息
    success(content: string) {
-      // ElMessage.success(content)
-      ElMessage({
-        message: content,
-        duration: 1500,
-        type: 'success'
-      })
+      ElMessage.success(content)
    },
    // 警告消息
    warning(content: string) {
--- a/src/hooks/web/useWatermark.ts
+++ b/src/hooks/web/useWatermark.ts
@@ -15,14 +15,14 @@ export function useWatermark(appendEl: HTMLElement | null = document.body) {
    clear()

    const can = document.createElement('canvas')
-    can.width = 500
+    can.width = 300
    can.height = 240

    const cans = can.getContext('2d')
    if (cans) {
      cans.rotate((-20 * Math.PI) / 120)
      cans.font = '15px Vedana'
-      cans.fillStyle = 'rgba(0, 0, 0, 0.05)'
+      cans.fillStyle = 'rgba(0, 0, 0, 0.15)'
      cans.textAlign = 'left'
      cans.textBaseline = 'middle'
      cans.fillText(str, can.width / 20, can.height)
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -1,9 +1,6 @@
 <script lang="ts" name="Message" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
-import { useUserStore } from '@/store/modules/user'
-
-const userStore = useUserStore()

 const { push } = useRouter()
 const activeName = ref('notice')
@@ -12,27 +9,22 @@ const list = ref<any[]>([]) // 消息列表

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

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

 // 跳转我的站内信
 const goMyList = () => {
  push({
-    name: 'NotifyMessage'
+    name: 'MyNotifyMessage'
  })
 }

@@ -64,9 +56,10 @@ onUnmounted(() => {
          <div class="message-list">
            <template v-for="item in list" :key="item.id">
              <div class="message-item">
+                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
                <div class="message-content">
                  <span class="message-title">
-                    {{ item.title }}
+                    {{ item.templateNickname }}：{{ item.templateContent }}
                  </span>
                  <span class="message-date">
                    {{ formatDate(item.createTime) }}
@@ -101,7 +94,7 @@ onUnmounted(() => {
  .message-item {
    display: flex;
    align-items: center;
-    padding: 5px 0;
+    padding: 20px 0;
    border-bottom: 1px solid var(--el-border-color-light);

    &:last-child {
@@ -120,7 +113,6 @@ onUnmounted(() => {

      .message-title {
        margin-bottom: 5px;
-        font-weight: bold;
      }

      .message-date {
--- a/src/layout/components/Setting/src/Setting.vue
+++ b/src/layout/components/Setting/src/Setting.vue
@@ -2,9 +2,8 @@
 // import { ElMessage } from 'element-plus'
 // import { useClipboard, useCssVar } from '@vueuse/core'
 import { useCssVar } from '@vueuse/core'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
-import cache from '@/plugins/cache'

 import { setCssVar, trim } from '@/utils'
 import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
@@ -13,13 +12,6 @@ import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 // import InterfaceDisplay from './components/InterfaceDisplay.vue'
 // import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
-import { useWatermark } from '@/hooks/web/useWatermark'
-
-const { setWatermark } = useWatermark()
-
-nextTick(() => {
-  setWatermark('安徽莳松科技有限公司')
-})

 const { t } = useI18n()
 const appStore = useAppStore()
@@ -196,16 +188,16 @@ watch(

 // 清空缓存
 const clear = () => {
-  cache.local.delete(CACHE_KEY.LAYOUT)
-  cache.local.delete(CACHE_KEY.THEME)
-  cache.local.delete(CACHE_KEY.IS_DARK)
+  const { wsCache } = useCache()
+  wsCache.delete(CACHE_KEY.LAYOUT)
+  wsCache.delete(CACHE_KEY.THEME)
+  wsCache.delete(CACHE_KEY.IS_DARK)
  window.location.reload()
 }
 </script>

 <template>
  <div
-    v-if="false"
    :class="prefixCls"
    class="fixed top-[45%] right-0 w-40px h-40px text-center leading-40px bg-[var(--el-color-primary)] cursor-pointer"
    @click="drawer = true"
@@ -213,9 +205,7 @@ const clear = () => {
    <Icon color="#fff" icon="ep:setting" />
  </div>

-  <div @click="drawer = true">主题配置</div>
-
-  <ElDrawer v-model="drawer" :z-index="4000" append-to-body direction="rtl" size="350px">
+  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
    <template #header>
      <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
    </template>
--- a/src/layout/components/Setting/src/components/InterfaceDisplay.vue
+++ b/src/layout/components/Setting/src/components/InterfaceDisplay.vue
@@ -124,6 +124,7 @@ const fixedMenuChange = (show: boolean) => {
 const setWater = () => {
  setWatermark(water.value)
 }
+setWater()

 const layout = computed(() => appStore.getLayout)

--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -1,18 +1,17 @@
 <script lang="ts" name="UserInfo" setup>
 import { ElMessageBox } from 'element-plus'

-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { getTenantId, getAppId } from '@/utils/auth'
-import cache from '@/plugins/cache'
-
-import { Setting } from '@/layout/components/Setting'

 const { t } = useI18n()

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

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

 const prefixCls = getPrefixCls('user-info')

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

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

@@ -59,10 +58,6 @@ const toProfile = async () => {
    </div>
    <template #dropdown>
      <ElDropdownMenu>
-        <ElDropdownItem>
-          <Icon icon="ep:tools" />
-          <Setting />
-        </ElDropdownItem>
        <ElDropdownItem>
          <Icon icon="ep:tools" />
          <div @click="toProfile">{{ t('common.profile') }}</div>
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,6 +1,6 @@
 import router from './router'
 import { isRelogin } from '@/config/axios/service'
-import { getAccessToken, removeToken } from '@/utils/auth'
+import { getAccessToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -8,74 +8,55 @@ import { useDictStoreWithOut } from '@/store/modules/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
 import { getTenantId, getAppId } from '@/utils/auth'
-import cache from '@/plugins/cache'

 const { start, done } = useNProgress()

 const { loadStart, loadDone } = usePageLoading()
 // 路由不重定向白名单
-const whiteList = [
-  '/login',
-  '/mp-login',
-  '/nm-detail',
-  '/social-login',
-  '/auth-redirect',
-  '/bind',
-  '/register',
-  '/swagger'
-]
+const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/swagger']

 // 路由加载前
 router.beforeEach(async (to, from, next) => {
  start()
  loadStart()
-  if (getAppId() && to.query?.appId && getAppId() != to.query?.appId) {
-    removeToken()
-    cache?.local?.delete('appInfo')
-    cache?.local?.delete('roleRouters')
-    cache?.local?.delete('user')
-    cache?.local?.delete('App_ID')
-    next(`/login?tenantId=${to.query?.tenantId}&appId=${to.query?.appId}`)
-  } else {
-    if (getAccessToken()) {
-      if (to.path === '/login') {
-        next({ path: '/' })
-      } else {
-        // 获取所有字典
-        const dictStore = useDictStoreWithOut()
-        const userStore = useUserStoreWithOut()
-        const permissionStore = usePermissionStoreWithOut()
-        if (!dictStore.getIsSetDict && to.path != '/nm-detail') {
-          await dictStore.setDictMap()
-        }
-        if (!userStore.getIsSetUser) {
-          isRelogin.show = true
-          await userStore.setUserInfoAction()
-          isRelogin.show = false
-          // 后端过滤菜单
-          await permissionStore.generateRoutes()
-          permissionStore.getAddRouters.forEach((route) => {
-            router.addRoute(route) // 动态添加可访问路由表
-          })
-          const redirectPath = from.query.redirect || to.path
-          const redirect = decodeURIComponent(redirectPath)
-          const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
-          next(nextData)
-        } else {
-          next()
-        }
-      }
+  if (getAccessToken()) {
+    if (to.path === '/login') {
+      next({ path: '/' })
    } else {
-      if (whiteList.indexOf(to.path) !== -1) {
-        next()
+      // 获取所有字典
+      const dictStore = useDictStoreWithOut()
+      const userStore = useUserStoreWithOut()
+      const permissionStore = usePermissionStoreWithOut()
+      if (!dictStore.getIsSetDict) {
+        await dictStore.setDictMap()
+      }
+      if (!userStore.getIsSetUser) {
+        isRelogin.show = true
+        await userStore.setUserInfoAction()
+        isRelogin.show = false
+        // 后端过滤菜单
+        await permissionStore.generateRoutes()
+        permissionStore.getAddRouters.forEach((route) => {
+          router.addRoute(route) // 动态添加可访问路由表
+        })
+        const redirectPath = from.query.redirect || to.path
+        const redirect = decodeURIComponent(redirectPath)
+        const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
+        next(nextData)
      } else {
-        const tenantId = getTenantId()
-        const appId = getAppId()
-        if (tenantId && appId) {
-          next(`/crm/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        } else {
-          next(`/crm/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        }
+        next()
+      }
+    }
+  } else {
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      const tenantId = getTenantId()
+      const appId = getAppId()
+      if (tenantId && appId) {
+        next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      } else {
+        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
      }
    }
  }
--- 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]
  },
-  delete(key) {
+  remove(key) {
    if (!sessionStorage) {
      return null
    }
@@ -62,7 +62,7 @@ const localCache = {
    let storage = storageStr ? JSON.parse(storageStr) : {}
    return storage[key]
  },
-  delete(key) {
+  remove(key) {
    if (!localStorage) {
      return null
    }
@@ -73,10 +73,6 @@ 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/index.ts
+++ b/src/router/index.ts
@@ -5,7 +5,7 @@ import remainingRouter from './modules/remaining'

 // 创建路由实例
 const router = createRouter({
-  history: createWebHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
+  history: createWebHistory(), // createWebHashHistory URL带#，createWebHistory URL不带#
  strict: true,
  routes: remainingRouter as RouteRecordRaw[],
  scrollBehavior: () => ({ left: 0, top: 0 })
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -94,8 +94,8 @@ const remainingRouter: AppRouteRecordRaw[] = [
      },
      {
        path: 'notify-message',
-        component: () => import('@/views/Profile/NotifyMessage.vue'),
-        name: 'NotifyMessage',
+        component: () => import('@/views/system/notify/my/index.vue'),
+        name: 'MyNotifyMessage',
        meta: {
          canTo: true,
          hidden: true,
@@ -106,6 +106,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
      }
    ]
  },
+
  // {
  //   path: '/dict',
  //   component: Layout,
@@ -129,27 +130,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
  //     }
  //   ]
  // },
-  // {
-  //   path: '/Basic',
-  //   component: Layout,
-  //   name: 'Basic',
-  //   meta: { title: '菜单管理' },
-  //   redirect: '/Basic/menu',
-  //   children: [
-  //     {
-  //       path: 'menu',
-  //       component: () => import('@/views/Basic/Menu/index.vue'),
-  //       name: 'Menu',
-  //       meta: {
-  //         canTo: true,
-  //         hidden: true,
-  //         noTagsView: false,
-  //         icon: 'ep:user',
-  //         title: '菜单管理'
-  //       }
-  //     }
-  //   ]
-  // },
+
  {
    path: '/login',
    component: () => import('@/views/Login/Login.vue'),
@@ -160,16 +141,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
      noTagsView: true
    }
  },
-  {
-    path: '/mp-login',
-    component: () => import('@/views/Login/MPLogin.vue'),
-    name: 'MPLogin',
-    meta: {
-      hidden: true,
-      title: '用户绑定',
-      noTagsView: true
-    }
-  },
  {
    path: '/sso',
    component: () => import('@/views/Login/Login.vue'),
@@ -180,16 +151,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
      noTagsView: true
    }
  },
-  {
-    path: '/nm-detail',
-    component: () => import('@/views/Profile/NotifyMessageDetail.vue'),
-    name: 'NMDetail',
-    meta: {
-      hidden: true,
-      title: '通知详情',
-      noTagsView: true
-    }
-  },
  {
    path: '/403',
    component: () => import('@/views/Error/403.vue'),
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -2,12 +2,13 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ElementPlusSize } from '@/types/elementPlus'
 import { LayoutType } from '@/types/layout'
 import { ThemeTypes } from '@/types/theme'
 import { getAppInfo } from '@/api/login'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()

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

      breadcrumb: true, // 面包屑
@@ -63,12 +64,12 @@ export const useAppStore = defineStore('app', {
      fixedHeader: true, // 固定toolheader
      footer: false, // 显示页脚
      greyMode: false, // 是否开始灰色模式，用于特殊悼念日
-      fixedMenu: cache.local.get('fixedMenu') || false, // 是否固定菜单
+      fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单

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

 export interface DictValueType {
@@ -28,7 +28,7 @@ export const useDictStore = defineStore('dict', {
  }),
  getters: {
    getDictMap(): Recordable {
-      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
      if (dictMap) {
        this.dictMap = dictMap
      }
@@ -40,7 +40,7 @@ export const useDictStore = defineStore('dict', {
  },
  actions: {
    async setDictMap() {
-      const dictMap = cache.session.get(CACHE_KEY.DICT_CACHE)
+      const dictMap = wsCache.get(CACHE_KEY.DICT_CACHE)
      if (dictMap) {
        this.dictMap = dictMap
        this.isSetDict = true
@@ -64,7 +64,7 @@ export const useDictStore = defineStore('dict', {
        })
        this.dictMap = dictDataMap
        this.isSetDict = true
-        cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
+        wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
      }
    },
    getDictByType(type: string) {
@@ -74,7 +74,7 @@ export const useDictStore = defineStore('dict', {
      return this.dictMap[type]
    },
    async resetDict() {
-      cache.session.delete(CACHE_KEY.DICT_CACHE)
+      wsCache.delete(CACHE_KEY.DICT_CACHE)
      const res = await listSimpleDictData()
      // 设置数据
      const dictDataMap = new Map<string, any>()
@@ -94,7 +94,7 @@ export const useDictStore = defineStore('dict', {
      })
      this.dictMap = dictDataMap
      this.isSetDict = true
-      cache.session.set(CACHE_KEY.DICT_CACHE, dictDataMap) // 60 秒 过期
+      wsCache.set(CACHE_KEY.DICT_CACHE, dictDataMap, { exp: 60 }) // 60 秒 过期
    }
  }
 })
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -3,8 +3,9 @@ import { store } from '../index'
 import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
 import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+
+const { wsCache } = useCache()

 export interface PermissionState {
  routers: AppRouteRecordRaw[]
@@ -33,8 +34,8 @@ export const usePermissionStore = defineStore('permission', {
    async generateRoutes(): Promise<unknown> {
      return new Promise<void>(async (resolve) => {
        let res: AppCustomRouteRecordRaw[] = []
-        if (cache.local.get(CACHE_KEY.ROLE_ROUTERS)) {
-          res = cache.local.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
+        if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
+          res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
        }
        const routerMap: AppRouteRecordRaw[] = generateRoute(res)
        // 动态路由，404一定要放到最后面
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,15 +1,15 @@
 import { store } from '../index'
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getInfo, loginOut } from '@/api/login'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()

 interface UserVO {
  id: number
  avatar: string
  nickname: string
-  currentRole: number
 }
 interface UserInfoVO {
  permissions: string[]
@@ -26,8 +26,7 @@ export const useUserStore = defineStore('admin-user', {
    user: {
      id: 0,
      avatar: '',
-      nickname: '',
-      currentRole: 0
+      nickname: ''
    }
  }),
  getters: {
@@ -50,21 +49,21 @@ export const useUserStore = defineStore('admin-user', {
        this.resetState()
        return null
      }
-      let userInfo = cache.local.get(CACHE_KEY.USER)
-      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
+      let userInfo = wsCache.get(CACHE_KEY.USER)
+      if (!userInfo) {
        userInfo = await getInfo({})
      }
      this.permissions = userInfo.permissions
      this.roles = userInfo.roles
      this.user = userInfo.user
      this.isSetUser = true
-      cache.local.set(CACHE_KEY.USER, userInfo)
-      cache.local.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
+      wsCache.set(CACHE_KEY.USER, userInfo)
+      wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
    },
    async loginOut() {
      await loginOut()
      removeToken()
-      cache.local.clear()
+      wsCache.clear()
      this.resetState()
    },
    resetState() {
@@ -74,12 +73,11 @@ export const useUserStore = defineStore('admin-user', {
      this.user = {
        id: 0,
        avatar: '',
-        nickname: '',
-        currentRole: 0
+        nickname: ''
      }
    },
    refresh() {
-      cache.local.delete(CACHE_KEY.USER)
+      wsCache.delete(CACHE_KEY.USER)
      this.resetState()
      window.location.href = ''
    }
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,6 +1,8 @@
+import { useCache } from '@/hooks/web/useCache'
 import { TokenType } from '@/api/login/types'
 import { decrypt, encrypt } from '@/utils/jsencrypt'
-import cache from '@/plugins/cache'
+
+const { wsCache } = useCache()

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

 // 刷新token
 export const getRefreshToken = () => {
-  return cache.local.get(RefreshTokenKey)
+  return wsCache.get(RefreshTokenKey)
 }

 // 设置token
 export const setToken = (token: TokenType) => {
-  cache.local.set(RefreshTokenKey, token.refreshToken)
-  cache.local.set(AccessTokenKey, token.accessToken)
+  wsCache.set(RefreshTokenKey, token.refreshToken, { exp: token.expiresTime })
+  wsCache.set(AccessTokenKey, token.accessToken)
 }

 // 删除token
 export const removeToken = () => {
-  cache.local.delete(AccessTokenKey)
-  cache.local.delete(RefreshTokenKey)
+  wsCache.delete(AccessTokenKey)
+  wsCache.delete(RefreshTokenKey)
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 export const removeAppId = () => {
-  cache.local.delete(AppIdKey)
+  wsCache.delete(AppIdKey)
 }
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -209,14 +209,3 @@ export const yuanToFen = (amount: string | number): number => {
 export const fenToYuan = (amount: string | number): number => {
  return Number((Number(amount) / 100).toFixed(2))
 }
-
-export const removeNullField = (obj: Object) => {
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (obj[key] === '' || obj[key] === null || obj[key] == undefined) {
-        delete obj[key]
-      }
-    }
-  }
-  return obj
-}
--- a/src/utils/permission.ts
+++ b/src/utils/permission.ts
@@ -1,5 +1,4 @@
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'

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

@@ -10,9 +9,10 @@ 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 = cache.local.get(CACHE_KEY.USER).permissions
+    const permissions = wsCache.get(CACHE_KEY.USER).permissions
    const hasPermission = permissions.some((permission) => {
      return all_permission === permission || permissionDatas.includes(permission)
    })
@@ -30,9 +30,10 @@ 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 = cache.local.get(CACHE_KEY.USER).roles
+    const roles = wsCache.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
@@ -70,7 +70,7 @@
    </template>
  </Dialog>
 </template>
-<script name="SystemDeptForm" setup>
+<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'
@@ -81,7 +81,6 @@ const message = useMessage() // 消息弹窗

 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
-
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -93,7 +92,7 @@ const formData = ref({
  status: CommonStatusEnum.ENABLE,
  remark: undefined
 })
-const formRules = reactive({
+const formRules = reactive<any>({
  parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
  name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
  sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
@@ -105,10 +104,10 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-const userList = ref([]) // 用户列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表

 /** 打开弹窗 */
-const open = async (type, id) => {
+const open = async (type: string, id?: number) => {
  dialogVisible.value = true
  dialogTitle.value = t('action.' + type)
  formType.value = type
@@ -139,7 +138,7 @@ const submitForm = async () => {
  // 提交请求
  formLoading.value = true
  try {
-    const data = formData.value
+    const data = formData.value as unknown as DeptApi.DeptVO
    if (formType.value === 'create') {
      await DeptApi.createDept(data)
      message.success(t('common.createSuccess'))
@@ -173,7 +172,7 @@ const resetForm = () => {
 const getTree = async () => {
  deptTree.value = []
  const data = await DeptApi.getSimpleDeptList()
-  let dept = { id: 0, name: '顶级部门', children: [] }
+  let dept: Tree = { id: 0, name: '顶级部门', children: [] }
  dept.children = handleTree(data)
  deptTree.value.push(dept)
 }
--- a/src/views/Basic/Dept/DialogTarget.vue
+++ b/src/views/Basic/Dept/DialogTarget.vue
@@ -1,133 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
-    <el-form ref="formRef" :model="formData" label-width="130px">
-      <el-form-item label="每日跟进指标数">
-        <el-input-number v-model="formData.targetNum" :controls="false" style="width: 150px" />
-      </el-form-item>
-      <el-form-item label="跟进指标生效日期">
-        <el-date-picker
-          v-model="formData.startDate"
-          type="date"
-          placeholder="选择日期时间"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          style="width: 150px"
-        />
-      </el-form-item>
-    </el-form>
-    <el-divider direction="horizontal" content-position="left">成交额指标</el-divider>
-    <el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
-    <el-table :data="formData.deptSignPriceTargetVOList" border>
-      <el-table-column label="年份" width="120">
-        <template #default="{ row }">
-          <el-date-picker
-            v-model="row.year"
-            type="year"
-            placeholder="选择年份"
-            size="small"
-            format="YYYY"
-            value-format="YYYY"
-            style="width: 100%"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
-        <template #default="{ row }">
-          <el-input-number
-            v-model="row.monthTargetVOList[col - 1].targetPrice"
-            size="small"
-            :controls="false"
-            style="width: 100%"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-    <template #footer>
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-
-<script setup name="DialogTarget">
-import * as DeptApi from '@/api/system/dept'
-
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formData = ref({
-  remark: undefined
-})
-
-/** 打开弹窗 */
-const open = async (deptId) => {
-  dialogVisible.value = true
-  dialogTitle.value = '业绩指标'
-  resetForm()
-  // 修改时，设置数据
-  if (deptId) {
-    formLoading.value = true
-    try {
-      formData.value = await DeptApi.getDeptTarget(deptId)
-      formData.value.deptId = deptId
-      if (formData.value?.deptSignPriceTargetVOList) {
-        formData.value.deptSignPriceTargetVOList.forEach((it) => {
-          it.year = it.year + ''
-        })
-      }
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const formRef = ref() // 表单 Ref
-const submitForm = async () => {
-  // 提交请求
-  formLoading.value = true
-  try {
-    await DeptApi.updateDeptTarget(formData.value)
-    message.success('修改成功')
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    targetNum: undefined,
-    startDate: undefined,
-    deptSignPriceTargetVOList: []
-  }
-  formRef.value?.resetFields()
-}
-
-function handleAddPrice() {
-  const obj = {
-    year: undefined,
-    monthTargetVOList: []
-  }
-  for (let i = 1; i <= 12; i++) {
-    obj.monthTargetVOList.push({
-      month: i,
-      targetPrice: undefined
-    })
-  }
-  if (!formData.value.deptSignPriceTargetVOList) {
-    formData.value.deptSignPriceTargetVOList = []
-  }
-  formData.value.deptSignPriceTargetVOList.push(obj)
-}
-</script>
-
-<style lang="scss" scoped></style>
--- a/src/views/Basic/Dept/index.vue
+++ b/src/views/Basic/Dept/index.vue
@@ -23,13 +23,9 @@
    <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">
-      <template #default="{ row }">
-        {{ ['启用', '禁用'][row.status] }}
-      </template>
-    </el-table-column>
+    <el-table-column prop="status" label="状态" width="100" />
    <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
-    <el-table-column label="操作" class-name="fixed-width" width="240">
+    <el-table-column label="操作" class-name="fixed-width" width="160">
      <template #default="scope">
        <el-button
          link
@@ -39,14 +35,6 @@
        >
          修改
        </el-button>
-        <el-button
-          link
-          type="primary"
-          @click="openTarget(scope.row.id)"
-          v-hasPermi="['basic:dept:update']"
-        >
-          业绩指标
-        </el-button>
        <el-button
          link
          type="danger"
@@ -61,13 +49,11 @@

  <!-- 表单弹窗：添加/修改 -->
  <DeptForm ref="formRef" @success="getList" />
-  <DialogTarget ref="targetDialogRef" @success="getList" />
 </template>
 <script setup lang="ts" name="SystemDept">
 import { handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import DeptForm from './DeptForm.vue'
-import DialogTarget from './DialogTarget.vue'
 import { dateFormatter } from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -107,11 +93,6 @@ const openForm = (type: string, id?: number) => {
  formRef.value.open(type, id)
 }

-const targetDialogRef = ref()
-const openTarget = (id: number) => {
-  targetDialogRef.value.open(id)
-}
-
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
  try {
--- a/src/views/Basic/GeneralSet/Comp/BSClue.vue
+++ b/src/views/Basic/GeneralSet/Comp/BSClue.vue
@@ -1,42 +1,18 @@
 <template>
  <el-form :model="form" ref="formRef" label-width="auto">
-    <!-- <el-form-item v-if="getConfig('usePhoneConfig')">
+    <el-form-item>
      <template #label>
-        <Tooltip
-          v-if="getConfig('usePhoneConfig').remark"
-          :message="getConfig('usePhoneConfig').remark"
-        />
-        <span>使用外呼</span>
+        <Tooltip message="请联系客服开通或关闭，客服电话:15955599959" />使用外呼
      </template>
-      <el-radio-group
-        v-model="form.usePhoneConfig"
-        :disabled="!getConfig('usePhoneConfig').modifiable"
-      >
-        <el-radio
-          v-for="(item, index) in getConfig('usePhoneConfig').options"
-          :key="index"
-          :label="item.id"
-        >
-          {{ item.name }}
-        </el-radio>
+      <el-radio-group v-model="form.callEnable" disabled>
+        <el-radio :label="1"> 使用 </el-radio>
+        <el-radio :label="0"> 不使用 </el-radio>
      </el-radio-group>
-    </el-form-item> -->
-    <el-form-item v-if="getConfig('showFollowConfig')">
-      <template #label>
-        <Tooltip
-          v-if="getConfig('showFollowConfig').remark"
-          :message="getConfig('showFollowConfig').remark"
-        />
-        <span>跟进信息</span>
-      </template>
-      <el-radio-group v-model="form.showFollowConfig">
-        <el-radio
-          v-for="(item, index) in getConfig('showFollowConfig').options"
-          :key="index"
-          :label="item.id"
-        >
-          {{ item.name }}
-        </el-radio>
+    </el-form-item>
+    <el-form-item label="跟进信息">
+      <el-radio-group v-model="form.followType">
+        <el-radio :label="1"> 展示所有 </el-radio>
+        <el-radio :label="2"> 仅展示本人 </el-radio>
      </el-radio-group>
    </el-form-item>
    <el-form-item>
@@ -47,42 +23,23 @@
 </template>

 <script setup name="BasicSettingClue">
-import * as ConfigApi from '@/api/system/set'
-
 const message = useMessage()

-const form = ref({})
-
-const configList = ref([])
-
-function getConfig(val) {
-  return configList.value.find((it) => it.configKey == val)
-}
+const form = ref({
+  followType: 1,
+  callEnable: 1
+})

 function getData() {
-  ConfigApi.getConfigList({ module: 100 }).then((data) => {
-    configList.value = data
-    // 获取所有配置项
-    data.map((it) => {
-      form.value[it.configKey] = it.configValue
-    })
-  })
+  form.value = {
+    followType: 1,
+    callEnable: 1
+  }
 }

 function onSubmit() {
-  const params = configList.value.map((it) => ({
-    configId: it.configId,
-    configKey: it.configKey,
-    configValue: form.value[it.configKey]
-  }))
-  ConfigApi.updateConfig(params).then(() => {
-    message.success('保存成功')
-  })
+  message.success('保存成功')
 }
-
-onMounted(() => {
-  getData()
-})
 </script>

 <style lang="scss" scoped></style>
--- a/src/views/Basic/GeneralSet/Comp/BSSalerComission.vue
+++ b/src/views/Basic/GeneralSet/Comp/BSSalerComission.vue
@@ -1,31 +1,16 @@
 <template>
  <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item v-if="getConfig('saleCommissionRelateDealConfig')">
-      <template #label>
-        <Tooltip
-          v-if="getConfig('saleCommissionRelateDealConfig').remark"
-          :message="getConfig('saleCommissionRelateDealConfig').remark"
-        />
-        <span>是否关联成交率</span>
-      </template>
-      <el-radio-group
-        v-model="form.saleCommissionRelateDealConfig"
-        @change="form.saleCommissionRelateRulesConfig = []"
-      >
-        <el-radio
-          v-for="(item, index) in getConfig('saleCommissionRelateDealConfig').options"
-          :key="index"
-          :label="item.id"
-        >
-          {{ item.name }}
-        </el-radio>
+    <el-form-item label="是否关联成交率">
+      <el-radio-group v-model="form.withSuccess">
+        <el-radio :label="1"> 是 </el-radio>
+        <el-radio :label="0"> 否 </el-radio>
      </el-radio-group>
    </el-form-item>
-    <el-form-item label="关联规则" v-if="form.saleCommissionRelateDealConfig == 'true'">
+    <el-form-item label="关联规则" v-if="form.withSuccess">
      <div>
-        <el-button @click="form.saleCommissionRelateRulesConfig.push({})">新增规则</el-button>
+        <el-button @click="form.rules.push({})">新增规则</el-button>
        <div
-          v-for="(item, index) in form.saleCommissionRelateRulesConfig"
+          v-for="(item, index) in form.rules"
          :key="index"
          class="mt-10px flex justify-center items-center"
        >
@@ -63,52 +48,22 @@
 </template>

 <script setup name="BasicSettingClue">
-import * as ConfigApi from '@/api/system/set'
-
 const message = useMessage()

-const form = ref({})
-const configList = ref([])
-
-const jsonArr = ['saleCommissionRelateRulesConfig']
-
-function getConfig(val) {
-  return configList.value.find((it) => it.configKey == val)
-}
+const form = ref({
+  withSuccess: 1,
+  rules: []
+})

 function getData() {
-  ConfigApi.getConfigList({ module: 101 }).then((data) => {
-    configList.value = data
-    // 获取所有配置项
-    data.map((it) => {
-      form.value[it.configKey] = it.configValue
-      if (it.configKey == 'saleCommissionRelateRulesConfig') {
-        if (!form.value[it.configKey]) {
-          form.value[it.configKey] = []
-        } else {
-          form.value[it.configKey] = JSON.parse(it.configValue)
-        }
-      }
-    })
-  })
+  form.value = {
+    withSuccess: 1
+  }
 }

 function onSubmit() {
-  const params = configList.value.map((it) => ({
-    configId: it.configId,
-    configKey: it.configKey,
-    configValue: jsonArr.includes(it.configKey)
-      ? JSON.stringify(form.value[it.configKey])
-      : form.value[it.configKey]
-  }))
-  ConfigApi.updateConfig(params).then(() => {
-    message.success('保存成功')
-  })
+  message.success('保存成功')
 }
-
-onMounted(() => {
-  getData()
-})
 </script>

 <style lang="scss" scoped></style>
--- a/src/views/Basic/GeneralSet/index.vue
+++ b/src/views/Basic/GeneralSet/index.vue
@@ -4,16 +4,16 @@
      <el-tab-pane label="线索管理" :name="0" v-if="checkPermi(['basic:setting:clue'])">
        <BSClue v-if="tabIndex == 0" />
      </el-tab-pane>
-      <!-- <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
+      <el-tab-pane label="销售提成" :name="10" v-if="checkPermi(['basic:setting:comission'])">
        <BSSalerComission v-if="tabIndex == 10" />
-      </el-tab-pane> -->
+      </el-tab-pane>
    </el-tabs>
  </div>
 </template>

 <script setup name="GeneralSetting">
 import BSClue from './Comp/BSClue.vue'
-// import BSSalerComission from './Comp/BSSalerComission.vue'
+import BSSalerComission from './Comp/BSSalerComission.vue'
 import { checkPermi } from '@/utils/permission'

 const tabIndex = ref(0)
--- a/src/views/Basic/Library/index.vue
+++ b/src/views/Basic/Library/index.vue
@@ -65,7 +65,7 @@
          </el-table-column>
          <el-table-column prop="files" label="附件">
            <template #default="{ row }">
-              <el-link type="primary" underline target="_blank" @click="handleDownload(row.files)">
+              <el-link type="primary" underline :href="row.fileUrl" target="_blank">
                {{ row.files }}
              </el-link>
            </template>
@@ -195,16 +195,6 @@ function handleClickLib(index) {
  getResourceList()
 }

-function handleDownload(href) {
-  if (href) {
-    let a = document.createElement('a')
-    a.download = href //指定下载的文件名
-    a.href = href //  URL对象
-    a.click() // 模拟点击
-    URL.revokeObjectURL(a.href) // 释放URL 对象
-  }
-}
-
 function openResource(type, id) {
  resourceDialog.value.open(type, libraryList.value[libraryIndex.value], id)
 }
--- a/src/views/Basic/Menu/MenuForm.vue
+++ b/src/views/Basic/Menu/MenuForm.vue
@@ -7,16 +7,6 @@
      :rules="formRules"
      label-width="100px"
    >
-      <el-form-item label="服务类型" prop="serviceId">
-        <el-select v-model="formData.serviceId" placeholder="选择服务类型" filterable>
-          <el-option
-            v-for="item in props.appList"
-            :key="item.serviceId"
-            :label="item.serviceName"
-            :value="item.serviceId"
-          />
-        </el-select>
-      </el-form-item>
      <el-form-item label="上级菜单">
        <el-tree-select
          v-model="formData.parentId"
@@ -116,18 +106,14 @@
 <script lang="ts" name="SystemMenuForm" setup>
 // import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as MenuApi from '@/api/system/menu'
-import { CACHE_KEY } from '@/hooks/web/useCache'
+import { CACHE_KEY, useCache } 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() // 消息弹窗

-const props = defineProps({
-  appList: Object as any
-})
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -146,8 +132,7 @@ const formData = ref({
  status: CommonStatusEnum.ENABLE,
  visible: true,
  keepAlive: true,
-  alwaysShow: true,
-  serviceId: undefined
+  alwaysShow: true
 })
 const formRules = reactive({
  name: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
@@ -218,7 +203,7 @@ const submitForm = async () => {
  } finally {
    formLoading.value = false
    // 清空，从而触发刷新
-    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
  }
 }

@@ -248,8 +233,7 @@ const resetForm = () => {
    status: CommonStatusEnum.ENABLE,
    visible: true,
    keepAlive: true,
-    alwaysShow: true,
-    serviceId: undefined
+    alwaysShow: true
  }
  formRef.value?.resetFields()
 }
--- a/src/views/Basic/Menu/index.vue
+++ b/src/views/Basic/Menu/index.vue
@@ -62,11 +62,6 @@
      <el-table-column :show-overflow-tooltip="true" label="组件路径" prop="component" />
      <el-table-column :show-overflow-tooltip="true" label="组件名称" prop="componentName" />
      <el-table-column label="状态" prop="status" width="80" />
-      <el-table-column label="服务类型" prop="" width="100">
-        <template #default="{ row }">
-          {{ getServiceName(row.serviceId) }}
-        </template>
-      </el-table-column>
      <el-table-column align="center" label="操作">
        <template #default="scope">
          <el-button link type="primary" @click="openForm('update', scope.row.id)">
@@ -82,14 +77,14 @@
  </ContentWrap>

  <!-- 表单弹窗：添加/修改 -->
-  <MenuForm ref="formRef" :appList="appList" @success="getList" />
+  <MenuForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" name="SystemMenu" setup>
 import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
-import { CACHE_KEY } from '@/hooks/web/useCache'
-import cache from '@/plugins/cache'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

@@ -145,7 +140,7 @@ const refreshMenu = async () => {
  try {
    await message.confirm('即将更新缓存刷新浏览器！', '刷新菜单缓存')
    // 清空，从而触发刷新
-    cache.local.delete(CACHE_KEY.ROLE_ROUTERS)
+    wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
    // 刷新浏览器
    location.reload()
  } catch {}
@@ -165,20 +160,8 @@ const handleDelete = async (id: number) => {
  } catch {}
 }

-const appList = ref([] as any)
-const getOptions = () => {
-  MenuApi.getServiceAppList().then((data) => {
-    appList.value = data
-  })
-}
-
-function getServiceName(serviceId: any) {
-  return appList.value.find((it: any) => it.serviceId == serviceId)?.serviceName
-}
-
 /** 初始化 **/
 onMounted(() => {
-  getOptions()
  getList()
 })
 </script>
--- a/src/views/Basic/Role/Comp/ReportDaily.vue
+++ b/src/views/Basic/Role/Comp/ReportDaily.vue
@@ -1,149 +0,0 @@
-<template>
-  <div class="pl-20px pr-20px">
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
-      <el-form-item label="开启通知">
-        <el-radio-group v-model="form.status">
-          <el-radio :label="0"> 开启 </el-radio>
-          <el-radio :label="1"> 关闭 </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item label="发送途径">
-        <el-checkbox-group v-model="form.sendType">
-          <el-checkbox v-for="(item, index) in sendTypeOptions" :key="index" :label="item.value">
-            {{ item.label }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="发送时间">
-        <el-time-picker
-          v-model="form.sendTime"
-          placeholder="任意时间点"
-          format="HH:mm"
-          value-format="HH:mm"
-        />
-      </el-form-item>
-      <el-form-item label="发送内容">
-        <el-tree
-          ref="treeRef"
-          :data="contentOptions"
-          :props="defaultProps"
-          empty-text="加载中，请稍候"
-          node-key="id"
-          show-checkbox
-          default-expand-all
-          style="width: 100%"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button :disabled="formLoading" type="primary" @click="submitForm"> 保 存 </el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script setup name="ReportDaily">
-import * as DaliyReportApi from '@/api/system/role/daliyReport'
-import { defaultProps, handleTree } from '@/utils/tree'
-import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
-
-const message = useMessage() // 消息弹窗
-const props = defineProps({
-  roleId: {
-    type: Number
-  }
-})
-
-const formLoading = ref(false)
-const form = ref({
-  sendItem: []
-})
-
-watch(
-  () => props.roleId,
-  () => {
-    getReportInfo()
-  }
-)
-
-onMounted(() => {
-  init()
-})
-
-const formRef = ref()
-
-const rules = {}
-
-const contentOptions = ref([])
-
-async function init() {
-  getOptions()
-  getReportInfo()
-}
-
-const sendTypeOptions = ref([])
-const treeRef = ref()
-function getOptions() {
-  getGeneralSysDictData('message_send_type').then((data) => {
-    sendTypeOptions.value = data
-  })
-  DaliyReportApi.getDaliyReportContent().then((data) => {
-    contentOptions.value = handleTree(data)
-  })
-}
-
-async function getReportInfo() {
-  try {
-    formLoading.value = true
-    const data = await DaliyReportApi.getRoleDaliyReport(props.roleId)
-    form.value = { ...data }
-
-    if (!form.value.sendType) {
-      form.value.sendType = []
-    }
-
-    if (!form.value.sendTime) {
-      form.value.sendTime = '22:00'
-    }
-
-    if (!form.value.sendItem) {
-      form.value.sendItem = []
-    }
-    treeRef.value.setCheckedKeys([], false)
-    // 设置选中
-    form.value.sendItem.forEach((menuId) => {
-      treeRef.value.setChecked(menuId, true, false)
-    })
-    formLoading.value = false
-  } catch (error) {
-    console.log(error)
-    formLoading.value = false
-  }
-}
-
-/** 提交表单 */
-const submitForm = async () => {
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = {
-      id: form.value.id,
-      roleId: props.roleId,
-      sendType: form.value.sendType,
-      sendTime: form.value.sendTime,
-      status: form.value.status,
-      sendItem: [
-        ...treeRef.value.getCheckedKeys(false), // 获得当前选中节点
-        ...treeRef.value.getHalfCheckedKeys() // 获得半选中的父节点
-      ]
-    }
-    await DaliyReportApi.updateRoleDaliyReport(data)
-    message.success('保存成功')
-    getReportInfo()
-  } finally {
-    formLoading.value = false
-  }
-}
-</script>
-
-<style lang="scss" scoped></style>
--- a/src/views/Basic/Role/RoleDataPermissionForm.vue
+++ b/src/views/Basic/Role/RoleDataPermissionForm.vue
@@ -107,14 +107,7 @@ const dataScopeOptions = [
 ]

 async function getRoleInfo(id) {
-  try {
-    formData.value = await RoleApi.getRole(id)
-    nextTick(() => {
-      treeRef.value.setCheckedKeys(formData.value.dataScopeDeptIds)
-    })
-  } catch (error) {
-    console.log(error)
-  }
+  formData.value = await RoleApi.getRole(id)
 }

 /** 提交表单 */
--- a/src/views/Basic/Role/index.vue
+++ b/src/views/Basic/Role/index.vue
@@ -75,13 +75,6 @@
            @success="getList"
          />
        </el-tab-pane>
-        <el-tab-pane label="每日快报" :name="4">
-          <ReportDaily
-            v-if="roleOperateIndex == 4"
-            ref="reportDailyRef"
-            :roleId="list[libraryIndex].id"
-          />
-        </el-tab-pane>
      </el-tabs>
    </el-card>
    <!-- 表单弹窗：添加/修改 -->
@@ -93,7 +86,6 @@ import RoleForm from './RoleForm.vue'
 import RoleEmployee from './Comp/RoleEmployee.vue'
 import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
 import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
-import ReportDaily from './Comp/ReportDaily.vue'
 import * as RoleApi from '@/api/system/role'

 const message = useMessage() // 消息弹窗
--- a/src/views/Basic/User/DeptTree.vue
+++ b/src/views/Basic/User/DeptTree.vue
@@ -1,4 +1,11 @@
 <template>
+  <div class="head-container">
+    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
+      <template #prefix>
+        <Icon icon="ep:search" />
+      </template>
+    </el-input>
+  </div>
  <div class="head-container">
    <el-tree
      ref="treeRef"
@@ -19,6 +26,7 @@ import { ElTree } from 'element-plus'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'

+const deptName = ref('')
 const deptList = ref<Tree[]>([]) // 树形结构
 const treeRef = ref<InstanceType<typeof ElTree>>()

--- a/src/views/Basic/User/UserForm.vue
+++ b/src/views/Basic/User/UserForm.vue
@@ -9,8 +9,8 @@
    >
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item label="用户姓名" prop="nickname">
-            <el-input v-model="formData.nickname" placeholder="请输入用户姓名" />
+          <el-form-item label="用户昵称" prop="nickname">
+            <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
          </el-form-item>
        </el-col>
        <el-col :span="12">
@@ -69,8 +69,8 @@
      </el-row>
      <el-row :gutter="20">
        <el-col :span="12">
-          <el-form-item v-if="formData.id === undefined" label="登录账号" prop="username">
-            <el-input v-model="formData.username" placeholder="请输入登录账号" />
+          <el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
+            <el-input v-model="formData.username" placeholder="请输入用户名称" />
          </el-form-item>
        </el-col>
        <el-col :span="12">
@@ -139,12 +139,11 @@ const formData = ref({
  remark: '',
  status: CommonStatusEnum.ENABLE,
  roleIds: [],
-  hireDate: '',
-  isNewUserConfirm: false
+  hireDate: ''
 })
 const formRules = ref<any>({
-  username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
-  nickname: [{ required: true, message: '用户姓名不能为空', trigger: 'blur' }],
+  username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
+  nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
  password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
  email: [
    {
@@ -153,7 +152,13 @@ const formRules = ref<any>({
      trigger: ['blur', 'change']
    }
  ],
-  mobile: [{ required: true, message: '手机号不能为空', trigger: 'blur' }]
+  mobile: [
+    {
+      pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+      message: '请输入正确的手机号码',
+      trigger: 'blur'
+    }
+  ]
 })
 const formRef = ref() // 表单 Ref
 const deptList = ref<Tree[]>([]) // 树形结构
@@ -193,14 +198,8 @@ const submitForm = async () => {
  try {
    const data = formData.value as unknown as UserApi.UserVO
    if (formType.value === 'create') {
-      const resp = await UserApi.createUser(data)
-      if (resp.code == 18888) {
-        await message.confirm(resp.msg)
-        formData.value.isNewUserConfirm = true
-        submitForm()
-      } else {
-        message.success(t('common.createSuccess'))
-      }
+      await UserApi.createUser(data)
+      message.success(t('common.createSuccess'))
    } else {
      await UserApi.updateUser(data)
      message.success(t('common.updateSuccess'))
@@ -227,8 +226,7 @@ const resetForm = () => {
    remark: '',
    status: CommonStatusEnum.ENABLE,
    roleIds: [],
-    hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
-    isNewUserConfirm: false
+    hireDate: formatDate(new Date(), 'YYYY-MM-DD')
  }
  formRef.value?.resetFields()
 }
--- a/src/views/Basic/User/index.vue
+++ b/src/views/Basic/User/index.vue
@@ -6,17 +6,17 @@
    </el-col>
    <el-col :span="20" :xs="24">
      <!-- 搜索 -->
-      <el-form :model="queryParams" ref="queryFormRef" inline label-width="0">
-        <el-form-item>
+      <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
+        <el-form-item label="用户名称" prop="username">
          <el-input
-            v-model="queryParams.nickname"
-            placeholder="请输入姓名"
+            v-model="queryParams.username"
+            placeholder="请输入用户名称"
            clearable
            @keyup.enter="handleQuery"
            class="!w-240px"
          />
        </el-form-item>
-        <el-form-item>
+        <el-form-item label="手机号码" prop="mobile">
          <el-input
            v-model="queryParams.mobile"
            placeholder="请输入手机号码"
@@ -25,12 +25,6 @@
            class="!w-240px"
          />
        </el-form-item>
-        <el-form-item>
-          <el-radio-group v-model="queryParams.status" @change="handleQuery">
-            <el-radio :label="0"> 在职 </el-radio>
-            <el-radio :label="1"> 离职 </el-radio>
-          </el-radio-group>
-        </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>
@@ -46,18 +40,16 @@
      </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="用户名称" 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" width="180">
+        <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)"
            />
@@ -69,7 +61,7 @@
          width="180"
          :formatter="dateFormatter"
        />
-        <el-table-column label="操作" width="200">
+        <el-table-column label="操作" width="260">
          <template #default="scope">
            <el-button
              type="primary"
@@ -122,14 +114,12 @@ const { t } = useI18n() // 国际化
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数
-const queryParams = ref({
+const queryParams = reactive({
  pageNo: 1,
-  pageSize: 20,
+  pageSize: 10,
  username: undefined,
-  nickname: undefined,
  mobile: undefined,
-  deptId: undefined,
-  status: undefined
+  deptId: undefined
 })
 const queryFormRef = ref() // 搜索的表单

@@ -137,7 +127,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
  loading.value = true
  try {
-    const data = await UserApi.getUserPage(queryParams.value)
+    const data = await UserApi.getUserPage(queryParams)
    list.value = data.list
    total.value = data.total
  } finally {
@@ -147,28 +137,19 @@ const getList = async () => {

 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.value.pageNo = 1
+  queryParams.pageNo = 1
  getList()
 }

 /** 重置按钮操作 */
 const resetQuery = () => {
  queryFormRef.value?.resetFields()
-  queryParams.value = {
-    pageNo: 1,
-    pageSize: 20,
-    username: undefined,
-    nickname: undefined,
-    mobile: undefined,
-    deptId: undefined,
-    status: undefined
-  }
  handleQuery()
 }

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

--- a/src/views/Basic/dict/DictTypeForm.vue
+++ b/src/views/Basic/dict/DictTypeForm.vue
@@ -86,7 +86,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
  // 校验表单
-  if (!formRef.value) return
+  if (!formRef) return
  const valid = await formRef.value.validate()
  if (!valid) return
  // 提交请求
--- a/src/views/Basic/dict/data/DictDataForm.vue
+++ b/src/views/Basic/dict/data/DictDataForm.vue
@@ -141,7 +141,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
  // 校验表单
-  if (!formRef.value) return
+  if (!formRef) return
  const valid = await formRef.value.validate()
  if (!valid) return
  // 提交请求
--- a/src/views/Clue/Order/Comp/AfterSales.vue
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@@ -1,306 +0,0 @@
-<template>
-  <div>
-    <el-form :model="searchForm" label-width="0" inline>
-      <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
-          <el-option label="待审核" :value="1" />
-          <el-option label="已撤销" :value="2" />
-          <el-option label="已通过" :value="3" />
-          <el-option label="已驳回" :value="4" />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.signUser"
-          placeholder="登记人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <el-option
-            v-for="item in userOptions"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-date-picker
-          v-model="searchForm.dealDate"
-          type="daterange"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          range-separator="-"
-          start-placeholder="成交日期"
-          end-placeholder="成交日期"
-          style="width: 240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.applyUser"
-          placeholder="申请人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <el-option
-            v-for="item in userOptions"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-date-picker
-          v-model="searchForm.applyTime"
-          type="daterange"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          range-separator="-"
-          start-placeholder="申请日期"
-          end-placeholder="申请日期"
-          style="width: 240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-date-picker
-          v-model="searchForm.checkTime"
-          type="daterange"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          range-separator="-"
-          start-placeholder="审核日期"
-          end-placeholder="审核日期"
-          style="width: 240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
-          查询
-        </el-button>
-        <el-button @click="handleReset" v-hasPermi="['clue:order:after-sale-reset']">
-          重置
-        </el-button>
-        <el-button @click="batchAudit" v-hasPermi="['clue:order:after-sale-batch-audit']">
-          批量审核
-        </el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table
-      v-loading="loading"
-      :data="tableList"
-      border
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="150px" />
-      <el-table-column prop="name" label="线索名称" min-width="150px" />
-      <el-table-column prop="phone" label="联系方式" min-width="120px" />
-      <el-table-column
-        v-if="appStore.getAppInfo?.instanceType == 1"
-        prop="area"
-        label="区域"
-        min-width="90"
-      />
-      <el-table-column prop="reason" label="售后原因" min-width="150px" />
-      <el-table-column prop="refundAmount" label="退款金额" min-width="90px" />
-      <el-table-column prop="percentageDeductAmount" label="提成扣款" min-width="90px" />
-      <el-table-column prop="isCompanyReceipts" label="是否公司收款" min-width="120px" />
-      <el-table-column prop="isReturns" label="是否退货" min-width="90px" />
-      <el-table-column prop="solution" label="解决方案" min-width="150px" />
-      <el-table-column prop="signUserName" label="登记人" min-width="90px" />
-      <el-table-column
-        prop="dealDate"
-        label="成交日期"
-        min-width="120px"
-        :formatter="dateFormatter"
-      />
-      <el-table-column prop="applyUserName" label="申请人" min-width="90px" />
-      <el-table-column
-        prop="applyTime"
-        label="申请时间"
-        min-width="120px"
-        :formatter="dateFormatter"
-      />
-      <el-table-column prop="checkUser" label="审核人" min-width="90" />
-      <el-table-column
-        prop="checkTime"
-        label="审核时间"
-        min-width="120px"
-        :formatter="dateFormatter"
-      />
-      <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90px" />
-      <el-table-column label="操作" width="150px" fixed="right">
-        <template #default="{ row }">
-          <el-button
-            type="primary"
-            style="padding: 0"
-            text
-            v-hasPermi="['clue:order:after-sale-detail']"
-            @click="handleDetail(row.id)"
-          >
-            详情
-          </el-button>
-          <el-button
-            type="primary"
-            style="padding: 0"
-            text
-            v-if="row.state == 1 && currentUserId == row.applyUser"
-            v-hasPermi="['clue:order:after-sale']"
-            @click="handleCancel(row.id)"
-          >
-            撤销
-          </el-button>
-          <el-button
-            type="primary"
-            style="padding: 0"
-            text
-            v-if="row.state == 1"
-            v-hasPermi="['clue:order:after-sale-audit']"
-            @click="handleAudit(row)"
-          >
-            审核
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <Pagination
-      v-model:limit="searchForm.pageSize"
-      v-model:page="searchForm.pageNo"
-      :total="total"
-      @pagination="getList"
-    />
-    <DialogAfterSaleAudit ref="afterSaleAuditDialog" @success="getList" />
-    <DialogAfterSaleDetail ref="afterSaleDetailDialog" />
-    <DialogBatchAudit ref="batchAuditDialog" @success="getList" />
-  </div>
-</template>
-
-<script setup name="AfterSales">
-import * as AfterSaleApi from '@/api/clue/afterSale'
-import { getSimpleUserList as getUserOption } from '@/api/system/user'
-import { useUserStore } from '@/store/modules/user'
-
-import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
-import DialogAfterSaleDetail from './DialogAfterSaleDetail.vue'
-import DialogBatchAudit from './DialogBatchAudit.vue'
-
-import { removeNullField } from '@/utils'
-import { dateFormatter } from '@/utils/formatTime'
-import { useAppStore } from '@/store/modules/app'
-
-const afterSaleAuditDialog = ref()
-
-const userStore = useUserStore()
-const appStore = useAppStore()
-const message = useMessage() // 消息弹窗
-
-const currentUserId = userStore.getUser.id
-
-const searchForm = ref({
-  signId: undefined,
-  name: undefined,
-  dealDate: [],
-  state: undefined,
-  dealUser: undefined,
-  createDate: [],
-  createUser: undefined,
-  checkTime: [],
-  pageNo: 1,
-  pageSize: 20
-})
-
-const userOptions = ref([])
-
-const tableList = ref([])
-const total = ref(0)
-
-function handleSearch() {
-  searchForm.value.pageNo = 1
-  getList()
-}
-
-function handleReset() {
-  searchForm.value = {
-    signId: undefined,
-    name: undefined,
-    state: undefined,
-    dealDate: [],
-    dealUser: undefined,
-    createDate: [],
-    createUser: undefined,
-    checkTime: [],
-    pageNo: 1,
-    pageSize: 20
-  }
-}
-
-const loading = ref(false)
-async function getList() {
-  loading.value = true
-  try {
-    const data = await AfterSaleApi.getAfterSalePage(removeNullField(searchForm.value))
-    tableList.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-const batchIds = ref([])
-function handleSelectionChange(val) {
-  batchIds.value = val.map((it) => it.id)
-}
-
-const batchAuditDialog = ref()
-function batchAudit() {
-  if (batchIds.value.length) {
-    batchAuditDialog.value.open('aftersale', batchIds.value)
-  } else {
-    message.info('请选择表格中需要审核的数据')
-  }
-}
-
-const afterSaleDetailDialog = ref()
-function handleDetail(id) {
-  afterSaleDetailDialog.value.open(id)
-}
-async function handleCancel(id) {
-  try {
-    // 删除的二次确认
-    await message.confirm('是否确认撤销申请？')
-    // 发起删除
-    await AfterSaleApi.cancelApplyAfterSale({ id })
-    message.success('撤销成功！')
-    // 刷新列表
-    await getList()
-  } catch (err) {
-    console.log(err)
-  }
-}
-function handleAudit(row) {
-  afterSaleAuditDialog.value.open(row)
-}
-
-function getOptions() {
-  getUserOption().then((data) => {
-    userOptions.value = data
-  })
-}
-onMounted(() => {
-  getOptions()
-  handleSearch()
-})
-</script>
-
-<style lang="scss" scoped></style>
--- a/src/views/Clue/Order/Comp/Delivery.vue
+++ b/src/views/Clue/Order/Comp/Delivery.vue
@@ -1,195 +0,0 @@
-<template>
-  <div>
-    <el-form :model="searchForm" label-width="0" inline>
-      <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
-          <el-option
-            v-for="item in userOptions"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-date-picker
-          v-model="searchForm.dealDate"
-          type="daterange"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          range-separator="-"
-          start-placeholder="成交日期"
-          end-placeholder="成交日期"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.productId"
-          placeholder="选择成交产品"
-          filterable
-          clearable
-          @change="searchForm.specsId = undefined"
-        >
-          <el-option
-            v-for="item in prodOptions"
-            :key="item.productId"
-            :label="item.productName"
-            :value="item.productId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-select
-          v-model="searchForm.specsId"
-          placeholder="选择规格"
-          filterable
-          clearable
-          :disabled="!searchForm.productId"
-        >
-          <el-option
-            v-for="item in specsOptions(searchForm.productId)"
-            :key="item.specsId"
-            :label="item.specsName"
-            :value="item.specsId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="tableList" border>
-      <el-table-column prop="signId" label="成交单号" min-width="120px" />
-      <el-table-column prop="name" label="线索名称" min-width="120px" />
-      <el-table-column prop="phone" label="联系方式" width="120px" />
-      <el-table-column prop="signUserName" label="登记人" min-width="90" />
-      <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
-      <el-table-column prop="productName" label="成交产品" min-width="150px" />
-      <el-table-column prop="specsName" label="产品规格" min-width="150px" />
-      <el-table-column prop="signNum" label="销售数量" width="90px" />
-      <el-table-column
-        prop="createTime"
-        label="发货时间"
-        width="120px"
-        :formatter="dateFormatter"
-      />
-      <el-table-column prop="batchNo" label="发货批次" min-width="120px" />
-      <el-table-column prop="warehouseName" label="发货仓库" min-width="120px" />
-      <el-table-column prop="sendNum" label="发货数量" width="90px" />
-      <el-table-column label="发货备注">
-        <template #default="scope">
-          <el-popover
-            placement="top"
-            width="500px"
-            trigger="click"
-            v-if="scope.row.warehouseName && scope.row.remark"
-          >
-            <template #reference>
-              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-            </template>
-            <div v-dompurify-html="scope.row.remark"></div>
-          </el-popover>
-        </template>
-      </el-table-column>
-    </el-table>
-    <Pagination
-      v-model:limit="searchForm.pageSize"
-      v-model:page="searchForm.pageNo"
-      :total="total"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script setup name="Delivery">
-import { getSimpleUserList as getUserOption } from '@/api/system/user'
-import { getSimpleProductList } from '@/api/mall/product'
-import * as DeliveryApi from '@/api/clue/delivery'
-import { removeNullField } from '@/utils'
-
-import { dateFormatter } from '@/utils/formatTime'
-// const message = useMessage() // 消息弹窗
-
-const searchForm = ref({
-  signId: undefined,
-  name: undefined,
-  dealDate: [],
-  signUser: undefined,
-  productId: undefined,
-  specsId: undefined,
-  pageNo: 1,
-  pageSize: 20
-})
-
-const userOptions = ref([])
-
-const tableList = ref([])
-const total = ref(0)
-
-function handleSearch() {
-  searchForm.value.pageNo = 1
-  getList()
-}
-
-function handleReset() {
-  searchForm.value = {
-    signId: undefined,
-    name: undefined,
-    dealDate: [],
-    signUser: undefined,
-    productId: undefined,
-    specsId: undefined,
-    pageNo: 1,
-    pageSize: 20
-  }
-}
-
-const loading = ref(false)
-async function getList() {
-  loading.value = true
-  try {
-    const data = await DeliveryApi.getDeliveryPage(removeNullField(searchForm.value))
-    tableList.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-const prodOptions = ref([])
-
-const specsOptions = computed({
-  get() {
-    return (prodId) => {
-      if (prodId) {
-        return prodOptions.value.find((it) => it.productId == prodId).productSpecList
-      }
-      return []
-    }
-  }
-})
-function getOptions() {
-  getUserOption().then((data) => {
-    userOptions.value = data
-  })
-  // 产品
-  getSimpleProductList().then((data) => {
-    prodOptions.value = data
-  })
-}
-
-onMounted(() => {
-  getOptions()
-  handleSearch()
-})
-</script>
-
-<style lang="scss" scoped></style>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
caolin	ab30f1307f	Merge remote-tracking branch 'origin/main' into dev-cl	2024-06-06 19:00:17 +08:00
caolin	92e5a032b5	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-06-05 18:42:28 +08:00
caolin	dd6ae89728	Merge remote-tracking branch 'origin/main' into dev-cl	2024-05-30 19:38:25 +08:00
caolin	b407d0a04d	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-05-29 18:51:14 +08:00
caolin	82e7731583	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-05-27 21:31:02 +08:00
caolin	9d006fe6a5	本地启动	2024-05-25 12:51:47 +08:00
caolin	f4231a13e5	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl # Conflicts: # .env.base # vite.config.js	2024-05-25 11:55:10 +08:00
caolin	2c2ffcd104	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl	2024-05-21 20:26:37 +08:00
caolin	028883975d	Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl # Conflicts: # vite.config.js	2024-05-19 23:20:51 +08:00
caolin	acc59c3a9e	本地启动	2024-05-07 00:03:52 +08:00