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

# Conflicts:
#	.env.base

.env.base

@@ -4,16 +4,30 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
+# VITE_BASE_URL='http://47.98.161.246:48080'
+#VITE_BASE_URL='http://114.215.207.150:48080'
+
+# 高德地图key密钥
+# 1寻驾
+VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
+# 2莳松
+# VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
+
+# 小程序接口请求路劲
+VITE_APPLET_URL='https://cloud.ahduima.com'
+# 题库路径
+VITE_TIKU_URL = 'http://47.98.161.246'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
+# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/dev-api
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/

.env.dev

@@ -7,16 +7,16 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/dev-api
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 是否删除debugger
 VITE_DROP_DEBUGGER=false

.env.front

@@ -4,19 +4,20 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+#VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=/dev-api
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 项目本地运行端口号, 与.vscode/launch.json配合
 VITE_PORT=80

.env.pro

@@ -4,13 +4,18 @@ VITE_NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='/crm-api'
+# 高德地图key密钥
+# 1寻驾
+VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
+# 2莳松
+# VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='/crm-api/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +30,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 输出路径
 VITE_OUT_DIR=dist-pro

.env.stage

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 
 # 上传路径
-VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'
+VITE_BASE_PATH='/crm'
 
 # 输出路径
 VITE_OUT_DIR=dist-stage

.env.static

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true
 VITE_SOURCEMAP=false
 
 # 打包路径
-VITE_BASE_PATH=/admin-ui-vue3/
+VITE_BASE_PATH=/crm/
 
 # 输出路径
 VITE_OUT_DIR=dist-dev

.env.test

@@ -7,10 +7,10 @@ VITE_DEV=false
 VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
 
 # 接口前缀
-VITE_API_BASEPATH=
+VITE_API_BASEPATH=/crm-api
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=false
 VITE_SOURCEMAP=true
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/crm/
 
 # 输出路径
 VITE_OUT_DIR=dist-test

.vscode/extensions.json

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

.vscode/launch.json

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

.vscode/settings.json

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

index.html

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

package.json

@@ -39,6 +39,7 @@
     "@vueuse/core": "^10.1.2",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.10",
+    "@wangeditor/plugin-upload-attachment": "^1.1.0",
     "@zxcvbn-ts/core": "^3.0.1",
     "animate.css": "^4.1.1",
     "axios": "^1.4.0",
@@ -51,7 +52,7 @@
     "diagram-js": "^11.6.0",
     "echarts": "^5.4.2",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "2.3.4",
+    "element-plus": "2.9.4",
     "fast-xml-parser": "^4.2.2",
     "highlight.js": "^11.8.0",
     "intro.js": "^7.0.1",
@@ -69,9 +70,11 @@
     "vue": "3.3.4",
     "vue-amap": "^0.5.10",
     "vue-dompurify-html": "^5.0.1",
+    "vue-draggable-plus": "^0.6.0",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.2.1",
     "vue-types": "^5.0.3",
+    "vue3-tree-org": "^4.2.2",
     "vuedraggable": "^4.1.0",
     "web-storage-cache": "^1.1.1",
     "xe-utils": "^3.5.7",

src/App.vue

@@ -2,19 +2,19 @@
 import { isDark } from '@/utils/is'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
 import routerSearch from '@/components/RouterSearch/index.vue'
+import cache from '@/plugins/cache'
 
 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('app')
 const appStore = useAppStore()
 const currentSize = computed(() => appStore.getCurrentSize)
 const greyMode = computed(() => appStore.getGreyMode)
-const { wsCache } = useCache()
 
 // 根据浏览器当前主题设置系统主题色
 const setDefaultTheme = () => {
-  let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
+  let isDarkTheme = cache.local.get(CACHE_KEY.IS_DARK)
   if (isDarkTheme === null) {
     isDarkTheme = isDark()
   }

src/api/clue/afterSale.js

@@ -0,0 +1,39 @@
+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 })
+}

src/api/clue/clueCache.js

@@ -0,0 +1,11 @@
+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 })
+}

src/api/clue/clueField.js

@@ -0,0 +1,40 @@
+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 })
+}

src/api/clue/clueGetSet.js

@@ -0,0 +1,26 @@
+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}` })
+}

src/api/clue/delivery.js

@@ -0,0 +1,21 @@
+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 })
+}

src/api/clue/extraFee.js

@@ -0,0 +1,30 @@
+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' })
+}

src/api/clue/followRecord.js

@@ -0,0 +1,20 @@
+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 })
+}

src/api/clue/index.js

@@ -0,0 +1,64 @@
+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 })
+}

src/api/clue/orderField.js

@@ -0,0 +1,40 @@
+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 })
+}

src/api/clue/payment.js

@@ -0,0 +1,52 @@
+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
+  })
+}
+
+// 导出
+export const exportPayment = async (params) => {
+  return await request.download({ url: '/admin-api/crm/sign-pay-record/export-excel', params })
+}

src/api/clue/settle.js

@@ -0,0 +1,31 @@
+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 })
+}

src/api/clue/sign.js

@@ -0,0 +1,63 @@
+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 })
+}
+
+// 新增产品
+export const addOrderProduct = (data) => {
+  return request.post({ url: '/admin-api/crm/sign-prodcut/create', data })
+}
+
+// 新增产品
+export const removeOrderProduct = (id) => {
+  return request.delete({ url: '/admin-api/crm/sign-prodcut/delete?id=' + id })
+}

src/api/clue/skill.js

@@ -0,0 +1,26 @@
+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}` })
+}

src/api/clue/source.js

@@ -0,0 +1,31 @@
+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 })
+}

src/api/home/index.js

@@ -0,0 +1,20 @@
+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 })
+}

src/api/home/reportChannel.js

@@ -0,0 +1,8 @@
+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 })
+}

src/api/home/reportSaler.js

@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+export const getInfo = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/sale/report/detail', data })
+}
+
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/sale/report', data })
+}

src/api/home/reportSignDetail.js

@@ -0,0 +1,8 @@
+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 })
+}

src/api/home/reportSignRate.js

@@ -0,0 +1,4 @@
+import request from '@/config/axios'
+export const getList = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sch-clue/signRate/report', data })
+}

src/api/infra/file/index.ts

@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+export interface FilePageReqVO extends PageParam {
+  path?: string
+  type?: string
+  createTime?: Date[]
+}
+
+// 文件预签名地址 Response VO
+export interface FilePresignedUrlRespVO {
+  // 文件配置编号
+  configId: number
+  // 文件上传 URL
+  uploadUrl: string
+  // 文件 URL
+  url: string
+}
+
+// 查询文件列表
+export const getFilePage = (params: FilePageReqVO) => {
+  return request.get({ url: '/infra/file/page', params })
+}
+
+// 删除文件
+export const deleteFile = (id: number) => {
+  return request.delete({ url: '/infra/file/delete?id=' + id })
+}
+
+// 获取文件预签名地址
+export const getFilePresignedUrl = (path: string) => {
+  return request.get<FilePresignedUrlRespVO>({
+    url: '/infra/file/presigned-url',
+    params: { path }
+  })
+}
+
+// 创建文件
+export const createFile = (data: any) => {
+  return request.post({ url: '/infra/file/create', data })
+}
+
+// 上传文件
+export const updateFile = (data: any) => {
+  return request.upload({ url: '/admin-api/system/file/upload', data })
+}

src/api/kpi/index.js

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

src/api/kpi/score.js

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

src/api/login/index.ts

@@ -71,3 +71,10 @@ 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
+  })
+}

src/api/mall/product/brand.ts

@@ -32,30 +32,30 @@ export interface BrandVO {
 
 // 创建商品品牌
 export const createBrand = (data: BrandVO) => {
-  return request.post({ url: '/product/brand/create', data })
+  return request.post({ url: '/admin-api/crm/erp-product-brand/create', data, isSubmitForm: true })
 }
 
 // 更新商品品牌
 export const updateBrand = (data: BrandVO) => {
-  return request.put({ url: '/product/brand/update', data })
+  return request.put({ url: '/admin-api/crm/erp-product-brand/update', data })
 }
 
 // 删除商品品牌
 export const deleteBrand = (id: number) => {
-  return request.delete({ url: `/product/brand/delete?id=${id}` })
+  return request.delete({ url: `/admin-api/crm/erp-product-brand/delete?id=${id}` })
 }
 
 // 获得商品品牌
 export const getBrand = (id: number) => {
-  return request.get({ url: `/product/brand/get?id=${id}` })
+  return request.get({ url: `/admin-api/crm/erp-product-brand/get?id=${id}` })
 }
 
 // 获得商品品牌列表
 export const getBrandParam = (params: PageParam) => {
-  return request.get({ url: '/product/brand/page', params })
+  return request.get({ url: '/admin-api/crm/erp-product-brand/page', params })
 }
 
 // 获得商品品牌精简信息列表
 export const getSimpleBrandList = () => {
-  return request.get({ url: '/product/brand/list-all-simple' })
+  return request.get({ url: '/admin-api/crm/erp-product-brand/simple-list' })
 }

src/api/mall/product/category.ts

@@ -36,25 +36,34 @@ export interface CategoryVO {
 
 // 创建商品分类
 export const createCategory = (data: CategoryVO) => {
-  return request.post({ url: '/product/category/create', data })
+  return request.post({
+    url: '/admin-api/crm/erp-product-category/create',
+    data,
+    isSubmitForm: true
+  })
 }
 
 // 更新商品分类
 export const updateCategory = (data: CategoryVO) => {
-  return request.put({ url: '/product/category/update', data })
+  return request.put({ url: '/admin-api/crm/erp-product-category/update', data })
 }
 
 // 删除商品分类
 export const deleteCategory = (id: number) => {
-  return request.delete({ url: `/product/category/delete?id=${id}` })
+  return request.delete({ url: `/admin-api/crm/erp-product-category/delete?id=${id}` })
 }
 
 // 获得商品分类
 export const getCategory = (id: number) => {
-  return request.get({ url: `/product/category/get?id=${id}` })
+  return request.get({ url: `/admin-api/crm/erp-product-category/get?id=${id}` })
 }
 
 // 获得商品分类列表
 export const getCategoryList = (params: any) => {
-  return request.get({ url: '/product/category/list', params })
+  return request.get({ url: '/admin-api/crm/erp-product-category/list', params })
+}
+
+// 获得商品分类列表
+export const getCategorySimpleList = (params: any) => {
+  return request.get({ url: '/admin-api/crm/erp-product-category/simple-list', params })
 }

src/api/mall/product/index.js

@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+// 查询列表
+export const getProductPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-product/page', params })
+}
+
+// 查询详情
+export const getProduct = async (id) => {
+  return await request.get({ url: '/admin-api/crm/erp-product/get?id=' + id })
+}
+
+// 新增
+export const createProduct = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-product/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateProduct = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-product/update', data: params })
+}
+
+// 删除
+export const deleteProduct = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-product/delete?id=' + id })
+}
+
+export const getSimpleProductList = async () => {
+  return await request.get({ url: '/admin-api/crm/erp-product/simple-list' })
+}

src/api/mall/product/productField.js

@@ -0,0 +1,44 @@
+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 })
+}

src/api/mall/product/property.ts

@@ -42,7 +42,11 @@ export interface PropertyValueDetailVO {
 
 // 创建属性项
 export const createProperty = (data: PropertyVO) => {
-  return request.post({ url: '/product/property/create', data })
+  return request.post({
+    url: '/admin-api/crm/erp-product-property/create',
+    data,
+    isSubmitForm: true
+  })
 }
 
 // 更新属性项
@@ -89,7 +93,7 @@ export const getPropertyValue = (id: number): Promise<PropertyValueVO> => {
 
 // 创建属性值
 export const createPropertyValue = (data: PropertyValueVO) => {
-  return request.post({ url: '/product/property/value/create', data })
+  return request.post({ url: '/admin-api/crm/erp-product-property-value/create', data })
 }
 
 // 更新属性值

src/api/mall/product/spu.ts

@@ -1,92 +0,0 @@
-import request from '@/config/axios'
-
-export interface Property {
-  propertyId?: number // 属性编号
-  propertyName?: string // 属性名称
-  valueId?: number // 属性值编号
-  valueName?: string // 属性值名称
-}
-
-// TODO puhui999：是不是直接叫 Sku 更简洁一点哈。type 待后面，总感觉有个类型？
-export interface SkuType {
-  id?: number // 商品 SKU 编号
-  spuId?: number // SPU 编号
-  properties?: Property[] // 属性数组
-  price?: number // 商品价格
-  marketPrice?: number // 市场价
-  costPrice?: number // 成本价
-  barCode?: string // 商品条码
-  picUrl?: string // 图片地址
-  stock?: number // 库存
-  weight?: number // 商品重量，单位：kg 千克
-  volume?: number // 商品体积，单位：m^3 平米
-  subCommissionFirstPrice?: number // 一级分销的佣金
-  subCommissionSecondPrice?: number // 二级分销的佣金
-  salesCount?: number // 商品销量
-}
-
-// TODO puhui999：是不是直接叫 Spu 更简洁一点哈。type 待后面，总感觉有个类型？
-export interface SpuType {
-  id?: number
-  name?: string // 商品名称
-  categoryId?: number | null // 商品分类
-  keyword?: string // 关键字
-  unit?: number | null // 单位
-  picUrl?: string // 商品封面图
-  sliderPicUrls?: string[] // 商品轮播图
-  introduction?: string // 商品简介
-  deliveryTemplateId?: number | null // 运费模版
-  brandId?: number | null // 商品品牌编号
-  specType?: boolean // 商品规格
-  subCommissionType?: boolean // 分销类型
-  skus: SkuType[] // sku数组
-  description?: string // 商品详情
-  sort?: string // 商品排序
-  giveIntegral?: number // 赠送积分
-  virtualSalesCount?: number // 虚拟销量
-  recommendHot?: boolean // 是否热卖
-  recommendBenefit?: boolean // 是否优惠
-  recommendBest?: boolean // 是否精品
-  recommendNew?: boolean // 是否新品
-  recommendGood?: boolean // 是否优品
-}
-
-// 获得 Spu 列表
-export const getSpuPage = (params: PageParam) => {
-  return request.get({ url: '/product/spu/page', params })
-}
-
-// 获得 Spu 列表 tabsCount
-export const getTabsCount = () => {
-  return request.get({ url: '/product/spu/get-count' })
-}
-
-// 创建商品 Spu
-export const createSpu = (data: SpuType) => {
-  return request.post({ url: '/product/spu/create', data })
-}
-
-// 更新商品 Spu
-export const updateSpu = (data: SpuType) => {
-  return request.put({ url: '/product/spu/update', data })
-}
-
-// 更新商品 Spu status
-export const updateStatus = (data: { id: number; status: number }) => {
-  return request.put({ url: '/product/spu/update-status', data })
-}
-
-// 获得商品 Spu
-export const getSpu = (id: number) => {
-  return request.get({ url: `/product/spu/get-detail?id=${id}` })
-}
-
-// 删除商品 Spu
-export const deleteSpu = (id: number) => {
-  return request.delete({ url: `/product/spu/delete?id=${id}` })
-}
-
-// 导出商品 Spu Excel
-export const exportSpu = async (params) => {
-  return await request.download({ url: '/product/spu/export', params })
-}

src/api/mall/purchase/index.js

@@ -0,0 +1,29 @@
+import request from '@/config/axios'
+// 查询列表
+export const getPurchasePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-purchase/page', params })
+}
+
+// 新增
+export const createPurchase = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-purchase/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updatePurchase = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-purchase/update', data: params })
+}
+
+// 删除
+export const deletePurchase = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-purchase/delete?id=' + id })
+}
+
+// 审核
+export const auditPurchase = async (data) => {
+  return await request.post({ url: '/admin-api/crm/erp-purchase/audit', data })
+}

src/api/mall/warehouse/index.js

@@ -0,0 +1,49 @@
+import request from '@/config/axios'
+// 查询列表
+export const getWarehousePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-warehouse/page', params })
+}
+
+// 新增
+export const createWarehouse = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-warehouse/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateWarehouse = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-warehouse/update', data: params })
+}
+
+// 删除
+export const deleteWarehouse = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-warehouse/delete?id=' + id })
+}
+
+// 获取仓库
+export const getWarehouse = async (id) => {
+  return await request.get({ url: '/admin-api/crm/erp-warehouse/get?id=' + id })
+}
+
+// 获取仓库列表
+export const getSimpleWarehouseList = async () => {
+  return await request.get({ url: '/admin-api/crm/erp-warehouse/simple-list' })
+}
+
+// 获取库存
+export const getInventoryList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-inventory/page', params })
+}
+
+// 获取库存变动记录
+export const getInventoryRecord = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-inventory-record/page', params })
+}
+
+// 获取剩余库存
+export const getRemainInventoryList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-inventory-detail/list', params })
+}

src/api/okr/comment.js

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

src/api/okr/meeting.js

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

src/api/okr/okr.js

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

src/api/okr/wait.js

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

src/api/pers/attendancePlan.js

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

src/api/pers/employee.js

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

src/api/school/class/index.js

@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+// 查询列表-分页
+export const getClassTypePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/page', params })
+}
+
+export const getClassTypeList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/list', params })
+}
+
+// 查询详情
+export const getClassType = async (id) => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/get?id=' + id })
+}
+
+// 新增
+export const createClassType = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/sch-class-type/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateClassType = async (params) => {
+  return await request.put({ url: '/admin-api/crm/sch-class-type/update', data: params })
+}
+
+// 删除
+export const deleteClassType = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/sch-class-type/delete?id=' + id })
+}
+
+// 修改状态
+export const updateClassTypeStatus = async (data) => {
+  return request.put({ url: '/admin-api/crm/sch-class-type/status/update', data })
+}
+
+// 批量修改状态
+export const batchUpdateClassTypeStatus = async (data) => {
+  return request.put({ url: '/admin-api/crm/sch-class-type/status/batch-update', data })
+}
+
+// 批量删除
+export const batchDeleteClassType = async (ids) => {
+  return await request.delete({ url: '/admin-api/crm/sch-class-type/batch-delete?ids=' + ids })
+}
+
+// 获取提成结算参数
+export const getCommissionParams = async () => {
+  return await request.get({ url: '/admin-api/crm/sch-class-type/get-percentage-param' })
+}

src/api/school/place/index.js

@@ -17,7 +17,11 @@ export const getPlace = async (id) => {
 
 // 新增
 export const createPlace = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-place/create', data: data })
+  return await request.post({
+    url: '/admin-api/crm/sch-place/create',
+    data: data,
+    isSubmitForm: true
+  })
 }
 
 // 修改
@@ -30,10 +34,10 @@ export const deletePlace = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-place/delete?id=' + id })
 }
 
-export const updatePlaceStatus = async (id, status) => {
+export const updatePlaceStatus = async (placeId, status) => {
   const data = {
-    id,
+    placeId,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-place/update-status', data: data })
+  return request.put({ url: '/admin-api/crm/sch-place/status/update', data: data })
 }

src/api/school/sch/index.js

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-
 // 查询列表
 export const getSchoolPage = async (params) => {
   return await request.get({ url: '/admin-api/crm/sch-school/page', params })
@@ -12,7 +11,11 @@ export const getSchool = async (id) => {
 
 // 新增
 export const createSchool = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sch-school/create', data: data })
+  return await request.post({
+    url: '/admin-api/crm/sch-school/create',
+    data: data,
+    isSubmitForm: true
+  })
 }
 
 // 修改
@@ -25,10 +28,10 @@ export const deleteSchool = async (id) => {
   return await request.delete({ url: '/admin-api/crm/sch-school/delete?id=' + id })
 }
 
-export const updateSchoolStatus = async (id, status) => {
+export const updateSchoolStatus = async (schoolId, status) => {
   const data = {
-    id,
+    schoolId,
     status
   }
-  return request.put({ url: '/admin-api/crm/sch-school/update-status', data: data })
+  return request.put({ url: '/admin-api/crm/sch-school/status/update', data: data })
 }

src/api/school/setting/area.js

@@ -0,0 +1,33 @@
+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 })
+}

src/api/school/setting/supplier.js

@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+// 查询列表
+export const getSupplierPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-supplier/page', params })
+}
+
+export const getSupplierSimpleList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-supplier/simple-list', params })
+}
+
+// 查询详情
+export const getSupplier = async (id) => {
+  return await request.get({ url: '/admin-api/crm/erp-supplier/get?id=' + id })
+}
+
+// 新增
+export const createSupplier = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-supplier/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateSupplier = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-supplier/update', data: params })
+}
+
+// 删除
+export const deleteSupplier = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-supplier/delete?id=' + id })
+}

src/api/system/dept/index.ts

@@ -41,3 +41,13 @@ 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 })
+}

src/api/system/dict/dict.data.ts

@@ -15,35 +15,40 @@ export type DictDataVO = {
 
 // 查询字典数据（精简)列表
 export const listSimpleDictData = () => {
-  return request.get({ url: '/admin-api/system/dict-data/list-all-simple' })
+  return request.get({ url: '/admin-api/crm/dict-data/simple-list' })
 }
 
 // 查询字典数据列表
 export const getDictDataPage = (params: PageParam) => {
-  return request.get({ url: '/admin-api/system/dict-data/page', params })
+  return request.get({ url: '/admin-api/crm/dict-data/page', params })
 }
 
 // 查询字典数据详情
 export const getDictData = (id: number) => {
-  return request.get({ url: '/admin-api/system/dict-data/get?id=' + id })
+  return request.get({ url: '/admin-api/crm/dict-data/get?id=' + id })
 }
 
 // 新增字典数据
 export const createDictData = (data: DictDataVO) => {
-  return request.post({ url: '/admin-api/system/dict-data/create', data })
+  return request.post({ url: '/admin-api/crm/dict-data/create', data })
 }
 
 // 修改字典数据
 export const updateDictData = (data: DictDataVO) => {
-  return request.put({ url: '/admin-api/system/dict-data/update', data })
+  return request.put({ url: '/admin-api/crm/dict-data/update', data })
 }
 
 // 删除字典数据
 export const deleteDictData = (id: number) => {
-  return request.delete({ url: '/admin-api/system/dict-data/delete?id=' + id })
+  return request.delete({ url: '/admin-api/crm/dict-data/delete?id=' + id })
 }
 
 // 导出字典类型数据
-export const exportDictData = (params) => {
-  return request.get({ url: '/admin-api/system/dict-data/export', params })
+export const exportDictData = (params: any) => {
+  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 } })
 }

src/api/system/dict/dict.type.ts

@@ -11,34 +11,34 @@ export type DictTypeVO = {
 
 // 查询字典（精简)列表
 export const getSimpleDictTypeList = () => {
-  return request.get({ url: '/admin-api/system/dict-type/list-all-simple' })
+  return request.get({ url: '/admin-api/crm/dict-type/list-all-simple' })
 }
 
 // 查询字典列表
 export const getDictTypePage = (params: PageParam) => {
-  return request.get({ url: '/admin-api/system/dict-type/page', params })
+  return request.get({ url: '/admin-api/crm/dict-type/page', params })
 }
 
 // 查询字典详情
 export const getDictType = (id: number) => {
-  return request.get({ url: '/admin-api/system/dict-type/get?id=' + id })
+  return request.get({ url: '/admin-api/crm/dict-type/get?id=' + id })
 }
 
 // 新增字典
 export const createDictType = (data: DictTypeVO) => {
-  return request.post({ url: '/admin-api/system/dict-type/create', data })
+  return request.post({ url: '/admin-api/crm/dict-type/create', data })
 }
 
 // 修改字典
 export const updateDictType = (data: DictTypeVO) => {
-  return request.put({ url: '/admin-api/system/dict-type/update', data })
+  return request.put({ url: '/admin-api/crm/dict-type/update', data })
 }
 
 // 删除字典
 export const deleteDictType = (id: number) => {
-  return request.delete({ url: '/admin-api/system/dict-type/delete?id=' + id })
+  return request.delete({ url: '/admin-api/crm/dict-type/delete?id=' + id })
 }
 // 导出字典类型
 export const exportDictType = (params) => {
-  return request.get({ url: '/admin-api/system/dict-type/export', params })
+  return request.get({ url: '/admin-api/crm/dict-type/export', params })
 }

src/api/system/library/index.js

@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 查询知识库列表
+export const getLibraryPage = (params) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib/page', params })
+}
+
+// 查询知识库详情
+export const getLibrary = (id) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib/get?id=' + id })
+}
+
+// 新增知识库
+export const createLibrary = (data) => {
+  return request.post({ url: '/admin-api/crm/knowledge-lib/create', data })
+}
+
+// 修改知识库
+export const updateLibrary = (data) => {
+  return request.put({ url: '/admin-api/crm/knowledge-lib/update', data })
+}
+
+// 删除知识库
+export const deleteLibrary = (id) => {
+  return request.delete({ url: '/admin-api/crm/knowledge-lib/delete?id=' + id })
+}

src/api/system/library/resource.js

@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 查询资源列表
+export const getResourcePage = (params) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib-info/page', params })
+}
+
+// 查询资源详情
+export const getResource = (id) => {
+  return request.get({ url: '/admin-api/crm/knowledge-lib-info/get?id=' + id })
+}
+
+// 新增资源
+export const createResource = (data) => {
+  return request.post({ url: '/admin-api/crm/knowledge-lib-info/create', data })
+}
+
+// 修改资源
+export const updateResource = (data) => {
+  return request.put({ url: '/admin-api/crm/knowledge-lib-info/update', data })
+}
+
+// 删除资源
+export const deleteResource = (id) => {
+  return request.delete({ url: '/admin-api/crm/knowledge-lib-info/delete?id=' + id })
+}

src/api/system/menu/index.ts

@@ -17,7 +17,10 @@ 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' })

src/api/system/notify/message/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import qs from 'qs'
 
 export interface NotifyMessageVO {
   id: number
@@ -16,35 +15,39 @@ export interface NotifyMessageVO {
 }
 
 // 查询站内信消息列表
-export const getNotifyMessagePage = async (params: PageParam) => {
+export const getNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }
 
 // 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: PageParam) => {
+export const getMyNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }
 
 // 批量标记已读
-export const updateNotifyMessageRead = async (ids) => {
+export const updateNotifyMessageRead = async (data: any) => {
   return await request.put({
-    url:
-      '/admin-api/system/notify-message/update-read?' +
-      qs.stringify({ ids: ids }, { indices: false })
+    url: '/admin-api/system/notify-message/update-read?',
+    data
   })
 }
 
 // 标记所有站内信为已读
-export const updateAllNotifyMessageRead = async () => {
-  return await request.put({ url: '/admin-api/system/notify-message/update-all-read' })
+export const updateAllNotifyMessageRead = async (data: any) => {
+  return await request.put({ url: '/admin-api/system/notify-message/update-all-read', data })
 }
 
 // 获取当前用户的最新站内信列表
-export const getUnreadNotifyMessageList = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list' })
+export const getUnreadNotifyMessageList = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list', params })
 }
 
 // 获得当前用户的未读站内信数量
-export const getUnreadNotifyMessageCount = async () => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
+export const getUnreadNotifyMessageCount = async (params: any) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count', params })
+}
+
+// 获取详情
+export const getNotifyMessageDetail = async (id: number) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get', params: { id } })
 }

src/api/system/role/daliyReport.js

@@ -0,0 +1,25 @@
+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'
+  })
+}

src/api/system/set/index.js

@@ -0,0 +1,16 @@
+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 })
+}

src/api/system/user/index.ts

@@ -12,9 +12,11 @@ export interface UserVO {
   avatar: string
   loginIp: string
   status: number
+  hireStatus: number
   remark: string
   loginDate: Date
   createTime: Date
+  retireDate: string
 }
 
 // 查询用户管理列表
@@ -62,10 +64,17 @@ export const resetUserPwd = (id: number, password: string) => {
 }
 
 // 用户状态修改
-export const updateUserStatus = (id: number, status: number) => {
+export const updateUserStatus = (
+  id: number,
+  status: number,
+  retireDate: string,
+  hireStatus: number
+) => {
   const data = {
     id,
-    status
+    status,
+    retireDate,
+    hireStatus
   }
   return request.put({ url: '/admin-api/system/user/update-status', data: data })
 }
@@ -74,3 +83,18 @@ 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' })
+}
+
+// 获取钉钉id
+export const getDDIdByPhone = (params) => {
+  return request.get({ url: '/admin-api/system/user/getDingTalkUserIdByMobile', params })
+}

src/api/system/wechat/index.js

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

src/api/xjapplet/discount.js

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

src/api/xjapplet/resell.js

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

src/api/xjapplet/vip.js

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

src/api/xjapplet/vipdatabase.js

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

src/api/xjapplet/xjdatabase.js

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

src/components/ConfigGlobal/src/ConfigGlobal.vue

@@ -22,13 +22,13 @@ onMounted(() => {
   appStore.setCssVarTheme()
 })
 
-const { width } = useWindowSize()
+const { width, height } = useWindowSize()
 
 // 监听窗口变化
 watch(
   () => width.value,
   (width: number) => {
-    if (width < 768) {
+    if (width < 768 || height.value < 450) {
       !appStore.getMobile ? appStore.setMobile(true) : undefined
       setCssVar('--left-menu-min-width', '0')
       appStore.setCollapse(true)

src/components/Descriptions/src/Descriptions.vue

@@ -27,7 +27,8 @@ const props = defineProps({
   data: {
     type: Object as PropType<any>,
     default: () => ({})
-  }
+  },
+  defaultShow: propTypes.bool.def(true)
 })
 
 const { getPrefixCls } = useDesign()
@@ -57,7 +58,7 @@ const getBindItemValue = (item: DescriptionsSchema) => {
 }
 
 // 折叠
-const show = ref(true)
+const show = ref(props.defaultShow)
 
 const toggleClick = () => {
   if (props.collapse) {
@@ -77,7 +78,7 @@ const toggleClick = () => {
       v-if="title"
       :class="[
         `${prefixCls}-header`,
-        '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)]'
+        '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)]'
       ]"
       @click="toggleClick"
     >
@@ -131,7 +132,7 @@ const toggleClick = () => {
                 <DictTag :type="item.dictType" :value="data[item.field] + ''" />
               </slot>
               <slot v-else-if="item.isEditor">
-                <div v-dompurify-html="data[item.field]"></div>
+                <div v-if="data[item.field]" v-dompurify-html="data[item.field]"></div>
               </slot>
               <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
             </template>

src/components/Dialog/src/Dialog.vue

@@ -55,6 +55,8 @@ const dialogStyle = computed(() => {
     height: unref(dialogHeight)
   }
 })
+
+const emit = defineEmits(['close'])
 </script>
 
 <template>
@@ -65,20 +67,25 @@ const dialogStyle = computed(() => {
     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>
-        <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 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>
       </div>
     </template>
 

src/components/DictTag/src/DictTag.vue

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

src/components/Echart/src/Echart.vue

@@ -66,6 +66,7 @@ watch(
   (options) => {
     if (echartRef) {
       echartRef?.setOption(options)
+      resizeHandler()
     }
   },
   {

src/components/Editor/src/Editor.vue

@@ -6,7 +6,7 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 import { ElMessage } from 'element-plus'
 import { useLocaleStore } from '@/store/modules/locale'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
 
 type InsertFnType = (url: string, alt: string, href: string) => void
 
@@ -21,10 +21,34 @@ const props = defineProps({
   height: propTypes.oneOfType([Number, String]).def('40vh'),
   editorConfig: {
     type: Object as PropType<Partial<IEditorConfig>>,
-    default: () => undefined
+    default: () => ({})
   },
   readonly: propTypes.bool.def(false),
-  modelValue: propTypes.string.def('')
+  modelValue: propTypes.string.def(''),
+  toolbarConfig: {
+    type: Object,
+    default: () => ({
+      excludeKeys: [
+        'insertVideo', // 网络视频
+        'insertImage', // 网络图片
+        'insertLink', // 链接
+        'codeBlock', // 代码块
+        'headerSelect', // 标题
+        'blockquote', // 引用
+        'fontFamily', // 字体
+        'todo', // 代办
+        'group-indent', // 缩进
+        'emotion', // 表情
+        'undo', // 撤销
+        'redo', // 重做
+        'fullScreen'
+      ],
+      insertKeys: {
+        index: 20, // 自定义插入的位置
+        keys: ['uploadAttachment'] // “上传附件”菜单
+      }
+    })
+  }
 })
 
 const emit = defineEmits(['change', 'update:modelValue'])
@@ -84,6 +108,12 @@ const editorConfig = computed((): IEditorConfig => {
       },
       autoFocus: false,
       scroll: true,
+      // 在编辑器中，点击选中“附件”节点时，要弹出的菜单
+      hoverbarKeys: {
+        attachment: {
+          menuKeys: ['downloadAttachment'] // “下载附件”菜单
+        }
+      },
       MENU_CONF: {
         ['uploadImage']: {
           server: import.meta.env.VITE_UPLOAD_URL,
@@ -103,7 +133,8 @@ const editorConfig = computed((): IEditorConfig => {
           headers: {
             Accept: '*',
             Authorization: 'Bearer ' + getAccessToken(),
-            'tenant-id': getTenantId()
+            'tenant-id': getTenantId(),
+            'instance-id': getAppId()
           },
 
           // 跨域是否传递 cookie ，默认为 false
@@ -140,6 +171,109 @@ const editorConfig = computed((): IEditorConfig => {
           customInsert(res: any, insertFn: InsertFnType) {
             insertFn(res.data, 'image', res.data)
           }
+        },
+        ['uploadVideo']: {
+          server: import.meta.env.VITE_UPLOAD_URL,
+          // 单个文件的最大体积限制，默认为 2M
+          maxFileSize: 100 * 1024 * 1024,
+          // 最多可上传几个文件，默认为 100
+          maxNumberOfFiles: 10,
+          // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+          allowedFileTypes: ['video/*'],
+
+          // 自定义上传参数，例如传递验证的 token 等。参数会被添加到 formData 中，一起上传到服务端。
+          meta: { updateSupport: 0 },
+          // 将 meta 拼接到 url 参数中，默认 false
+          metaWithUrl: true,
+
+          // 自定义增加 http  header
+          headers: {
+            Accept: '*',
+            Authorization: 'Bearer ' + getAccessToken(),
+            'tenant-id': getTenantId(),
+            'instance-id': getAppId()
+          },
+
+          // 跨域是否传递 cookie ，默认为 false
+          withCredentials: true,
+
+          // 超时时间，默认为 10 秒
+          timeout: 10 * 1000, // 5 秒
+
+          // form-data fieldName，后端接口参数名称，默认值wangeditor-uploaded-image
+          fieldName: 'file',
+
+          // 上传之前触发
+          onBeforeUpload(file: File) {
+            console.log(file)
+            return file
+          },
+          // 上传进度的回调函数
+          onProgress(progress: number) {
+            // progress 是 0-100 的数字
+            console.log('progress', progress)
+          },
+          onSuccess(file: File, res: any) {
+            console.log('onSuccess', file, res)
+          },
+          onFailed(file: File, res: any) {
+            alert(res.message)
+            console.log('onFailed', file, res)
+          },
+          onError(file: File, err: any, res: any) {
+            alert(err.message)
+            console.error('onError', file, err, res)
+          },
+          // 自定义插入图片
+          customInsert(res: any, insertFn: InsertFnType) {
+            insertFn(res.data, 'video', res.data)
+          }
+        },
+        uploadAttachment: {
+          server: import.meta.env.VITE_UPLOAD_URL,
+          timeout: 20 * 1000, // 2s
+
+          fieldName: 'file',
+          // meta: { token: 'xxx', a: 100 }, // 请求时附加的数据
+          // metaWithUrl: true, // meta 拼接到 url 上
+          // headers: { Accept: 'text/x-json' },
+          // 自定义增加 http  header
+          headers: {
+            Accept: '*',
+            Authorization: 'Bearer ' + getAccessToken(),
+            'tenant-id': getTenantId(),
+            'instance-id': getAppId()
+          },
+
+          maxFileSize: 20 * 1024 * 1024, // 20M
+
+          onBeforeUpload(file: File) {
+            console.log('onBeforeUpload', file)
+            return file // 上传 file 文件
+            // return false // 会阻止上传
+          },
+          onProgress(progress: number) {
+            console.log('onProgress', progress)
+          },
+          onSuccess(file: File, res: any) {
+            console.log('onSuccess', file, res)
+          },
+          onFailed(file: File, res: any) {
+            alert(res.message)
+            console.log('onFailed', file, res)
+          },
+          onError(file: File, err: Error, res: any) {
+            alert(err.message)
+            console.error('onError', file, err, res)
+          },
+          // 上传成功后，用户自定义插入文件
+          customInsert(res: any, file: File, insertFn: Function) {
+            console.log('customInsert', res)
+
+            // 插入附件到编辑器
+            insertFn(file.name, res.data)
+            // insertFn(res.data, `customInsert-${file.name}`, res.data)
+          }
         }
       },
       uploadImgShowBase64: true
@@ -154,24 +288,6 @@ const editorStyle = computed(() => {
   }
 })
 
-const toolbarConfig = ref({
-  excludeKeys: [
-    'insertVideo', // 网络视频
-    'insertImage', // 网络图片
-    'insertLink', // 链接
-    'codeBlock', // 代码块
-    'headerSelect', // 标题
-    'blockquote', // 引用
-    'fontFamily', // 字体
-    'todo', // 代办
-    'group-indent', // 缩进
-    'emotion', // 表情
-    'undo', // 撤销
-    'redo', // 重做
-    'fullScreen'
-  ]
-})
-
 // 回调函数
 const handleChange = (editor: IDomEditor) => {
   emit('change', editor)

src/components/Form/src/Form.vue

@@ -51,7 +51,8 @@ export default defineComponent({
     // 表单label宽度
     labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
     // 是否 loading 数据中 add by 芋艿
-    vLoading: propTypes.bool.def(false)
+    vLoading: propTypes.bool.def(false),
+    inlineBlock: propTypes.bool.def(false)
   },
   emits: ['register'],
   setup(props, { slots, expose, emit }) {
@@ -77,7 +78,10 @@ export default defineComponent({
     })
 
     // 对表单赋值
-    const setValues = (data: Recordable = {}) => {
+    const setValues = (data: Recordable = {}, isReset: Boolean = false) => {
+      if (isReset) {
+        formModel.value = initModel(unref(getProps).schema, unref(formModel))
+      }
       formModel.value = Object.assign(unref(formModel), data)
     }
 
@@ -181,11 +185,7 @@ export default defineComponent({
       const slotsMap: Recordable = {
         ...setItemComponentSlots(slots, item?.componentProps?.slots, item.field)
       }
-      if (
-        item?.component !== 'SelectV2' &&
-        item?.component !== 'Cascader' &&
-        item?.componentProps?.options
-      ) {
+      if (item?.component !== 'SelectV2' && item?.component !== 'Cascader' && item?.options) {
         slotsMap.default = () => renderOptions(item)
       }
 
@@ -236,6 +236,9 @@ 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
@@ -291,6 +294,7 @@ export default defineComponent({
         model={props.isCustom ? props.model : formModel}
         class={prefixCls}
         v-loading={props.vLoading}
+        style={props.inlineBlock ? 'display: inline' : ''}
       >
         {{
           // 如果需要自定义，就什么都不渲染，而是提供默认插槽

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
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
     const Com = (item.component === 'Checkbox' ? ElCheckbox : ElCheckboxButton) as ReturnType<
       typeof defineComponent
     >
-    return item?.componentProps?.options?.map((option) => {
+    return item?.options?.map((option) => {
       const { ...other } = option
       return (
         <Com {...other} label={option[valueAlias || 'value']}>

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

@@ -5,15 +5,15 @@ import { defineComponent } from 'vue'
 export const useRenderRadio = () => {
   const renderRadioOptions = (item: FormSchema) => {
     // 如果有别名，就取别名
-    const labelAlias = item?.componentProps?.optionsAlias?.labelField
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
     const Com = (item.component === 'Radio' ? ElRadio : ElRadioButton) as ReturnType<
       typeof defineComponent
     >
-    return item?.componentProps?.options?.map((option) => {
+    return item?.options?.map((option) => {
       const { ...other } = option
       return (
-        <Com {...other} label={option[valueAlias || 'value']}>
+        <Com {...other} label={option[valueAlias || 'value']} value={option[valueAlias || 'value']}>
           {option[labelAlias || 'label']}
         </Com>
       )

src/components/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?.componentProps?.options?.map((option) => {
-      if (option?.options?.length) {
+    return item?.options?.map((option) => {
+      if (option?.length) {
         return (
           <ElOptionGroup label={option[labelAlias || 'label']}>
             {() => {
-              return option?.options?.map((v) => {
+              return option?.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
-    const valueAlias = item?.componentProps?.optionsAlias?.valueField
+    const labelAlias = item?.componentProps?.optionsAlias?.labelField || 'id'
+    const valueAlias = item?.componentProps?.optionsAlias?.valueField || 'name'
 
     const { label, value, ...other } = option
 

src/components/Pagination/index.vue

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

src/components/SSTable/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div>
     <div class="flex">
-      <el-table :data="tableObject.tableList" border style="flex: 1">
+      <el-table
+        :data="tableObject.tableList"
+        :row-key="rowkey"
+        :expand-row-keys="expandRowKeys"
+        border
+        style="flex: 1"
+        @selection-change="handleSelectionChange"
+      >
         <slot></slot>
       </el-table>
       <el-button
@@ -28,7 +35,7 @@
             @end="onDragEnd"
           >
             <template #item="{ element: item }">
-              <el-checkbox :key="item.field" :label="item.field">
+              <el-checkbox :key="item.id" :label="item.id" :value="item.id">
                 {{ item.label }}
               </el-checkbox>
             </template>
@@ -39,7 +46,7 @@
     <!-- 分页 -->
     <Pagination
       v-model:limit="pageSize"
-      v-model:page="currentPage"
+      v-model:page="pageNo"
       :total="tableObject.total"
       @pagination="getList"
     />
@@ -48,33 +55,33 @@
 
 <script setup>
 import draggable from 'vuedraggable'
-import { useUserStore } from '@/store/modules/user'
+import * as ClueCacheApi from '@/api/clue/clueCache'
 import { useRoute } from 'vue-router'
-import cache from '@/plugins/cache'
 
 const props = defineProps({
   tableObject: { type: Object, default: () => ({ tableList: [] }) },
-  tableColumns: { type: Array, default: () => [] }
+  tableColumns: { type: Array, default: () => [] },
+  rowkey: { type: String, default: 'id' },
+  expandRowKeys: { type: Array, default: () => [] }
 })
 
-const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns'])
+const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])
 const route = useRoute()
-const { id: userId } = useUserStore().user //取用户ID
 
-const currentPage = ref(props.tableObject?.currentPage || 1)
+const pageNo = ref(props.tableObject?.pageNo || 1)
 
 const pageSize = ref(props.tableObject?.pageSize || 20)
 
 const ColumnSetting = ref()
 const TableColumnPop = ref()
 // 展示在设置里的所有表格列，由于会排序，所以使用新属性，不直接修改原值
-const allColumns = ref({})
+const allColumns = ref([...props.tableColumns])
 // 已勾选的选项
 const checkedColumns = ref([])
 
 // 调用获取数据的接口,分页时需要使用
 function getList({ page, limit }) {
-  emit('update:tableObject', { ...props.tableObject, currentPage: page, pageSize: limit })
+  emit('update:tableObject', { ...props.tableObject, pageNo: page, pageSize: limit })
   nextTick(() => {
     emit('getList')
   })
@@ -85,67 +92,54 @@ const clickSetting = () => {
   unref(TableColumnPop).TableColumnPop?.delayHide?.()
 }
 
-// 获取所有的表格列，注意如果本地有缓存使用缓存数据，因为用户可能已对表格列排序，并且不依赖网络请求，可更快渲染表头
-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)
+const routeMap = {
+  CluePool: 1,
+  ClueOrder: 2
 }
+
 // 获取用户已勾选的表头
-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. 回显到表格中
+async function getUserCheckedColumns() {
+  checkedColumns.value = await ClueCacheApi.getClueCache({
+    settingType: 2,
+    model: routeMap[route.name]
+  })
+  // 回显到表格中
   emitColumns()
 }
 
 // 表格列排序
 function onDragEnd() {
-  const obj = getColumn('TableColumnAll')
-  obj[route.name] = allColumns.value
-  // 1. 设置缓存
-  setColumn(obj, 'TableColumnAll')
-  // 2. 表格回显
+  ClueCacheApi.setClueCache({
+    settingType: 2,
+    model: routeMap[route.name],
+    clueParamId: checkedColumns.value
+  })
+
+  // 表格回显
   emitColumns()
 }
 
+function handleSelectionChange(val) {
+  emit('selection-change', val)
+}
+
 // 勾选确认
 function confirm() {
-  const obj = getColumn()
-  obj[route.name] = checkedColumns.value
-  setColumn(obj, 'shitTable')
+  ClueCacheApi.setClueCache({
+    settingType: 2,
+    model: routeMap[route.name],
+    clueParamId: checkedColumns.value
+  })
+  // usedSchema.value = allColumns.value.filter((it) => checkedColumns.value.includes(it.id))
   emitColumns()
 }
 
 // 将表头数据返回至父组件
 function emitColumns() {
-  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.field))
+  const arr = allColumns.value.filter((item) => checkedColumns.value.includes(item.id))
   emit('getCheckedColumns', arr)
 }
 
-getAllColumns()
 getUserCheckedColumns()
 
 defineExpose({ getUserCheckedColumns })

src/components/Search/src/Search.vue

@@ -7,12 +7,10 @@ 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 cache from '@/plugins/cache'
+import * as ClueCacheApi from '@/api/clue/clueCache'
 
 const route = useRoute()
-const { id: userId } = useUserStore().user //取用户ID
 
 const { t } = useI18n()
 
@@ -33,20 +31,21 @@ const props = defineProps({
     .validate((v: string) => ['left', 'center', 'right'].includes(v))
     .def('center'),
   showLabel: propTypes.bool.def(false),
-  showSearch: propTypes.bool.def(true),
-  showReset: propTypes.bool.def(true),
+  showSearch: propTypes.bool.def(false),
+  showReset: propTypes.bool.def(false),
   // 是否显示伸缩
   expand: propTypes.bool.def(false),
   // 伸缩的界限字段
   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)
 
@@ -60,6 +59,11 @@ 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) {
@@ -80,37 +84,26 @@ const newSchema = computed(() => {
   return schema
 })
 
-function initSearch() {
+const routeMap = {
+  CluePool: 1,
+  ClueOrder: 2
+}
+async function initSearch() {
   reset()
-  // 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)
+  checkedSchema.value = await ClueCacheApi.getClueCache({
+    settingType: 1,
+    model: routeMap[route.name]
+  })
+  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
 }
 
 function changeSearch() {
-  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)
+  ClueCacheApi.setClueCache({
+    settingType: 1,
+    model: routeMap[route.name],
+    clueParamId: checkedSchema.value
+  })
+  usedSchema.value = props.schema.filter((it) => checkedSchema.value.includes(it.id))
 }
 
 function setSearch() {
@@ -121,23 +114,34 @@ 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()
-  emit('reset', model)
+  return model
 }
 
+defineExpose({
+  getFormModel,
+  reset
+})
+
 const bottonButtonStyle = computed(() => {
   return {
     textAlign: props.buttomPosition as unknown as 'left' | 'center' | 'right'
@@ -156,6 +160,7 @@ initSearch()
   <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
   <Form
     :inline="inline"
+    :inlineBlock="inlineBlock"
     :is-col="isCol"
     :is-custom="false"
     isSearch
@@ -168,10 +173,7 @@ initSearch()
   >
     <template #action>
       <div v-if="layout === 'inline'">
-        <ElButton ref="SchemaSetting" @click="setSearch">
-          <!-- <Icon class="mr-5px" icon="ep:setting" /> -->
-          查询设置
-        </ElButton>
+        <ElButton ref="SchemaSetting" @click="setSearch"> 查询设置 </ElButton>
         <el-popover
           ref="SettingPop"
           :virtual-ref="SchemaSetting"
@@ -181,7 +183,7 @@ initSearch()
           virtual-triggering
         >
           <el-checkbox-group v-model="checkedSchema" @change="changeSearch">
-            <el-checkbox v-for="item in schema" :key="item.field" :label="item.field">
+            <el-checkbox v-for="item in schema" :key="item.id" :label="item.id" :value="item.id">
               {{ item.label }}
             </el-checkbox>
           </el-checkbox-group>
@@ -199,10 +201,10 @@ initSearch()
         </ElButton>
         <!-- add by 芋艿：补充在搜索后的按钮 -->
         <slot name="actionMore"></slot>
-        <ElButton v-if="expand" text @click="setVisible">
+        <!-- <ElButton v-if="expand" text @click="setVisible">
           {{ t(visible ? 'common.shrink' : 'common.expand') }}
-          <!-- <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" /> -->
-        </ElButton>
+          <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
+        </ElButton> -->
       </div>
     </template>
     <template v-for="name in Object.keys($slots)" :key="name" #[name]>

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: 8px">
+        <div style="font-size: 12px">
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
-        <div style="font-size: 8px">
+        <div style="font-size: 12px">
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
       </template>
@@ -34,25 +34,20 @@
   </div>
 </template>
 <script setup lang="ts" name="UploadFile">
-import { PropType } from 'vue'
-
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
-
 const message = useMessage() // 消息弹窗
 const emit = defineEmits(['update:modelValue'])
 
 const props = defineProps({
-  modelValue: {
-    type: Array as PropType<UploadUserFile[]>,
-    required: true
-  },
+  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(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+  fileType: propTypes.array.def([]),
   accept: propTypes.string.def('*'),
-  fileSize: propTypes.number.def(5), // 大小限制(MB)
+  fileSize: propTypes.number.def(100), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
   drag: propTypes.bool.def(false), // 拖拽上传
@@ -66,8 +61,10 @@ const fileList = ref<UploadUserFile[]>(props.modelValue)
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId()
+  'tenant-id': getTenantId(),
+  'instance-id': getAppId()
 })
+
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {

src/components/UploadFile/src/UploadImg.vue

@@ -55,7 +55,7 @@ import type { UploadProps } from 'element-plus'
 
 import { generateUUID } from '@/utils'
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { getAccessToken, getTenantId, getAppId } from '@/utils/auth'
 
 type FileTypes =
   | 'image/apng'
@@ -96,7 +96,8 @@ const deleteImg = () => {
 
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId()
+  'tenant-id': getTenantId(),
+  'instance-id': getAppId()
 })
 
 const editImg = () => {

src/components/UploadFile/src/UploadImgs.vue

@@ -3,11 +3,12 @@
     <el-upload
       v-model:file-list="fileList"
       :accept="fileType.join(',')"
-      :action="updateUrl"
+      :action="uploadUrl"
       :before-upload="beforeUpload"
       :class="['upload', drag ? 'no-border' : '']"
+      :disabled="disabled"
       :drag="drag"
-      :headers="uploadHeaders"
+      :http-request="httpRequest"
       :limit="limit"
       :multiple="true"
       :on-error="uploadError"
@@ -28,7 +29,7 @@
             <Icon icon="ep:zoom-in" />
             <span>查看</span>
           </div>
-          <div class="handle-icon" @click="handleRemove(file)">
+          <div v-if="!disabled" class="handle-icon" @click="handleRemove(file)">
             <Icon icon="ep:delete" />
             <span>删除</span>
           </div>
@@ -45,13 +46,14 @@
     />
   </div>
 </template>
-<script lang="ts" name="UploadImgs" setup>
-import { PropType } from 'vue'
+<script lang="ts" setup>
 import type { UploadFile, UploadProps, UploadUserFile } from 'element-plus'
 import { ElNotification } from 'element-plus'
 
 import { propTypes } from '@/utils/propTypes'
-import { getAccessToken, getTenantId } from '@/utils/auth'
+import { useUpload } from './useUpload'
+
+defineOptions({ name: 'UploadImgs' })
 
 const message = useMessage() // 消息弹窗
 
@@ -68,11 +70,7 @@ type FileTypes =
   | 'image/x-icon'
 
 const props = defineProps({
-  modelValue: {
-    type: Array as PropType<UploadUserFile[]>,
-    required: true
-  },
-  updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
   drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传（默认为 true）
   disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传（默认为 false）
   limit: propTypes.number.def(5), // 最大图片上传数 ==> 非必传（默认为 5张）
@@ -80,27 +78,14 @@ const props = defineProps({
   fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传（默认为 ["image/jpeg", "image/png", "image/gif"]）
   height: propTypes.string.def('150px'), // 组件高度 ==> 非必传（默认为 150px）
   width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传（默认为 150px）
-  borderRadius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
+  borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
 })
 
-const uploadHeaders = ref({
-  Authorization: 'Bearer ' + getAccessToken(),
-  'tenant-id': getTenantId()
-})
+const { uploadUrl, httpRequest } = useUpload()
 
-const fileList = ref<UploadUserFile[]>()
-// fix: 改为动态监听赋值解决图片回显问题
-watch(
-  () => props.modelValue,
-  (data) => {
-    if (!data) return
-    fileList.value = data
-  },
-  {
-    deep: true,
-    immediate: true
-  }
-)
+const fileList = ref<UploadUserFile[]>([])
+const uploadNumber = ref<number>(0)
+const uploadList = ref<UploadUserFile[]>([])
 /**
  * @description 文件上传之前判断
  * @param rawFile 上传的文件
@@ -120,29 +105,60 @@ const beforeUpload: UploadProps['beforeUpload'] = (rawFile) => {
       message: `上传图片大小不能超过 ${props.fileSize}M！`,
       type: 'warning'
     })
+  uploadNumber.value++
   return imgType.includes(rawFile.type as FileTypes) && imgSize
 }
 
 // 图片上传成功
 interface UploadEmits {
-  (e: 'update:modelValue', value: UploadUserFile[]): void
+  (e: 'update:modelValue', value: string[]): void
 }
 
 const emit = defineEmits<UploadEmits>()
-const uploadSuccess = (response, uploadFile: UploadFile) => {
-  if (!response) return
-  // TODO 多图上传组件成功后只是把保存成功后的url替换掉组件选图时的文件路径，所以返回的fileList包含的是一个包含文件信息的对象列表
-  uploadFile.url = response.data
-  emit('update:modelValue', fileList.value)
+const uploadSuccess: UploadProps['onSuccess'] = (res: any): void => {
   message.success('上传成功')
+  // 删除自身
+  const index = fileList.value.findIndex((item) => item.response?.data === res.data)
+  fileList.value.splice(index, 1)
+  uploadList.value.push({ name: res.data, url: res.data })
+  if (uploadList.value.length == uploadNumber.value) {
+    fileList.value.push(...uploadList.value)
+    uploadList.value = []
+    uploadNumber.value = 0
+    emitUpdateModelValue()
+  }
 }
 
+// 监听模型绑定值变动
+watch(
+  () => props.modelValue,
+  (val: string | string[]) => {
+    if (!val) {
+      fileList.value = [] // fix：处理掉缓存，表单重置后上传组件的内容并没有重置
+      return
+    }
+
+    fileList.value = [] // 保障数据为空
+    fileList.value.push(
+      ...(val as string[]).map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
+    )
+  },
+  { immediate: true, deep: true }
+)
+// 发送图片链接列表更新
+const emitUpdateModelValue = () => {
+  let result: string[] = fileList.value.map((file) => file.url!)
+  emit('update:modelValue', result)
+}
 // 删除图片
 const handleRemove = (uploadFile: UploadFile) => {
   fileList.value = fileList.value.filter(
     (item) => item.url !== uploadFile.url || item.name !== uploadFile.name
   )
-  emit('update:modelValue', fileList.value)
+  emit(
+    'update:modelValue',
+    fileList.value.map((file) => file.url!)
+  )
 }
 
 // 图片上传错误提示
@@ -216,7 +232,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       padding: 0;
       overflow: hidden;
       border: 1px dashed var(--el-border-color-darker);
-      border-radius: v-bind(borderRadius);
+      border-radius: v-bind(borderradius);
 
       &:hover {
         border: 1px dashed var(--el-color-primary);
@@ -233,7 +249,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       width: v-bind(width);
       height: v-bind(height);
       background-color: transparent;
-      border-radius: v-bind(borderRadius);
+      border-radius: v-bind(borderradius);
     }
 
     .upload-image {
@@ -246,16 +262,16 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
       position: absolute;
       top: 0;
       right: 0;
-      box-sizing: border-box;
       display: flex;
-      align-items: center;
-      justify-content: center;
       width: 100%;
       height: 100%;
       cursor: pointer;
       background: rgb(0 0 0 / 60%);
       opacity: 0;
+      box-sizing: border-box;
       transition: var(--el-transition-duration-fast);
+      align-items: center;
+      justify-content: center;
 
       .handle-icon {
         display: flex;

src/components/UploadFile/src/useUpload.ts

@@ -0,0 +1,93 @@
+import * as FileApi from '@/api/infra/file'
+import CryptoJS from 'crypto-js'
+import { UploadRawFile, UploadRequestOptions } from 'element-plus/es/components/upload/src/upload'
+import axios from 'axios'
+
+export const useUpload = () => {
+  // 后端上传地址
+  const uploadUrl = import.meta.env.VITE_UPLOAD_URL
+  // 是否使用前端直连上传
+  const isClientUpload = UPLOAD_TYPE.CLIENT === import.meta.env.VITE_UPLOAD_TYPE
+  // 重写ElUpload上传方法
+  const httpRequest = async (options: UploadRequestOptions) => {
+    // 模式一：前端上传
+    if (isClientUpload) {
+      // 1.1 生成文件名称
+      const fileName = await generateFileName(options.file)
+      // 1.2 获取文件预签名地址
+      const presignedInfo = await FileApi.getFilePresignedUrl(fileName)
+      // 1.3 上传文件（不能使用 ElUpload 的 ajaxUpload 方法的原因：其使用的是 FormData 上传，Minio 不支持）
+      return axios.put(presignedInfo.uploadUrl, options.file).then(() => {
+        // 1.4. 记录文件信息到后端（异步）
+        createFile(presignedInfo, fileName, options.file)
+        // 通知成功，数据格式保持与后端上传的返回结果一致
+        return { data: presignedInfo.url }
+      })
+    } else {
+      // 模式二：后端上传
+      // 重写 el-upload httpRequest 文件上传成功会走成功的钩子，失败走失败的钩子
+      return new Promise((resolve, reject) => {
+        FileApi.updateFile({ file: options.file })
+          .then((res) => {
+            if (res.code === 0) {
+              resolve(res)
+            } else {
+              reject(res)
+            }
+          })
+          .catch((res) => {
+            reject(res)
+          })
+      })
+    }
+  }
+
+  return {
+    uploadUrl,
+    httpRequest
+  }
+}
+
+/**
+ * 创建文件信息
+ * @param vo 文件预签名信息
+ * @param name 文件名称
+ * @param file 文件
+ */
+function createFile(vo: FileApi.FilePresignedUrlRespVO, name: string, file: UploadRawFile) {
+  const fileVo = {
+    configId: vo.configId,
+    url: vo.url,
+    path: name,
+    name: file.name,
+    type: file.type,
+    size: file.size
+  }
+  FileApi.createFile(fileVo)
+  return fileVo
+}
+
+/**
+ * 生成文件名称（使用算法SHA256）
+ * @param file 要上传的文件
+ */
+async function generateFileName(file: UploadRawFile) {
+  // 读取文件内容
+  const data = await file.arrayBuffer()
+  const wordArray = CryptoJS.lib.WordArray.create(data)
+  // 计算SHA256
+  const sha256 = CryptoJS.SHA256(wordArray).toString()
+  // 拼接后缀
+  const ext = file.name.substring(file.name.lastIndexOf('.'))
+  return `${sha256}${ext}`
+}
+
+/**
+ * 上传类型
+ */
+enum UPLOAD_TYPE {
+  // 客户端直接上传（只支持S3服务）
+  CLIENT = 'client',
+  // 客户端发送到后端上传
+  SERVER = 'server'
+}

src/components/bpmnProcessDesigner/package/theme/index.scss

@@ -1,2 +1,2 @@
 @import './process-designer.scss';
-@import './process-panel.scss';
+@import './process-panel.scss';

src/config/axios/config.ts

@@ -7,7 +7,7 @@ const config: {
   /**
    * api请求基础路径
    */
-  base_url: 'http://localhost' + import.meta.env.VITE_API_BASEPATH,
+  base_url: import.meta.env.VITE_API_BASEPATH,
   /**
    * 接口成功返回状态码
    */

src/config/axios/index.ts

@@ -5,10 +5,11 @@ import { config } from './config'
 const { default_headers } = config
 
 const request = (option: any) => {
-  const { url, method, params, data, headersType, responseType } = option
+  const { url, method, params, data, headersType, responseType, isSubmitForm } = option
   return service({
     url: url,
     method,
+    isSubmitForm,
     params,
     data,
     responseType: responseType,

src/config/axios/service.ts

@@ -20,7 +20,7 @@ import {
 import errorCode from './errorCode'
 
 import { resetRouter } from '@/router'
-import { useCache } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 
 const { result_code, base_url, request_timeout } = config
 
@@ -62,15 +62,11 @@ 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
@@ -83,27 +79,39 @@ service.interceptors.request.use(
     }
     // get参数编码
     if (config.method?.toUpperCase() === 'GET' && params) {
-      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)}&`
-          }
+      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)
         }
       }
-      // 给 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
   },
@@ -124,6 +132,9 @@ service.interceptors.response.use(
       throw new Error()
     }
     const { t } = useI18n()
+    // if (data.code === undefined) {
+    //   return response
+    // }
     // 未设置状态码则默认成功状态
     const code = data.code || result_code
     // 二进制数据则直接返回
@@ -179,7 +190,7 @@ service.interceptors.response.use(
         })
       }
     } else if (code === 500) {
-      ElMessage.error(t('sys.api.errMsg500'))
+      ElMessage.error(t(msg || 'sys.api.errMsg500'))
       return Promise.reject(new Error(msg))
     } else if (code === 901) {
       ElMessage.error({
@@ -197,8 +208,23 @@ 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 {
@@ -236,16 +262,15 @@ const handleAuthorized = () => {
       confirmButtonText: t('login.relogin'),
       type: 'warning'
     }).then(() => {
-      const { wsCache } = useCache()
-      const tenantId = wsCache.get('TENANT_ID')
-      const appId = wsCache.get('App_ID')
+      const tenantId = cache.local.get('TENANT_ID')
+      const appId = cache.local.get('App_ID')
       resetRouter() // 重置静态路由表
-      wsCache.clear()
+      cache.local.clear()
       removeToken()
       isRelogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验
       // window.location.href = window.location.href
-      window.location.href = `/login?tenantId=${tenantId}&appId=${appId}`
+      window.location.href = `/crm/login?tenantId=${tenantId}&appId=${appId}`
     })
   }
   return Promise.reject(t('sys.api.timeoutMessage'))

src/directives/permission/hasPermi.ts

@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 
 const { t } = useI18n() // 国际化
 
 export function hasPermi(app: App<Element>) {
   app.directive('hasPermi', (el, binding) => {
-    const { wsCache } = useCache()
     const { value } = binding
     const all_permission = '*:*:*'
-    const permissions = wsCache.get(CACHE_KEY.USER).permissions
+    const permissions = cache.local.get(CACHE_KEY.USER)?.permissions || []
 
     if (value && value instanceof Array && value.length > 0) {
       const permissionFlag = value

src/directives/permission/hasRole.ts

@@ -1,14 +1,14 @@
 import type { App } from 'vue'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { CACHE_KEY } from '@/hooks/web/useCache'
+import cache from '@/plugins/cache'
 
 const { t } = useI18n() // 国际化
 
 export function hasRole(app: App<Element>) {
   app.directive('hasRole', (el, binding) => {
-    const { wsCache } = useCache()
     const { value } = binding
     const super_admin = 'admin'
-    const roles = wsCache.get(CACHE_KEY.USER).roles
+    const roles = cache.local.get(CACHE_KEY.USER).roles
 
     if (value && value instanceof Array && value.length > 0) {
       const roleFlag = value

src/hooks/web/useCrudSchemas.ts

@@ -119,7 +119,8 @@ const filterSearchSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): F
         componentProps: comonentProps,
         ...schemaItem.search,
         field: schemaItem.field,
-        label: schemaItem.search?.label || schemaItem.label
+        label: schemaItem.search?.label || schemaItem.label,
+        id: schemaItem.clueParamId
       }
       if (searchSchemaItem.api) {
         searchRequestTask.push(async () => {
@@ -165,7 +166,8 @@ const filterTableSchema = (crudSchema: CrudSchema[]): TableColumn[] => {
         }
         return {
           ...schema.table,
-          ...schema
+          ...schema,
+          id: schema.clueParamId
         }
       }
     }
@@ -227,6 +229,7 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
         value: defaultValue,
         ...schemaItem.form,
         field: schemaItem.field,
+        isRequired: schemaItem.isRequired,
         label: schemaItem.form?.label || schemaItem.label
       }
 
@@ -263,7 +266,6 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
 // 过滤 descriptions 结构
 const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[] => {
   const descriptionsSchema: FormSchema[] = []
-
   eachTree(crudSchema, (schemaItem: CrudSchema) => {
     // 判断是否显示
     if (schemaItem?.isDetail !== false && schemaItem.detail?.show !== false) {
@@ -272,6 +274,10 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
         field: schemaItem.field,
         label: schemaItem.detail?.label || schemaItem.label
       }
+      if (schemaItem.form?.component == 'Editor') {
+        descriptionsSchemaItem.span = 2
+        descriptionsSchemaItem.isEditor = true
+      }
       if (schemaItem.dictType) {
         descriptionsSchemaItem.dictType = schemaItem.dictType
       }

src/hooks/web/useMessage.ts

@@ -13,7 +13,12 @@ export const useMessage = () => {
     },
     // 成功消息
     success(content: string) {
-      ElMessage.success(content)
+      // ElMessage.success(content)
+      ElMessage({
+        message: content,
+        duration: 1500,
+        type: 'success'
+      })
     },
     // 警告消息
     warning(content: string) {

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 = 300
+    can.width = 500
     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.15)'
+      cans.fillStyle = 'rgba(0, 0, 0, 0.05)'
       cans.textAlign = 'left'
       cans.textBaseline = 'middle'
       cans.fillText(str, can.width / 20, can.height)