Compare commits

..

No commits in common. 'main' and 'dev-report' have entirely different histories.

  1. 18
      .env.base
  2. 2
      .env.dev
  3. 4
      .env.front
  4. 5
      .env.pro
  5. 2
      .env.stage
  6. 2
      .env.static
  7. 2
      .env.test
  8. 15
      .vscode/extensions.json
  9. 16
      .vscode/launch.json
  10. 54
      .vscode/settings.json
  11. 4
      index.html
  12. 11
      package.json
  13. 9
      src/api/clue/afterSale.js
  14. 50
      src/api/clue/clueRemark.js
  15. 9
      src/api/clue/index.js
  16. 7
      src/api/clue/payment.js
  17. 20
      src/api/clue/sign.js
  18. 8
      src/api/home/reportSaler.js
  19. 42
      src/api/kpi/index.js
  20. 41
      src/api/kpi/score.js
  21. 38
      src/api/okr/comment.js
  22. 61
      src/api/okr/meeting.js
  23. 154
      src/api/okr/okr.js
  24. 83
      src/api/okr/wait.js
  25. 36
      src/api/pers/attendancePlan.js
  26. 41
      src/api/pers/employee.js
  27. 33
      src/api/school/setting/supplier.js
  28. 18
      src/api/system/user/index.ts
  29. 23
      src/api/system/wechat/index.js
  30. 48
      src/api/xjapplet/discount.js
  31. 39
      src/api/xjapplet/resell.js
  32. 56
      src/api/xjapplet/vip.js
  33. 67
      src/api/xjapplet/vipdatabase.js
  34. 48
      src/api/xjapplet/xjdatabase.js
  35. BIN
      src/assets/imgs/login2.gif
  36. BIN
      src/assets/imgs/shisong.jpg
  37. 6
      src/components/DictTag/src/DictTag.vue
  38. 98
      src/components/Editor/src/Editor.vue
  39. 2
      src/components/Form/src/components/useRenderRadio.tsx
  40. 2
      src/components/Pagination/index.vue
  41. 8
      src/components/SSTable/index.vue
  42. 2
      src/components/Search/src/Search.vue
  43. 6
      src/config/axios/service.ts
  44. 5
      src/hooks/web/useCrudSchemas.ts
  45. 5
      src/main.js
  46. 55
      src/permission.js
  47. 51
      src/router/modules/remaining.ts
  48. 87
      src/router/modules/static.ts
  49. 4
      src/store/modules/dict.ts
  50. 20
      src/store/modules/permission.ts
  51. 3
      src/store/modules/user.ts
  52. 48
      src/styles/index.scss
  53. 24
      src/utils/auth.ts
  54. 12
      src/utils/constants.ts
  55. 80
      src/utils/index.ts
  56. 11
      src/views/Basic/Dept/DeptForm.vue
  57. 2
      src/views/Basic/Dept/index.vue
  58. 3
      src/views/Basic/GeneralSet/index.vue
  59. 2
      src/views/Basic/Menu/index.vue
  60. 12
      src/views/Basic/Role/Comp/RoleEmployee.vue
  61. 46
      src/views/Basic/User/UserForm.vue
  62. 81
      src/views/Basic/User/index.vue
  63. 7
      src/views/Basic/WxRobot/Record.vue
  64. 228
      src/views/Basic/WxRobot/Setting.vue
  65. 62
      src/views/Basic/WxRobot/index.data.js
  66. 76
      src/views/Basic/WxRobot/index.vue
  67. 119
      src/views/Clue/Order/Comp/AfterSales.vue
  68. 10
      src/views/Clue/Order/Comp/Delivery.vue
  69. 130
      src/views/Clue/Order/Comp/DialogAddProduct.vue
  70. 4
      src/views/Clue/Order/Comp/DialogAfterSale.vue
  71. 4
      src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue
  72. 4
      src/views/Clue/Order/Comp/DialogBatchAudit.vue
  73. 17
      src/views/Clue/Order/Comp/DialogDelivery.vue
  74. 15
      src/views/Clue/Order/Comp/DialogExtraPay.vue
  75. 4
      src/views/Clue/Order/Comp/DialogFeeback.vue
  76. 4
      src/views/Clue/Order/Comp/DialogFeebackAudit.vue
  77. 23
      src/views/Clue/Order/Comp/DialogOrder.vue
  78. 133
      src/views/Clue/Order/Comp/DialogOrderProduct.vue
  79. 341
      src/views/Clue/Order/Comp/MallOrderList.vue
  80. 68
      src/views/Clue/Order/Comp/MallSettle.vue
  81. 20
      src/views/Clue/Order/Comp/OrderList.vue
  82. 237
      src/views/Clue/Order/Comp/OrderRemark.vue
  83. 192
      src/views/Clue/Order/Comp/Reback.vue
  84. 17
      src/views/Clue/Order/Comp/SchoolSettle.vue
  85. 5
      src/views/Clue/Order/index.vue
  86. 144
      src/views/Clue/Pool/ClueAdd.vue
  87. 593
      src/views/Clue/Pool/ClueEnroll.vue
  88. 2
      src/views/Clue/Pool/Comp/ClueMap.vue
  89. 2
      src/views/Clue/Pool/Comp/DialogBatchChangeFollow.vue
  90. 15
      src/views/Clue/Pool/Comp/DialogClue.vue
  91. 26
      src/views/Clue/Pool/Comp/DialogFollow.vue
  92. 149
      src/views/Clue/Pool/Comp/DialogRemark.vue
  93. 108
      src/views/Clue/Pool/Comp/DialogSuccess.vue
  94. 17
      src/views/Clue/Pool/Comp/DrawerClue.vue
  95. 35
      src/views/Clue/Pool/index.vue
  96. 111
      src/views/Clue/ReceiveInput/index.vue
  97. 126
      src/views/Clue/Set/Comp/DialogSource.vue
  98. 228
      src/views/Clue/Set/Comp/RemarkGroup.vue
  99. 5
      src/views/Clue/Set/index.vue
  100. 6
      src/views/Home/CloseRate.vue
  101. Some files were not shown because too many files have changed in this diff Show More

@ -4,23 +4,11 @@ VITE_NODE_ENV=development
VITE_DEV=true
# 请求路径
# VITE_BASE_URL='http://47.98.161.246:48080'
# VITE_BASE_URL='http://114.215.207.150:48080'
VITE_BASE_URL='http://localhost: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_BASE_URL='http://118.31.23.45:48080'
# VITE_BASE_URL='http://114.55.169.15:48080'
# 上传路径
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
# 接口前缀

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

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

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

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

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

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

@ -0,0 +1,15 @@
{
"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"
]
}

@ -0,0 +1,16 @@
{
// 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
}
]
}

@ -0,0 +1,54 @@
{
"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"
}
}

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

@ -39,7 +39,6 @@
"@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",
@ -52,9 +51,8 @@
"diagram-js": "^11.6.0",
"echarts": "^5.4.2",
"echarts-wordcloud": "^2.1.0",
"element-plus": "2.9.4",
"element-plus": "2.3.4",
"fast-xml-parser": "^4.2.2",
"file-saver": "^2.0.5",
"highlight.js": "^11.8.0",
"intro.js": "^7.0.1",
"jsencrypt": "^3.3.2",
@ -67,19 +65,16 @@
"qs": "^6.11.2",
"steady-xml": "^0.1.0",
"url": "^0.11.0",
"video.js": "^7.0.0",
"video.js": "^8.3.0",
"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",
"xlsx": "^0.18.5",
"xml-js": "^1.6.11"
},
"devDependencies": {
@ -115,7 +110,7 @@
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
"rollup": "^3.22.0",
"sass": "1.75.0",
"sass": "^1.62.1",
"stylelint": "^15.6.2",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^12.0.0",

@ -37,12 +37,3 @@ export const cancelApplyAfterSale = async (data) => {
export const getAfterSaleDetail = async (params) => {
return await request.get({ url: '/admin-api/crm/sign-after-sale/get', params })
}
// 导入
export const importAfterSales = async (data) => {
return await request.upload({ url: '/admin-api/crm/sign-after-sale/importAfterSales', data })
}
export const getAfterSalesTemplate = async () => {
return await request.get({ url: '/admin-api/crm/sign-after-sale/get-import-template' })
}

@ -1,50 +0,0 @@
import request from '@/config/axios'
// 获得微信群列表
export const getWxGroupPage = (params) => {
return request.get({ url: '/admin-api/crm/wxgroup/page', params })
}
// 创建微信群
export const createWxGroup = (data) => {
return request.post({ url: '/admin-api/crm/wxgroup/create', data, isSubmitForm: true })
}
// 更新微信群
export const updateWxGroup = (data) => {
return request.put({ url: '/admin-api/crm/wxgroup/update', data })
}
// 删除微信群
export const deleteWxGroup = (id) => {
return request.delete({ url: `/admin-api/crm/wxgroup?groupId=${id}` })
}
export const getWxGroupSimpleList = async () => {
return await request.get({ url: '/admin-api/crm/wxgroup/simple-list' })
}
// 报备
export const reportClue = (data) => {
return request.post({ url: '/admin-api/crm/clue-remark/remark/save', data })
}
// 接待提交报名信息
export const registerClue = (data) => {
return request.post({ url: '/admin-api/crm/clue-remark/sign/save', data })
}
// 分页查询报备信息
export const getClueRemarkPage = (data) => {
return request.post({ url: '/admin-api/crm/clue-remark/page', data })
}
// 区域查询报备信息
export const getClueRemarkByRemarkId = (params) => {
return request.get({ url: `/admin-api/crm/clue-remark/sign/get`, params })
}
// 销售查询报备信息
export const getClueRemarkByClueId = (params) => {
return request.get({ url: `/admin-api/crm/clue-remark/remark/get`, params })
}

@ -62,12 +62,3 @@ export const getFollowUserList = async (params) => {
export const batchUpdateFollowUser = async (data) => {
return await request.put({ url: '/admin-api/crm/sch-clue/batchUpdateFollowUser', data })
}
// 自动分配线索新增
export const clueInput = async (data) => {
return await request.post({
url: '/out-api/out/clue/importClue/',
data,
isSubmitForm: true
})
}

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

@ -51,23 +51,3 @@ export const updateProduceSort = (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 })
}
// 查询订单商品
export const getOrderProductList = (params) => {
return request.get({ url: '/admin-api/crm/sign-prodcut/list', params })
}
//
export const createSignOnRemark = (data) => {
return request.post({ url: '/admin-api/crm/sign/xj-create', data })
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 KiB

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

@ -21,34 +21,10 @@ const props = defineProps({
height: propTypes.oneOfType([Number, String]).def('40vh'),
editorConfig: {
type: Object as PropType<Partial<IEditorConfig>>,
default: () => ({})
default: () => undefined
},
readonly: propTypes.bool.def(false),
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'] //
}
})
}
modelValue: propTypes.string.def('')
})
const emit = defineEmits(['change', 'update:modelValue'])
@ -108,12 +84,6 @@ const editorConfig = computed((): IEditorConfig => {
},
autoFocus: false,
scroll: true,
//
hoverbarKeys: {
attachment: {
menuKeys: ['downloadAttachment'] //
}
},
MENU_CONF: {
['uploadImage']: {
server: import.meta.env.VITE_UPLOAD_URL,
@ -228,52 +198,6 @@ const editorConfig = computed((): IEditorConfig => {
customInsert(res: any, insertFn: InsertFnType) {
insertFn(res.data, 'video', res.data)
}
},
uploadAttachment: {
server: import.meta.env.VITE_UPLOAD_URL,
timeout: 20 * 1000, // 2s
fieldName: 'file',
// meta: { token: 'xxx', a: 100 }, //
// metaWithUrl: true, // meta url
// headers: { Accept: 'text/x-json' },
// http header
headers: {
Accept: '*',
Authorization: 'Bearer ' + getAccessToken(),
'tenant-id': getTenantId(),
'instance-id': getAppId()
},
maxFileSize: 20 * 1024 * 1024, // 20M
onBeforeUpload(file: File) {
console.log('onBeforeUpload', file)
return file // file
// return false //
},
onProgress(progress: number) {
console.log('onProgress', progress)
},
onSuccess(file: File, res: any) {
console.log('onSuccess', file, res)
},
onFailed(file: File, res: any) {
alert(res.message)
console.log('onFailed', file, res)
},
onError(file: File, err: Error, res: any) {
alert(err.message)
console.error('onError', file, err, res)
},
//
customInsert(res: any, file: File, insertFn: Function) {
console.log('customInsert', res)
//
insertFn(file.name, res.data)
// insertFn(res.data, `customInsert-${file.name}`, res.data)
}
}
},
uploadImgShowBase64: true
@ -288,6 +212,24 @@ 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)

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

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

@ -5,8 +5,6 @@
:data="tableObject.tableList"
:row-key="rowkey"
:expand-row-keys="expandRowKeys"
:show-summary="showSummary"
:summary-method="summaryMethod"
border
style="flex: 1"
@selection-change="handleSelectionChange"
@ -37,7 +35,7 @@
@end="onDragEnd"
>
<template #item="{ element: item }">
<el-checkbox :key="item.id" :label="item.id" :value="item.id">
<el-checkbox :key="item.id" :label="item.id">
{{ item.label }}
</el-checkbox>
</template>
@ -64,9 +62,7 @@ const props = defineProps({
tableObject: { type: Object, default: () => ({ tableList: [] }) },
tableColumns: { type: Array, default: () => [] },
rowkey: { type: String, default: 'id' },
expandRowKeys: { type: Array, default: () => [] },
showSummary: { type: Boolean, default: false },
summaryMethod: { type: Function, default: null }
expandRowKeys: { type: Array, default: () => [] }
})
const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])

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

@ -49,9 +49,6 @@ const service: AxiosInstance = axios.create({
// request拦截器
service.interceptors.request.use(
(config: InternalAxiosRequestConfig) => {
if (config.url?.startsWith('/out-api')) {
config.baseURL = ''
}
// 是否需要设置 token
let isToken = (config!.headers || {}).isToken === false
whiteList.some((v) => {
@ -135,9 +132,6 @@ service.interceptors.response.use(
throw new Error()
}
const { t } = useI18n()
// if (data.code === undefined) {
// return response
// }
// 未设置状态码则默认成功状态
const code = data.code || result_code
// 二进制数据则直接返回

@ -266,6 +266,7 @@ 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) {
@ -274,10 +275,6 @@ 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
}

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

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

@ -51,7 +51,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
}
},
{
path: '/',
path: '',
component: Layout,
redirect: '/Home/index',
name: '',
@ -59,21 +59,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
title: '首页',
hidden: true
}
// ,
// children: [
// {
// path: '/index',
// component: () => import('@/views/Basic/Menu/index.vue'),
// name: 'Home',
// meta: {
// title: '首页',
// icon: 'ep:home-filled',
// noTagsView: true,
// affix: true
// // hidden: true
// }
// }
// ]
},
{
path: '/swagger',
@ -148,8 +133,8 @@ const remainingRouter: AppRouteRecordRaw[] = [
// path: '/Basic',
// component: Layout,
// name: 'Basic',
// redirect: '/Basic/menu',
// meta: { title: '菜单管理' },
// redirect: '/Basic/menu',
// children: [
// {
// path: 'menu',
@ -165,38 +150,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
// }
// ]
// },
{
path: '/clue-add',
name: 'ClueAdd',
component: () => import('@/views/Clue/Pool/ClueAdd.vue'),
meta: {
title: '线索录入',
hidden: true,
noTagsView: true
}
},
{
path: '/receive-input/:id',
name: 'ReceiveInput',
component: () => import('@/views/Clue/ReceiveInput/index.vue'),
meta: {
title: '接待信息录入',
hidden: true,
noTagsView: true,
permission: 'clue:receiveInput:index'
}
},
{
path: '/clue-enroll/:id',
name: 'ClueEnroll',
component: () => import('@/views/Clue/Pool/ClueEnroll.vue'),
meta: {
title: '学员报名登记',
hidden: true,
noTagsView: true,
permission: 'clue:pool:enroll'
}
},
{
path: '/login',
component: () => import('@/views/Login/Login.vue'),

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

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

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

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

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

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

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

@ -220,83 +220,3 @@ export const removeNullField = (obj: Object) => {
}
return obj
}
import * as XLSX from 'xlsx'
import * as FileSaver from 'file-saver'
export const exportTableWithVue = (domId: any, fileName: String) => {
// const XLSX = require('xlsx')
// 使用 this.$nextTick 是在dom元素都渲染完成之后再执行
// this.$nextTick(function () {
// 设置导出的内容是否只做解析,不进行格式转换 false:要解析, true:不解析
const xlsxParam = { raw: true }
const wb = XLSX.utils.table_to_book(document.querySelector(domId), xlsxParam)
const wbout = XLSX.write(wb, {
bookType: 'xlsx',
bookSST: true,
type: 'array'
})
try {
// 下载保存文件
FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), `${fileName}.xlsx`)
} catch (e) {
if (typeof console !== 'undefined') {
console.log(e, wbout)
}
}
return wbout
// });
}
/**
* Excel
* @param {Array} data [{name: '张三', age: 18}, ...]
* @param {String} fileName .xlsx
* @param {Array} header [{key: 'name', title: '姓名'}, ...]
* 使 key
*/
export const exportArrayToExcel = function (data: any[], fileName: String, header: any) {
// 处理表头映射
const worksheetData = []
let headerKeys = [] // 数据对象的 key 集合
let headerTitles = [] // 表头显示文本
if (header && header.length > 0) {
// 使用自定义表头
headerKeys = header.map((item) => item.key)
headerTitles = header.map((item) => item.title)
worksheetData.push(headerTitles) // 加入表头行
} else {
// 自动生成表头(使用数据中第一个对象的 key)
if (data.length === 0) {
console.warn('导出数据为空')
return
}
headerKeys = Object.keys(data[0])
headerTitles = headerKeys // 表头默认用 key
worksheetData.push(headerTitles) // 加入表头行
}
// 处理数据行(按表头 key 顺序提取数据)
data.forEach((item) => {
const row = headerKeys.map((key) => {
// 处理特殊类型(如日期对象转为字符串)
if (item[key] instanceof Date) {
return item[key].toLocaleString()
}
// 其他类型直接转为字符串(避免 undefined 显示)
return item[key] !== undefined ? String(item[key]) : ''
})
worksheetData.push(row)
})
// 创建工作簿和工作表
const ws = XLSX.utils.aoa_to_sheet(worksheetData) // 数组转工作表
const wb = XLSX.utils.book_new() // 创建工作簿
XLSX.utils.book_append_sheet(wb, ws, 'Sheet1') // 工作表命名为 Sheet1
// 生成二进制文件并下载
const excelBuffer = XLSX.write(wb, { bookType: 'xlsx', type: 'array' })
const blob = new Blob([excelBuffer], { type: 'application/octet-stream' })
saveAs(blob, `${fileName}.xlsx`) // 保存文件
}

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

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

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

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

@ -9,18 +9,6 @@
:label="col.label"
:width="col.width"
/>
<el-table-column label="状态" key="status">
<template #default="scope">
<el-switch
v-model="scope.row.status"
:active-value="0"
active-text="在职"
inactive-text="离职"
:inactive-value="1"
disabled
/>
</template>
</el-table-column>
</el-table>
<Pagination
v-model:limit="pageSize"

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

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

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

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

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

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

@ -1,15 +1,7 @@
<template>
<div>
<el-form :model="searchForm" label-width="0" inline>
<template v-if="appStore.getAppInfo?.instanceType == 2">
<el-form-item>
<el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
</el-form-item>
</template>
<el-form-item v-else>
<el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
</el-form-item>
<el-form-item>
@ -91,18 +83,6 @@
style="width: 240px"
/>
</el-form-item>
<template v-if="appStore.getAppInfo?.instanceType == 1">
<el-form-item>
<el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
<el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
查询
@ -113,20 +93,6 @@
<el-button @click="batchAudit" v-hasPermi="['clue:order:after-sale-batch-audit']">
批量审核
</el-button>
<el-upload
ref="salaryFile"
action="#"
:limit="1"
accept=".xls,.xlsx"
:show-file-list="false"
style="margin-left: 10px; height: 32px"
:before-upload="fileBeforeUpload"
:http-request="afterSalesUpload"
:disabled="uploading"
v-hasPermi="['clue:order:after-sale-import']"
>
<el-button type="primary"> 导入 </el-button>
</el-upload>
</el-form-item>
</el-form>
@ -137,25 +103,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
<!-- <el-table-column prop="signId" label="成交单号" min-width="150px" /> -->
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signId"
label="成交单号"
min-width="120px"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 2"
prop="signOrderId"
label="成交单号"
min-width="120px"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 2"
prop="signId"
label="子订单号"
min-width="120px"
/>
<el-table-column prop="signId" label="成交单号" min-width="150px" />
<el-table-column prop="name" label="线索名称" min-width="150px" />
<el-table-column prop="phone" label="联系方式" min-width="120px" />
<el-table-column
@ -241,7 +189,6 @@
<script setup name="AfterSales">
import * as AfterSaleApi from '@/api/clue/afterSale'
import { getSimpleUserList as getUserOption } from '@/api/system/user'
import { getAreaSimpleList } from '@/api/school/setting/area'
import { useUserStore } from '@/store/modules/user'
import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
@ -251,7 +198,6 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
import { removeNullField } from '@/utils'
import { dateFormatter } from '@/utils/formatTime'
import { useAppStore } from '@/store/modules/app'
import { exportArrayToExcel } from '@/utils/index'
const afterSaleAuditDialog = ref()
@ -270,7 +216,6 @@ const searchForm = ref({
createDate: [],
createUser: undefined,
checkTime: [],
signOrderId: undefined,
pageNo: 1,
pageSize: 20
})
@ -295,7 +240,6 @@ function handleReset() {
createDate: [],
createUser: undefined,
checkTime: [],
signOrderId: undefined,
pageNo: 1,
pageSize: 20
}
@ -348,68 +292,7 @@ function handleAudit(row) {
afterSaleAuditDialog.value.open(row)
}
const fileBeforeUpload = (file) => {
let format = '.' + file.name.split('.')[1]
if (!['.xls', '.xlsx'].includes(format)) {
message.error(`请上传指定格式".xls,.xlsx"文件`)
return false
}
let isRightSize = file.size / 1024 / 1024 < 20
if (!isRightSize) {
message.error('文件大小超过 20MB')
}
return isRightSize
}
const uploading = ref(false)
async function afterSalesUpload(data) {
uploading.value = true
const fd = new FormData()
fd.append('file', data.file)
try {
const resp = await AfterSaleApi.importAfterSales(fd)
debugger
if (resp && resp.data && resp.data.length) {
const succList = resp.data.filter((item) => item.success)
const failList = resp.data.filter((item) => !item.success)
let msg = `导入完成!成功 ${succList.length} 条,失败 ${failList.length} 条。`
if (failList.length) {
//
msg += '\n请点击消息下载失败明细进行查看。'
}
ElNotification({
title: '导入结果',
message: msg,
type: 'info',
duration: 0,
onClick: () => {
if (failList.length) {
// failList使
exportArrayToExcel(failList, `售后导入失败明细${new Date().getTime()}`, [
{ title: '手机号', key: 'phone' },
{ title: '售后原因', key: 'reason' },
{ title: '退款金额', key: 'refundAmount' },
{ title: '提成扣款', key: 'percentageDeductAmount' },
{ title: '解决方案', key: 'solution' },
{ title: '备注', key: 'remark' },
{ title: '失败原因', key: 'message' }
])
}
}
})
}
} finally {
uploading.value = false
getList()
}
}
const areaOptions = ref([])
function getOptions() {
//
getAreaSimpleList().then((data) => {
areaOptions.value = data
})
getUserOption().then((data) => {
userOptions.value = data
})

@ -2,10 +2,7 @@
<div>
<el-form :model="searchForm" label-width="0" inline>
<el-form-item>
<el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
<el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.name" placeholder="线索名称" clearable />
@ -70,8 +67,7 @@
</el-form>
<el-table v-loading="loading" :data="tableList" border>
<el-table-column prop="signOrderId" label="成交单号" min-width="120px" />
<el-table-column prop="signId" label="子订单号" min-width="120px" />
<el-table-column prop="signId" label="成交单号" min-width="120px" />
<el-table-column prop="name" label="线索名称" min-width="120px" />
<el-table-column prop="phone" label="联系方式" width="120px" />
<el-table-column prop="signUserName" label="登记人" min-width="90" />
@ -124,7 +120,6 @@ import { dateFormatter } from '@/utils/formatTime'
const searchForm = ref({
signId: undefined,
signOrderId: undefined,
name: undefined,
dealDate: [],
signUser: undefined,
@ -147,7 +142,6 @@ function handleSearch() {
function handleReset() {
searchForm.value = {
signId: undefined,
signOrderId: undefined,
name: undefined,
dealDate: [],
signUser: undefined,

@ -1,130 +0,0 @@
<template>
<Dialog title="添加产品" v-model="show" width="800px">
<el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="成交产品" prop="productId">
<el-select
v-model="form.productId"
placeholder="选择成交产品"
filterable
@change="form.specsId = undefined"
>
<el-option
v-for="item in prodOptions"
:key="item.productId"
:label="item.productName"
:value="item.productId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="产品规格" prop="specsId">
<el-select
v-model="form.specsId"
placeholder="选择规格"
filterable
:disabled="!form.productId"
>
<el-option
v-for="item in specsOptions(form.productId)"
:key="item.specsId"
:label="item.specsName"
:value="item.specsId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="成交数量" prop="signNum">
<el-input-number v-model="form.signNum" :min="1" :controls="false" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="生产状态" prop="isProduced">
<el-radio-group v-model="form.isProduced">
<el-radio :label="0" :value="0">待生产</el-radio>
<el-radio :label="1" :value="1">已生产</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:autoSize="{ minRows: 3 }"
v-model="form.remark"
placeholder="请输入备注"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span>
<el-button @click="show = false"> </el-button>
<el-button :disabled="formLoading" type="primary" @click="handleSave"> </el-button>
</span>
</template>
</Dialog>
</template>
<script setup name="DialogProduct">
import { addOrderProduct } from '@/api/clue/sign'
const message = useMessage() //
const specsOptions = computed({
get() {
return (prodId) => {
if (prodId) {
return prodOptions.value.find((it) => it.productId == prodId).productSpecList
}
return []
}
}
})
const show = ref(false)
const form = ref({})
const rules = {
productId: { required: true, message: '成交产品不可为空', trigger: 'change' },
specsId: { required: true, message: '产品规格不可为空', trigger: 'change' },
signNum: { required: true, message: '成交数量不可为空', trigger: 'blur' }
}
const prodOptions = ref([])
function open(signId, arr) {
prodOptions.value = arr
form.value.signId = signId
form.value.isProduced = 0
show.value = true
}
defineExpose({ open })
const emit = defineEmits(['success'])
const formRef = ref()
const formLoading = ref(false)
async function handleSave() {
//
if (!formRef.value) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
await addOrderProduct(form.value)
message.success('新增成功!')
show.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
</script>
<style lang="scss" scoped></style>

@ -48,8 +48,8 @@
<el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
<el-form-item label="是否退货" prop="isReturns">
<el-radio-group v-model="form.isReturns">
<el-radio :label="true" :value="true"> 退货 </el-radio>
<el-radio :label="false" :value="false"> 不退货 </el-radio>
<el-radio :label="true"> 退货 </el-radio>
<el-radio :label="false"> 不退货 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

@ -12,8 +12,8 @@
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="state">
<el-radio-group v-model="formData.state">
<el-radio :label="3" :value="3"> 通过 </el-radio>
<el-radio :label="4" :value="4"> 驳回 </el-radio>
<el-radio :label="3"> 通过 </el-radio>
<el-radio :label="4"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

@ -11,8 +11,8 @@
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="state">
<el-radio-group v-model="formData.state">
<el-radio :label="3" :value="3"> 通过 </el-radio>
<el-radio :label="4" :value="4"> 驳回 </el-radio>
<el-radio :label="3"> 通过 </el-radio>
<el-radio :label="4"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

@ -10,13 +10,13 @@
<el-col :span="16" :offset="0">
<el-form-item label="发货方式">
<el-radio-group v-model="form.sendType" :disabled="autoAuditPurchase == 'false'">
<el-radio :label="1" :value="1">
<el-radio :label="1">
<Tooltip
message="必须在进销存的“通用配置-常规配置”中,将 ’采购申请自动通过‘ 设置为“是”"
/>
立即采购发货
</el-radio>
<el-radio :label="2" :value="2"> 使用库存发货 </el-radio>
<el-radio :label="2"> 使用库存发货 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -28,9 +28,9 @@
<el-select v-model="form.supplier" placeholder="选择供应商" filterable>
<el-option
v-for="item in supplierOptions"
:key="item.id"
:label="item.supplierName"
:value="item.id"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@ -141,18 +141,15 @@
import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/warehouse'
import { createDelivery } from '@/api/clue/delivery'
import { getConfigList } from '@/api/system/set'
import { getSupplierSimpleList } from '@/api/school/setting/supplier'
import { getDictOptions } from '@/utils/dict'
import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
const message = useMessage() //
const warehouseOptions = ref([])
const extraPayOptions = ref([])
const supplierOptions = ref([])
const supplierOptions = getDictOptions('erp_supplier')
function getOptions() {
getSupplierSimpleList().then((data) => {
supplierOptions.value = data
})
getSimpleWarehouseList().then((data) => {
warehouseOptions.value = data
})

@ -74,9 +74,6 @@
<script setup name="DialogExtraPay">
import { signAddPay, getSignExtraPayList } from '@/api/clue/sign'
import * as ExtraFeeApi from '@/api/clue/extraFee'
import { useAppStore } from '@/store/modules/app'
const appStore = useAppStore()
const extraPayOptions = ref([])
const message = useMessage() //
@ -95,13 +92,13 @@ defineExpose({
const form = ref({})
function resetForm(id) {
form.value = {
id: id,
signId: id,
extraPay: []
}
}
function getFormList() {
getSignExtraPayList({ id: form.value.id }).then((data) => {
getSignExtraPayList({ id: form.value.signId }).then((data) => {
form.value.extraPay = data.map((it) => ({
...it,
editabled: false
@ -124,14 +121,10 @@ async function onSubmit() {
//
formLoading.value = true
try {
let params = {
const params = {
signId: form.value.signId,
extraPay: form.value.extraPay.filter((it) => it.editabled)
}
if (appStore.getAppInfo?.instanceType == 1) {
params.signId = form.value.id
} else {
params.signOrderId = form.value.id
}
await signAddPay(params)
message.success('添加额外支出成功!')
getFormList()

@ -18,8 +18,8 @@
</el-form-item>
<el-form-item label="是否结清" prop="isPayoff">
<el-radio-group v-model="form.isPayoff">
<el-radio :label="true" :value="true"> 结清 </el-radio>
<el-radio :label="false" :value="false"> 未结清 </el-radio>
<el-radio :label="true"> 结清 </el-radio>
<el-radio :label="false"> 未结清 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">

@ -17,8 +17,8 @@
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="state">
<el-radio-group v-model="formData.state">
<el-radio :label="3" :value="3"> 通过 </el-radio>
<el-radio :label="4" :value="4"> 驳回 </el-radio>
<el-radio :label="3"> 通过 </el-radio>
<el-radio :label="4"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>

@ -36,7 +36,7 @@
<el-divider direction="horizontal" content-position="left">
其他费用<span v-if="extraTotalPrice">应收{{ extraTotalPrice }}</span>
</el-divider>
<el-table :data="orderInfo.otherPay" border stripe>
<el-table :data="orderInfo.extraPay" border stripe>
<el-table-column type="index" width="50" />
<el-table-column prop="extraPayType" label="费用项" />
<el-table-column prop="extraPayMoney" label="金额" />
@ -61,15 +61,14 @@
</el-table>
</div>
</el-tab-pane>
<el-tab-pane label="回款记录" name="returnRecord">
<el-tab-pane
label="回款记录"
name="returnRecord"
v-if="checkPermi(['clue:order:return-list'])"
>
<el-table :data="returnRecordList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column
v-if="checkPermi(['clue:order:return-list'])"
prop="money"
label="回款金额"
/>
<el-table-column prop="personProfit" label="员工利润" />
<el-table-column prop="money" label="回款金额" />
<el-table-column prop="applyTime" label="申请日期" />
<el-table-column prop="isPayoff" label="是否结清" />
<el-table-column prop="stateName" label="审核状态" />
@ -110,8 +109,7 @@ const show = ref(false)
const clueInfo = ref({})
const orderInfo = ref({
signProducts: [],
extraPay: [],
otherPay: []
extraPay: []
})
const returnRecordList = ref([])
const aftersaleList = ref([])
@ -128,7 +126,7 @@ const prodTotalPrice = computed(() => {
//
const extraTotalPrice = computed(() => {
return orderInfo.value.otherPay?.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
return orderInfo.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
})
//
@ -199,14 +197,13 @@ function getFields() {
if (it.label.includes('日期')) {
it.dateFormat = 'YYYY-MM-DD'
}
if (it.field == 'receivedMoney') {
checkPermi(['clue:order:return-list']) && arr.push(it)
} else {
arr.push(it)
}
})
if (arr.filter((item) => item.span != 2).length % 2 != 0) {
if (arr.length % 2 != 0) {
arr.push({})
}
orderSchema.value = [

@ -1,133 +0,0 @@
<template>
<Dialog title="成交商品" v-model="show" width="80%">
<el-table :data="orderProductList" border stripe>
<el-table-column prop="productName" label="成交产品" />
<el-table-column prop="specsName" label="产品规格" />
<el-table-column prop="signNum" label="成交数量" width="100px" />
<el-table-column prop="remark" label="产品备注" />
<el-table-column label="生产状态" width="160px">
<template #default="scope">
<el-switch
v-model="scope.row.isProduced"
:active-value="true"
:inactive-value="false"
active-text="已生产"
inactive-text="待生产"
v-if="checkPermi(['clue:order:update-produce'])"
size="small"
@change="handleChangeProdoce(scope.row)"
/>
<div v-else>{{ scope.row.isProducedDesc }}</div>
</template>
</el-table-column>
<el-table-column label="发货状态" prop="sendState" width="90px">
<template #default="scope">
<el-tag :type="scope.row.sendState == '待发货' ? 'danger' : 'success'" size="small">
{{ scope.row.sendState }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="发货备注">
<template #default="scope">
<el-popover
placement="top"
width="500px"
trigger="click"
v-if="scope.row.warehouseName && scope.row.sendRemark"
>
<template #reference>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="scope.row.sendRemark"></div>
</el-popover>
</template>
</el-table-column>
<el-table-column label="操作" width="100px">
<template #default="scope">
<el-button
type="primary"
class="mr-10px"
link
:disabled="scope.row.sendState == '已发货'"
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:send']"
@click="handleDelivery(scope.row)"
>
发货
</el-button>
<el-button
type="danger"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:remove-product']"
@click="handleRemoveProduct(scope.row)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<DialogDelivery ref="deliveryDialog" @success="getList" />
</Dialog>
</template>
<script setup>
import * as SignApi from '@/api/clue/sign'
import { checkPermi } from '@/utils/permission'
import DialogDelivery from './DialogDelivery.vue'
const show = ref(false)
const orderProductList = ref([])
const orderId = ref(null)
const message = useMessage() //
function open(signId) {
try {
show.value = true
orderId.value = signId
getList()
} catch (error) {
console.log(error)
}
}
function getList() {
try {
SignApi.getOrderProductList({ signId: orderId.value }).then((data) => {
orderProductList.value = data || []
})
} catch (error) {
console.log(error)
}
}
async function handleChangeProdoce(row) {
try {
//
await message.confirm('确认要修改生产状态吗?')
//
await SignApi.updateProduceStatus({
signId: row.signId,
id: row.id,
isProduced: row.isProduced
})
message.success('修改成功')
//
// getTableList()
} catch {
//
row.isProduced = !row.isProduced
}
}
const deliveryDialog = ref()
function handleDelivery(row) {
deliveryDialog.value.open(row)
}
defineExpose({
open
})
</script>
<style lang="scss" scoped></style>

@ -2,6 +2,46 @@
<div>
<!-- 搜索工作栏 -->
<div>
<el-form
:model="searchForm"
ref="moreSearchRef"
inline
label-width="0"
style="display: inline"
>
<el-form-item style="margin-bottom: 10px">
<el-select
v-model="searchForm.signProduct"
placeholder="选择成交产品"
filterable
clearable
@change="searchForm.specsId = undefined"
>
<el-option
v-for="item in prodOptions"
:key="item.productId"
:label="item.productName"
:value="item.productId"
/>
</el-select>
</el-form-item>
<el-form-item style="margin-bottom: 10px">
<el-select
v-model="searchForm.specsId"
placeholder="选择规格"
filterable
clearable
:disabled="!searchForm.signProduct"
>
<el-option
v-for="item in specsOptions(searchForm.signProduct)"
:key="item.specsId"
:label="item.specsName"
:value="item.specsId"
/>
</el-select>
</el-form-item>
</el-form>
<Search
v-if="!loading"
ref="searchRef"
@ -27,98 +67,90 @@
v-if="!loading"
class="mt-10px"
v-model:tableObject="tableObject"
:tableColumns="allSchemas.tableColumns.filter((it) => it.paramLevel == 1)"
rowkey="signOrderId"
:tableColumns="allSchemas.tableColumns"
rowkey="signId"
:expandRowKeys="expendRows"
:showSummary="true"
:summaryMethod="summaryMethod"
@get-list="getTableList"
@get-checked-columns="getCheckedColumns"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="60" fixed="left" />
<el-table-column type="expand" fixed="left">
<el-table-column type="selection" width="60" />
<el-table-column type="expand">
<template #default="{ row }">
<div class="p-10px flex justify-center">
<el-table :data="row.childrenOrder" row-key="signId" stripe>
<el-table-column
:prop="item.field"
:label="item.label"
v-for="item in allSchemas.tableColumns.filter((it) => it.paramLevel == 2)"
:key="item.id"
width="100px"
<VueDraggable
target="tbody"
v-model="row.signProducts"
:animation="150"
@end="onDragEnd"
style="width: 100%"
>
<el-table
:data="row.signProducts"
row-key="id"
stripe
style="width: 80%; margin: 0 auto"
>
<el-table-column prop="productName" label="成交产品" />
<el-table-column prop="specsName" label="产品规格" />
<el-table-column prop="signNum" label="成交数量" width="90px" />
<el-table-column prop="remark" label="成交备注" width="100px" />
<el-table-column label="生产状态" width="160px">
<template #default="scope">
<el-switch
v-model="scope.row.isProduced"
:active-value="true"
:inactive-value="false"
active-text="已生产"
inactive-text="待生产"
:disabled="!checkPermi(['clue:order:update-produce'])"
size="small"
@change="handleChangeProdoce(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="发货状态" prop="sendState" width="90px">
<template #default="scope">
<el-tag
:type="scope.row.sendState == '待发货' ? 'danger' : 'success'"
size="small"
>
{{ scope.row.sendState }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="发货备注" width="100px">
<template #default="scope">
<el-popover
v-if="item.field == 'remark' || item.form?.component == 'Editor'"
trigger="hover"
placement="top"
width="500px"
trigger="click"
v-if="scope.row.warehouseName && scope.row.sendRemark"
>
<div v-dompurify-html="scope.row.remark"></div>
<template #reference>
<el-button type="primary" link>查看</el-button>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="scope.row.sendRemark"></div>
</el-popover>
<div v-else>
<span v-if="item.isCustom">{{ scope.row.diyParams[item.field] }}</span>
<span v-else>{{ scope.row[item.field] }}</span>
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="260px" fixed="right">
<el-table-column label="操作" width="100px">
<template #default="scope">
<el-button
type="primary"
class="mr-10px"
link
:disabled="scope.row.sendState == '已发货'"
style="padding: 0; margin-left: 0"
@click="openProduct(scope.row)"
v-hasPermi="['clue:order:send']"
@click="handleDelivery(scope.row)"
>
成交商品
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:after-sale']"
@click="sellAfter(scope.row)"
>
售后
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:return']"
@click="feeBack(scope.row)"
>
回款
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:pool:enroll']"
@click="cancelDeal(scope.row)"
>
取消登记
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:add-product']"
@click="handleAddProduct(scope.row)"
>
添加产品
发货
</el-button>
</template>
</el-table-column>
</el-table>
</VueDraggable>
</div>
</template>
</el-table-column>
@ -133,7 +165,7 @@
<div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
<el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
<template #reference>
<el-button type="primary" style="padding: 0" link>点击查看</el-button>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="row[item.field]"></div>
</el-popover>
@ -143,8 +175,39 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" width="120px" fixed="right">
<el-table-column label="操作" width="240px" fixed="right">
<template #default="scope">
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:detail']"
@click="handleDetail(scope.row)"
>
详情
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:after-sale']"
@click="sellAfter(scope.row)"
>
售后
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-if="scope.row.isPayoff == '未结清'"
v-hasPermi="['clue:order:return']"
@click="feeBack(scope.row)"
>
回款
</el-button>
<el-button
type="primary"
class="mr-10px"
@ -155,34 +218,46 @@
>
添加支出
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:pool:enroll']"
@click="cancelDeal(scope.row)"
>
取消登记
</el-button>
</template>
</el-table-column>
</SSTable>
<!-- 详情 -->
<DialogOrder ref="orderDetailDialog" />
<DialogFeeback ref="feedbackDialog" />
<DialogAfterSale ref="afterSaleDialog" />
<DialogExtraFee ref="extraFeeDialog" />
<DialogAddProduct ref="addProductDialog" @success="getTableList" />
<DialogOrderProduct ref="orderProductDialog" />
<DialogDelivery ref="deliveryDialog" @success="getTableList" />
</div>
</template>
<script setup name="ClueOrderList">
import { getSimpleFieldList } from '@/api/clue/orderField'
import * as SignApi from '@/api/clue/sign'
import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
import { getSimpleProductList } from '@/api/mall/product'
import { getSimpleUserList as getUserOption, getAllUserListWithHire } from '@/api/system/user'
import DialogOrder from './DialogOrder.vue'
import DialogFeeback from './DialogFeeback.vue'
import DialogAfterSale from './DialogAfterSale.vue'
import DialogExtraFee from './DialogExtraPay.vue'
import DialogAddProduct from './DialogAddProduct.vue'
import DialogOrderProduct from './DialogOrderProduct.vue'
import DialogDelivery from './DialogDelivery.vue'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
import { VueDraggable } from 'vue-draggable-plus'
import { checkPermi } from '@/utils/permission'
const userOptions = ref([])
const allUserOptions = ref([])
@ -194,7 +269,20 @@ const message = useMessage() // 消息弹窗
const allSchemas = ref({})
const orderDetailDialog = ref()
const searchRef = ref()
const prodOptions = ref([])
const specsOptions = computed({
get() {
return (prodId) => {
if (prodId) {
return prodOptions.value.find((it) => it.productId == prodId).productSpecList
}
return []
}
}
})
const searchForm = ref({
signProduct: undefined
@ -205,12 +293,7 @@ const tableObject = ref({
loading: false,
total: 1,
pageSize: 20,
pageNo: 1,
totalData: {
totalReceivedMoney: 0,
totalSignPrice: 0,
totalPayAmount: 0
}
pageNo: 1
})
function resetQuery() {
@ -231,44 +314,29 @@ async function getTableList() {
...queryParams,
...searchForm.value,
pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize,
diyParams: {}
pageSize: tableObject.value.pageSize
}
searchFieldList.value.map((it) => {
if (params[it.field]) {
params.diyParams[it.field] = params[it.field]
}
})
const data = await SignApi.getSignPage(removeNullField(params))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.orderDiyParams }))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
tableObject.value.total = data.total
tableObject.value.totalData = data.totalData
} finally {
tableObject.value.loading = false
}
}
const loading = ref(true)
const searchFieldList = ref([])
async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
// const mainOrderFields = data.filter((it) => it.paramLevel == 1)
data.forEach((elem) => {
if (elem.isSearch) {
// if (['createUser'].includes(elem.field)) {
// elem.search.options = userOptions.value
// } else
if (['convertPeople', 'receiver', 'createUser'].includes(elem.field)) {
if (['createUser'].includes(elem.field)) {
elem.search.options = userOptions.value
} else if (['convertPeople', 'receiver'].includes(elem.field)) {
elem.search.options = allUserOptions.value
}
}
})
allSchemas.value = useCrudSchemas(data).allSchemas
} catch (err) {
console.log(err)
} finally {
loading.value = false
nextTick(() => {
@ -281,8 +349,12 @@ const showColumns = ref([])
//
function getCheckedColumns(list) {
showColumns.value =
list && list.length ? list : allSchemas.value.tableColumns.filter((it) => it.paramLevel == 1)
showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
}
//
function handleDetail(row) {
orderDetailDialog.value.open(row.clueId, row.signId)
}
const feedbackDialog = ref()
@ -314,23 +386,27 @@ async function cancelDeal(row) {
const extraFeeDialog = ref()
function handleAddFee(row) {
extraFeeDialog.value.open(row.signOrderId)
extraFeeDialog.value.open(row.signId)
}
async function getOptions() {
userOptions.value = await getUserOption()
allUserOptions.value = await getAllUserListWithHire()
getCurdSchemas()
//
getSimpleProductList().then((data) => {
prodOptions.value = data
})
userOptions.value = await getUserOption()
allUserOptions.value = await getAllUserList()
getCurdSchemas()
}
const deliveryDialog = ref()
function handleDelivery(row) {
deliveryDialog.value.open(row)
}
const batchIds = ref([])
function handleSelectionChange(val) {
batchIds.value = val.map((it) => it.signOrderId)
batchIds.value = val.map((it) => it.signId)
}
const selectedValue = ref(undefined)
@ -384,37 +460,38 @@ function handleBatchUpdateInstall() {
}
}
const orderProductDialog = ref()
function openProduct(row) {
orderProductDialog.value.open(row.signId)
}
function summaryMethod({ columns }) {
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
if (column.property == 'payTotalAmount') {
sums[index] = tableObject.value.totalData?.totalPayAmount || 0
} else if (column.property == 'signTotalPrice') {
sums[index] = tableObject.value.totalData?.totalSignPrice || 0
} else if (column.property == 'receivedMoney') {
sums[index] = tableObject.value.totalData?.totalReceivedMoney || 0
} else {
sums[index] = ''
}
async function handleChangeProdoce(row) {
try {
//
await message.confirm('确认要修改生产状态吗?')
//
await SignApi.updateProduceStatus({
signId: row.signId,
id: row.id,
isProduced: row.isProduced
})
return sums
message.success('修改成功')
//
getTableList()
} catch {
//
row.isProduced = !row.isProduced
}
}
const expendRows = ref([])
const addProductDialog = ref()
const prodOptions = ref([])
function handleAddProduct(row) {
addProductDialog.value.open(row.signId, prodOptions.value)
async function onDragEnd(ev) {
try {
expendRows.value = [ev.data.signId]
const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
await SignApi.updateProduceSort(list.map((it) => it.id))
message.success('修改成功')
//
getTableList()
} catch (error) {
console.log(error)
getTableList()
}
}
</script>

@ -1,16 +1,13 @@
<template>
<div>
<el-form :model="searchForm" label-width="0" inline>
<template v-if="appStore.getAppInfo?.instanceType == 2">
<el-form-item>
<el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
</el-form-item>
</template>
<el-form-item v-else>
<el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
<el-input
v-model="searchForm.signId"
placeholder="成交单号"
clearable
style="width: 120px"
/>
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
@ -119,16 +116,16 @@
>
<el-option
v-for="item in supplierOptions"
:key="item.id"
:label="item.supplierName"
:value="item.id"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-radio-group v-model="searchForm.settlementState">
<el-radio :label="1" :value="1"> 已结算 </el-radio>
<el-radio :label="0" :value="0"> 待结算 </el-radio>
<el-radio :label="1"> 已结算 </el-radio>
<el-radio :label="0"> 待结算 </el-radio>
</el-radio-group>
</el-form-item>
@ -155,24 +152,7 @@
fixed="left"
:selectable="(row) => row.settlementState == '待结算'"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signId"
label="成交单号"
min-width="120px"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 2"
prop="signOrderId"
label="成交单号"
min-width="120px"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 2"
prop="signId"
label="子订单号"
min-width="120px"
/>
<el-table-column prop="signId" label="成交单号" min-width="120px" />
<el-table-column prop="name" label="线索名称" min-width="120px" />
<el-table-column prop="phone" label="联系方式" width="120px" />
<el-table-column prop="signUserName" label="登记人" min-width="90" />
@ -266,16 +246,6 @@
<el-form-item label="结算金额">
{{ settleAmount }}
</el-form-item>
<el-form-item label="结算日期">
<el-date-picker
v-model="form.settlementDate"
type="date"
placeholder="选择日期时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:clearable="false"
/>
</el-form-item>
<el-form-item label="结算备注" prop="remark">
<Editor v-model:modelValue="form.remark" />
</el-form-item>
@ -297,13 +267,11 @@ import { getSimpleUserList as getUserOption } from '@/api/system/user'
import { getSimpleProductList } from '@/api/mall/product'
import * as SettleApi from '@/api/clue/settle'
import { getSupplierSimpleList } from '@/api/school/setting/supplier'
import { getDictOptions } from '@/utils/dict'
import { removeNullField } from '@/utils/index'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import { useAppStore } from '@/store/modules/app'
import { dateFormatter } from '@/utils/formatTime'
const message = useMessage() //
const appStore = useAppStore()
onMounted(() => {
getOptions()
@ -319,7 +287,6 @@ const searchForm = ref({
signProduct: undefined,
signSpecs: undefined,
signId: undefined,
signOrderId: undefined,
settlementState: 0,
settlementType: undefined,
supplier: undefined,
@ -337,7 +304,6 @@ function handleReset() {
signProduct: undefined,
signSpecs: undefined,
signId: undefined,
signOrderId: undefined,
settlementState: 0,
settlementType: undefined,
supplier: undefined,
@ -428,7 +394,6 @@ function batchSettle() {
showDailog.value = true
form.value = {
settlementIds: selectList.value.map((it) => it.settlementId),
settlementDate: formatDate(new Date(), 'YYYY-MM-DD'),
reamrk: undefined
}
settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)
@ -454,12 +419,9 @@ async function handleSaveSettle() {
const userOptions = ref([])
const prodOptions = ref([])
const supplierOptions = ref([])
const supplierOptions = getDictOptions('erp_supplier')
function getOptions() {
getSupplierSimpleList().then((data) => {
supplierOptions.value = data
})
//
getSimpleProductList().then((data) => {
prodOptions.value = data

@ -182,7 +182,7 @@
<script setup name="ClueOrderList">
import { getSimpleFieldList } from '@/api/clue/orderField'
import * as SignApi from '@/api/clue/sign'
import { getAllUserListWithHire } from '@/api/system/user'
import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
@ -194,7 +194,7 @@ import DialogExtraFee from './DialogExtraPay.vue'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
// const userOptions = ref([])
const userOptions = ref([])
const allUserOptions = ref([])
onMounted(() => {
getOptions()
@ -249,8 +249,7 @@ async function getTableList() {
...queryParams,
...searchForm.value,
pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize,
diyParams: {}
pageSize: tableObject.value.pageSize
}
searchFieldList.value.map((it) => {
if (params[it.field]) {
@ -271,12 +270,11 @@ async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
searchFieldList.value = data.filter((it) => it.isCustom)
data.forEach((elem) => {
// if (['createUser'].includes(elem.field)) {
// elem.search.options = userOptions.value
// } else
if (['convertPeople', 'receiver', 'createUser'].includes(elem.field)) {
if (['createUser'].includes(elem.field)) {
elem.search.options = userOptions.value
} else if (['convertPeople', 'receiver'].includes(elem.field)) {
elem.search.options = allUserOptions.value
}
})
@ -355,8 +353,8 @@ async function getOptions() {
schoolOptions.value = data.schoolList
allPlaceOptions.value = data.placeList
})
// userOptions.value = await getUserOption()
allUserOptions.value = await getAllUserListWithHire()
userOptions.value = await getUserOption()
allUserOptions.value = await getAllUserList()
getCurdSchemas()
}
</script>

@ -1,237 +0,0 @@
<template>
<div>
<el-form :model="searchForm" label-width="0" inline>
<el-form-item>
<el-input v-model="searchForm.name" placeholder="学员姓名" clearable style="width: 120px" />
</el-form-item>
<el-form-item>
<el-input
v-model="searchForm.phone"
placeholder="联系方式"
clearable
style="width: 100px"
/>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.intentionState"
placeholder="学员意向"
clearable
filterable
style="width: 100px"
>
<el-option
v-for="item in intentionOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.followUser"
placeholder="跟进人"
clearable
filterable
style="width: 120px"
>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="searchForm.remarkDate"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
range-separator="-"
start-placeholder="报备日期"
end-placeholder="报备日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.schoolId"
placeholder="邀约驾校"
clearable
filterable
style="width: 120px"
>
<el-option
v-for="item in schoolOptions"
:key="item.schoolId"
:label="item.schoolName"
:value="item.schoolId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.placeId"
placeholder="邀约场地"
clearable
filterable
style="width: 120px"
>
<el-option
v-for="item in placeOptions"
:key="item.placeId"
:label="item.name"
:value="item.placeId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="searchForm.signDate"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
range-separator="-"
start-placeholder="报名日期"
end-placeholder="报名日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.isSign"
placeholder="报名状态"
clearable
filterable
style="width: 100px"
>
<el-option label="未报名" :value="0" />
<el-option label="已报名" :value="1" />
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.isEnroll"
placeholder="登记状态"
clearable
filterable
style="width: 100px"
>
<el-option label="未登记" :value="0" />
<el-option label="已登记" :value="1" />
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="tableList" border>
<el-table-column prop="name" label="学员姓名" width="90px" />
<el-table-column prop="phone" label="联系方式" width="110px" />
<el-table-column prop="followUserName" label="跟进人" width="90" />
<el-table-column prop="intentionStateName" label="学员意向" width="90" />
<el-table-column prop="remarkDate" label="报备日期" width="100px" />
<el-table-column prop="remarkUserName" label="报备人" width="90px" />
<el-table-column prop="remarkContent" label="报备内容" min-width="400px" />
<el-table-column prop="schoolName" label="邀约驾校" width="100" />
<el-table-column prop="placeName" label="邀约场地" width="100" />
<el-table-column prop="signDate" label="报名日期" width="100px" />
<el-table-column prop="enterUserName" label="接待人" width="90px" />
<el-table-column prop="signInfo" label="报名信息" min-width="150px" />
<el-table-column prop="isSign" label="报名状态" width="85px" fixed="right">
<template #default="{ row }">
<el-tag type="success" v-if="row.isSign">已报名</el-tag>
<el-tag type="info" v-else>未报名</el-tag>
</template>
</el-table-column>
<el-table-column prop="isEnroll" label="登记状态" width="85px" fixed="right">
<template #default="{ row }">
<el-tag type="success" v-if="row.isEnroll">已登记</el-tag>
<el-tag type="info" v-else>未登记</el-tag>
</template>
</el-table-column>
</el-table>
<Pagination
v-model:limit="searchForm.pageSize"
v-model:page="searchForm.pageNo"
:total="total"
@pagination="getList"
/>
</div>
</template>
<script setup>
import { getSimpleUserList as getUserOption } from '@/api/system/user'
import { getClueRemarkPage } from '@/api/clue/clueRemark'
import { getPlaceList } from '@/api/school/place'
import { getIntDictOptions } from '@/utils/dict'
import { removeNullField } from '@/utils/index'
onMounted(() => {
getOptions()
handleSearch()
})
const userOptions = ref([])
const schoolOptions = ref([])
const placeOptions = ref([])
const intentionOptions = getIntDictOptions('intention_state')
function getOptions() {
getUserOption().then((data) => {
userOptions.value = data
})
getPlaceList({
placeStatus: 0,
schoolStatus: 0,
isSearchSchool: true
}).then((data) => {
schoolOptions.value = data.schoolList
placeOptions.value = data.placeList
})
}
const searchForm = ref({
name: undefined,
phone: undefined,
pageSize: 20,
pageNo: 1
})
function handleReset() {
searchForm.value = {
name: undefined,
phone: undefined,
pageSize: 20,
pageNo: 1
}
}
function handleSearch() {
searchForm.value.pageNo = 1
getList()
}
const loading = ref(false)
const tableList = ref([])
const total = ref(0)
async function getList() {
loading.value = true
try {
let params = { ...removeNullField(searchForm.value) }
const data = await getClueRemarkPage(params)
tableList.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
</script>
<style lang="scss" scoped></style>

@ -1,15 +1,7 @@
<template>
<div>
<el-form :model="searchForm" label-width="0" inline>
<template v-if="appStore.getAppInfo?.instanceType == 2">
<el-form-item>
<el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
</el-form-item>
</template>
<el-form-item v-else>
<el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
</el-form-item>
<el-form-item>
@ -26,8 +18,7 @@
<el-option label="已驳回" :value="4" />
</el-select>
</el-form-item>
<template v-if="appStore.getAppInfo?.instanceType == 1">
<el-form-item>
<el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
<el-select
v-model="searchForm.receiver"
placeholder="接待人"
@ -43,76 +34,6 @@
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signSchool"
placeholder="选择驾校"
filterable
clearable
@change="changeSchool"
>
<el-option
v-for="item in schoolOptions"
:key="item.schoolId"
:label="item.schoolName"
:value="item.schoolId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signPlace"
placeholder="选择场地"
filterable
clearable
:disabled="!searchForm.signSchool"
@change="changePlace"
>
<el-option
v-for="item in placeOptions"
:key="item.placeId"
:label="item.name"
:value="item.placeId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signClass"
:disabled="!searchForm.signPlace"
placeholder="选择班型"
filterable
clearable
>
<el-option
v-for="item in classOptions"
:key="item.typeId"
:label="item.typeName"
:value="item.typeId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.licenseType" placeholder="驾照类型" filterable clearable>
<el-option
v-for="item in getDictOptions(DICT_TYPE.LINCENSE_TYPE)"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
<el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
<el-select
v-model="searchForm.convertPeople"
@ -200,7 +121,6 @@
<el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:return-search']">查询</el-button>
<el-button @click="handleReset" v-hasPermi="['clue:order:return-reset']">重置</el-button>
<el-button @click="handleExport" v-hasPermi="['clue:order:return-export']">导出</el-button>
<el-button @click="batchAudit" v-hasPermi="['clue:order:return-batch-audit']">
批量审核
</el-button>
@ -216,24 +136,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signId"
label="成交单号"
min-width="120px"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 2"
prop="signOrderId"
label="成交单号"
min-width="120px"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 2"
prop="signId"
label="子订单号"
min-width="120px"
/>
<el-table-column prop="signId" label="成交单号" min-width="120px" />
<el-table-column prop="name" label="线索名称" width="120px" />
<el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
<el-table-column prop="money" label="回款金额" min-width="120px">
@ -295,30 +198,6 @@
<div v-else>{{ row.isPayoff }}</div>
</template>
</el-table-column>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signSchool"
label="报名驾校"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signPlace"
label="报名场地"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signClass"
label="报名班型"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="licenseType"
label="驾照类型"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="receiverName"
@ -438,10 +317,6 @@
<script setup name="Reback">
import * as FeebackApi from '@/api/clue/payment'
import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
import { getAreaSimpleList } from '@/api/school/setting/area'
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import { useUserStore } from '@/store/modules/user'
import DialogFeebackAudit from './DialogFeebackAudit.vue'
@ -449,10 +324,8 @@ import DialogFeebackDetail from './DialogFeebackDetail.vue'
import DialogBatchAudit from './DialogBatchAudit.vue'
import { removeNullField } from '@/utils'
import download from '@/utils/download'
import { useAppStore } from '@/store/modules/app'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import { ElLoading } from 'element-plus'
const userStore = useUserStore()
const message = useMessage() //
@ -464,7 +337,6 @@ const currentUserId = userStore.getUser.id
const searchForm = ref({
signId: undefined,
signOrderId: undefined,
name: undefined,
state: undefined,
dealDate: [],
@ -480,13 +352,6 @@ const searchForm = ref({
const userOptions = ref([])
const allUserOptions = ref([])
const schoolOptions = ref([])
const allPlaceOptions = ref([])
const placeOptions = computed(() => {
return allPlaceOptions.value.filter((it) => it.schoolId == searchForm.value.signSchool)
})
const tableList = ref([])
const total = ref(0)
@ -498,7 +363,6 @@ function handleSearch() {
function handleReset() {
searchForm.value = {
signId: undefined,
signOrderId: undefined,
receiver: undefined,
convertPeople: undefined,
name: undefined,
@ -509,31 +373,11 @@ function handleReset() {
applyUser: undefined,
checkTime: [],
mobile: undefined,
signSchool: undefined,
signPlace: undefined,
signClass: undefined,
area: undefined,
pageNo: 1,
pageSize: 20
}
}
function changeSchool() {
searchForm.value.signPlace = undefined
searchForm.value.signClass = undefined
}
function changePlace() {
searchForm.value.signClass = undefined
getClassTypeOptions()
}
const classOptions = ref([])
async function getClassTypeOptions() {
const data = await getClassTypeList({ placeId: searchForm.value.signPlace, status: 0 })
classOptions.value = data
}
const totalInfo = ref({})
const loading = ref(false)
async function getList() {
@ -548,26 +392,6 @@ async function getList() {
}
}
async function handleExport() {
try {
ElLoading.service({
lock: true,
text: '正在导出数据,请稍后...',
background: 'rgba(0, 0, 0, 0.7)'
})
const params = removeNullField(searchForm.value)
delete params.pageNo
delete params.pageSize
const data = await FeebackApi.exportPayment(params)
download.excel(data, `汇款记录表${new Date().getTime()}.xls`)
} finally {
setTimeout(() => {
const loadingInstance = ElLoading.service()
loadingInstance.close()
}, 400)
}
}
const batchIds = ref([])
function handleSelectionChange(val) {
batchIds.value = val.map((it) => it.id)
@ -576,7 +400,7 @@ function handleSelectionChange(val) {
const batchAuditDialog = ref()
function batchAudit() {
if (batchIds.value.length) {
batchAuditDialog.value.open('feeback', batchIds.value)
batchAuditDialog.value.open('aftersale', batchIds.value)
} else {
message.info('请选择表格中需要审核的数据')
}
@ -603,17 +427,7 @@ function handleAudit(row) {
feebackDialog.value.open(row)
}
const areaOptions = ref([])
function getOptions() {
//
getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
schoolOptions.value = data.schoolList
allPlaceOptions.value = data.placeList
})
//
getAreaSimpleList().then((data) => {
areaOptions.value = data
})
getUserOption().then((data) => {
userOptions.value = data
})

@ -126,8 +126,8 @@
</el-form-item>
<el-form-item>
<el-radio-group v-model="searchForm.settlementState">
<el-radio :label="1" :value="1"> 已结算 </el-radio>
<el-radio :label="0" :value="0"> 待结算 </el-radio>
<el-radio :label="1"> 已结算 </el-radio>
<el-radio :label="0"> 待结算 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
@ -248,16 +248,6 @@
<el-form-item label="结算金额">
{{ settleAmount }}
</el-form-item>
<el-form-item label="结算日期">
<el-date-picker
v-model="form.settlementDate"
type="date"
placeholder="选择日期时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:clearable="false"
/>
</el-form-item>
<el-form-item label="结算备注" prop="remark">
<Editor v-model:modelValue="form.remark" />
</el-form-item>
@ -280,7 +270,7 @@ import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
import * as SettleApi from '@/api/clue/settle'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import { dateFormatter } from '@/utils/formatTime'
import { removeNullField } from '@/utils/index'
const message = useMessage() //
@ -405,7 +395,6 @@ function batchSettle() {
showDailog.value = true
form.value = {
settlementIds: selectList.value.map((it) => it.settlementId),
settlementDate: formatDate(new Date()),
reamrk: undefined
}
settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)

@ -26,9 +26,6 @@
<el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle-list'])">
<Settle v-if="tabName == 'settle'" />
</el-tab-pane>
<el-tab-pane label="邀约报备" name="remark" v-if="checkPermi(['clue:order:remark'])">
<OrderRemark v-if="tabName == 'remark'" />
</el-tab-pane>
</el-tabs>
</template>
@ -40,8 +37,6 @@ import Reback from './Comp/Reback.vue'
import AfterSales from './Comp/AfterSales.vue'
import Delivery from './Comp/Delivery.vue'
import Settle from './Comp/Settle.vue'
import OrderRemark from './Comp/OrderRemark.vue'
import { checkPermi } from '@/utils/permission'
const appStore = useAppStore()

@ -1,144 +0,0 @@
<template>
<div class="p-10px">
<el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
<el-form-item label="学员姓名" prop="stuName">
<el-input v-model="form.stuName" placeholder="请输入" />
</el-form-item>
<el-form-item label="手机号" prop="stuMobile">
<el-input v-model="form.stuMobile" placeholder="请输入" />
</el-form-item>
<el-form-item label="线索来源" prop="source">
<el-cascader
:options="sourceOptions"
v-model="form.source"
clearable
filterable
:props="defaultProps"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="咨询日期" prop="stuConsultTime">
<el-date-picker
v-model="form.stuConsultTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="咨询车型" prop="stuConsultCartype">
<el-select v-model="form.stuConsultCartype" placeholder="请选择" clearable filterable>
<el-option
v-for="item in cartypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="学员诉求" prop="requirement">
<el-input
v-model="form.requirement"
type="textarea"
:autosize="{ minRows: 3 }"
placeholder="请输入"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
:autosize="{ minRows: 3 }"
placeholder="请输入"
/>
</el-form-item>
<el-form-item label-width="0">
<el-button type="primary" @click="onSubmit" size="large" style="width: 100%"
> </el-button
>
</el-form-item>
</el-form>
</div>
</template>
<script setup>
import { getStrDictOptions } from '@/utils/dict'
import { getSimpleSourceList } from '@/api/clue/source'
import { handleTree } from '@/utils/tree'
import { formatDate } from '@/utils/formatTime'
// import * as authUtil from '@/utils/auth'
import { clueInput } from '@/api/clue'
onMounted(() => {
getOptions()
})
const message = useMessage()
const form = ref({
stuName: '',
stuMobile: '',
source: '',
stuConsultTime: formatDate(new Date()),
stuConsultCartype: 'C1',
requirement: '',
remark: '',
instanceId: '1014'
})
const defaultProps = {
expandTrigger: 'hover',
checkStrictly: false,
label: 'sourceName',
value: 'sourceId'
}
const rules = {
stuName: [{ required: true, message: '请输入学员姓名', trigger: 'blur' }],
stuMobile: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
source: [{ required: true, message: '请选择线索来源', trigger: 'change' }],
stuConsultTime: [{ required: true, message: '请选择咨询日期', trigger: 'change' }],
stuConsultCartype: [{ required: true, message: '请选择咨询车型', trigger: 'change' }]
}
const sourceOptions = ref([])
const cartypeOptions = getStrDictOptions('license_type')
function getOptions() {
getSimpleSourceList().then((data) => {
sourceOptions.value = handleTree(data, 'sourceId')
})
}
const formRef = ref(null)
function onSubmit() {
formRef.value.validate((valid) => {
if (valid) {
//
const params = {
...form.value,
source: form.value.source ? form.value.source[form.value.source.length - 1] : null
}
clueInput(params).then(() => {
message.success('线索录入成功')
form.value = {
stuName: '',
stuMobile: '',
source: '',
stuConsultTime: formatDate(new Date()),
stuConsultCartype: '',
requirement: '',
remark: ''
}
})
} else {
console.log('表单验证失败')
return false
}
})
}
</script>
<style lang="scss" scoped></style>

@ -1,593 +0,0 @@
<template>
<div style="height: 100vh; overflow-y: auto">
<div>
<div>
<Descriptions
:title="`线索信息-${info.name}`"
:data="info"
:schema="showSchema"
:columns="2"
labelWidth="130px"
:defaultShow="false"
/>
<el-form
:model="form"
ref="formRef"
:rules="rules"
label-width="85px"
class="mt-20px pl-10px pr-10px"
>
<el-row>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="学员姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入学员姓名" />
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系方式" maxlength="11" />
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="成交驾校" prop="signSchool">
<el-select
v-model="form.signSchool"
placeholder="选择驾校"
filterable
@change="changeSchool"
>
<el-option
v-for="item in schoolOptions"
:key="item.schoolId"
:label="item.schoolName"
:value="item.schoolId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="成交场地" prop="signPlace">
<el-select
v-model="form.signPlace"
placeholder="选择场地"
filterable
:disabled="!form.signSchool"
@change="changePlace"
>
<el-option
v-for="item in placeOptions"
:key="item.placeId"
:label="item.name"
:value="item.placeId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="成交班型" prop="signClass">
<el-select
v-model="form.signClass"
:disabled="!form.signPlace"
placeholder="选择班型"
filterable
@change="changeClass"
>
<el-option
v-for="item in classOptions"
:key="item.typeId"
:label="item.typeName"
:value="item.typeId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="成交日期" prop="dealDate">
<el-date-picker
v-model="form.dealDate"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期时间"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="成交价" prop="signPrice">
<el-input-number
v-model="form.signPrice"
:min="0"
style="width: 100%"
:controls="false"
@change="signPriceChange"
/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="是否全款">
<el-radio-group v-model="form.isPayoff">
<el-radio :label="true" :value="true"> 全款 </el-radio>
<el-radio :label="false" :value="false"> 非全款 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="支付金额" prop="payAmount">
<el-input-number
v-model="form.payAmount"
:min="0"
style="width: 100%"
:controls="false"
/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="公司收款" prop="isCompanyReceipts">
<el-radio-group v-model="form.isCompanyReceipts">
<el-radio :label="true" :value="true"></el-radio>
<el-radio :label="false" :value="false"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24" v-if="form.signClass">
<el-form-item label="利润">
<div style="color: blue; font-weight: bold; font-size: 16px">{{ profitNum }}</div>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="6" :md="8" :sm="24" :xs="24">
<el-form-item label="接待人" prop="receiver">
<el-select v-model="form.receiver" placeholder="选择接待人" clearable filterable>
<el-option
v-for="item in allUserOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col
:xl="6"
:lg="6"
:md="8"
:sm="24"
:xs="24"
v-for="fieldItem in diyFieldList"
:key="fieldItem.clueParamId"
>
<el-form-item :label="fieldItem.label" :prop="fieldItem.field">
<component :is="componentMap[fieldItem.component]" v-model="form[fieldItem.field]">
<template v-if="fieldItem.component == 'Select'">
<el-option
v-for="item in fieldItem.options"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</template>
<template v-else-if="fieldItem.component == 'Radio'">
<el-radio
v-for="item in fieldItem.options"
:key="item.id"
:label="item.id"
:value="item.id"
>
{{ item.name }}
</el-radio>
</template>
<template v-else-if="fieldItem.component == 'Checkbox'">
<el-checkbox
v-for="item in fieldItem.options"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</template>
</component>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0" class="mb-18px">
<el-divider direction="horizontal" content-position="left"> 其他费用 </el-divider>
<el-button
class="mb-5px"
type="primary"
size="small"
@click="form.otherPay.push({ extraPayType: undefined, extraPayMoney: 0 })"
>
添加其他费用
</el-button>
<el-table :data="form.otherPay" border size="small">
<el-table-column type="index" width="30" />
<el-table-column prop="extraPayType" label="费用类型">
<template #default="{ row }">
<el-select
v-model="row.extraPayType"
size="small"
placeholder="费用类型"
filterable
>
<el-option
v-for="item in otherPayOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="extraPayMoney" label="费用金额">
<template #default="{ row }">
<el-input-number v-model="row.extraPayMoney" size="small" :controls="false" />
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template #default="{ row }">
<el-input v-model="row.remark" size="small" placeholder="备注信息" />
</template>
</el-table-column>
<el-table-column label="操作" width="50px">
<template #default="{ $index }">
<Icon
icon="ep:remove-filled"
class="text-red-500"
@click="handleRemove('otherPay', $index)"
/>
</template>
</el-table-column>
</el-table>
</el-col>
<el-col :span="24" :offset="0" class="mb-18px">
<el-divider direction="horizontal" content-position="left"> 额外支出 </el-divider>
<el-button
class="mb-5px"
type="primary"
size="small"
@click="
form.extraPay.push({
extraPayType: undefined,
extraPayMoney: 0,
dictType: 'extra_pay_type',
editabled: true
})
"
>
添加额外支出
</el-button>
<el-table :data="form.extraPay" border size="small">
<el-table-column type="index" width="30" />
<el-table-column prop="extraPayType" label="支出类型">
<template #default="{ row }">
<el-select
v-if="row.editabled"
v-model="row.extraPayType"
size="small"
placeholder="支出类型"
filterable
>
<el-option
v-for="item in extraPayOptions"
:key="item.id"
:label="item.extraPayName"
:value="item.id"
/>
</el-select>
</template>
</el-table-column>
<el-table-column prop="extraPayMoney" label="支出金额">
<template #default="{ row }">
<el-input-number
v-if="row.editabled"
v-model="row.extraPayMoney"
size="small"
:controls="false"
/>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template #default="{ row }">
<el-input
v-if="row.editabled"
v-model="row.remark"
size="small"
placeholder="备注信息"
/>
</template>
</el-table-column>
<el-table-column label="操作" width="50px">
<template #default="{ row, $index }">
<Icon
icon="ep:remove-filled"
class="text-red-500"
v-if="row.editabled"
@click="handleRemove('extraPay', $index)"
/>
</template>
</el-table-column>
</el-table>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="备注" label-width="50px">
<Editor v-model:modelValue="form.remark" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="p-10px">
<el-button
v-if="!remarkInfo.isEnroll && info.clueId"
type="primary"
size="large"
style="width: 100%"
@click="handleSave"
>
</el-button>
</div>
</div>
</div>
</div>
</template>
<script setup>
import * as ClueApi from '@/api/clue'
import { createSignOnRemark, getSignProfit } from '@/api/clue/sign'
import { getClueRemarkByRemarkId } from '@/api/clue/clueRemark'
import { getDiyFieldList } from '@/api/clue/orderField'
import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
import { getConfigByConfigKey } from '@/api/system/set'
import { getSimpleFieldList as getClueField } from '@/api/clue/clueField'
import { getSimpleFieldList } from '@/api/clue/orderField'
import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
import { getAllUserList } from '@/api/system/user'
import { formatDate } from '@/utils/formatTime'
import { getDictOptions } from '@/utils/dict'
import { componentMap } from '@/components/Form/src/componentMap'
import { useUserStore } from '@/store/modules/user'
const form = ref({})
const schoolRules = {
name: { required: true, message: '学员姓名不可为空', trigger: 'blur' },
phone: { required: true, message: '联系方式不可为空', trigger: 'blur' },
signSchool: { required: true, message: '成交驾校不可为空', trigger: 'change' },
signPlace: { required: true, message: '成交场地不可为空', trigger: 'change' },
signClass: { required: true, message: '成交班型不可为空', trigger: 'change' }
}
const info = ref({})
const formLoading = ref(false)
const route = useRoute()
const message = useMessage() //
const userStore = useUserStore()
const showSchema = ref([])
const otherPayOptions = getDictOptions('other_pay_type')
const extraPayOptions = ref([])
const remarkInfo = ref({})
onMounted(() => {
if (route.params.id && route.params.id != 0) {
// API
getClueRemarkByRemarkId({ remarkId: route.params.id }).then((response) => {
remarkInfo.value = response
if (
userStore.getUser?.id != remarkInfo.value.remarkUser &&
userStore.getUser?.id != remarkInfo.value.followUser
) {
message.error('无权限操作该登记页面!')
return
} else {
resetForm()
getOptions()
getDiyFields()
ClueApi.getClue(remarkInfo.value.clueId).then((data) => {
info.value = { ...data, ...data.diyParams, signInfo: remarkInfo.value.signInfo }
let str = ''
// if (!remarkInfo.value.remarkContent.includes(data.name)) {
// //
// str += ''
// }
// if (!remarkInfo.value.remarkContent.includes(data.phone)) {
// //
// str += ''
// }
if (str.length) {
message.warning(`请注意:${str}`)
}
})
}
})
} else {
//
window.close()
}
})
async function resetForm() {
const data = await getConfigByConfigKey({ configKey: 'companyCollectionConfig' })
form.value = {
name: remarkInfo.value.name,
phone: remarkInfo.value.phone,
clueId: remarkInfo.value.clueId,
dealDate: formatDate(new Date()),
isPayoff: true,
signPrice: 0,
payAmount: 0,
remark: undefined,
isCompanyReceipts: data?.configValue == 'true',
receiver: undefined,
extraPay: [],
otherPay: [],
signProducts: [],
installStatus: 3
}
}
const rules = ref([])
function getDiyFields() {
getSimpleFieldList().then((data) => {
let ruleObj = {}
data.map((it) => {
if (it.isRequired) {
Reflect.set(ruleObj, it.field, {
required: true,
message: `${it.label}不可为空`,
trigger: 'blur, change'
})
}
})
rules.value = { ...ruleObj, ...schoolRules }
})
}
const formRef = ref()
async function handleSave() {
//
if (!formRef.value) return
const valid = await formRef.value.validate()
if (!valid) return
if (form.value.otherPay.some((it) => !it.extraPayType || it.extraPayMoney == null)) {
message.info('请将费用类型及费用金额填写完整!')
return
}
if (form.value.extraPay.some((it) => !it.extraPayType || it.extraPayMoney == null)) {
message.info('请将支出类型及支出金额填写完整!')
return
}
//
formLoading.value = true
try {
const params = { ...form.value }
params.diyParams = {}
diyFieldList.value.map((it) => {
params.diyParams[it.field] = undefined
})
for (const key in params.diyParams) {
if (Object.hasOwnProperty.call(params, key)) {
params.diyParams[key] = params[key]
}
}
await createSignOnRemark(params)
message.success('登记成功!')
//
emit('success')
} finally {
formLoading.value = false
}
}
const schoolOptions = ref([])
const allPlaceOptions = ref([])
const diyFieldList = ref([])
const placeOptions = computed(() => {
return allPlaceOptions.value.filter((it) => it.schoolId == form.value.signSchool)
})
const classOptions = ref([])
const allUserOptions = ref([])
async function getClassTypeOptions() {
const data = await getClassTypeList({ placeId: form.value.signPlace, status: 0 })
classOptions.value = data
}
function getOptions() {
getClueField().then((data) => {
const list = useCrudSchemas(data)?.allSchemas?.detailSchema?.map((it) => {
if (it.label.includes('日期')) {
it.dateFormat = 'YYYY-MM-DD'
}
return it
})
if (list.length % 2 != 0) {
list.push({})
}
const arr = [
{
field: 'requirement',
label: '诉求',
span: 2
},
{
field: 'remark',
label: '备注',
isEditor: true,
span: 2
},
{
field: 'signInfo',
label: '报名信息',
isEditor: true,
span: 2
}
]
showSchema.value = [...list, ...arr]
})
//
getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
schoolOptions.value = data.schoolList
allPlaceOptions.value = data.placeList
})
//
getDiyFieldList().then((data) => {
diyFieldList.value = data
})
getExtraFeeSimpleList().then((data) => {
extraPayOptions.value = data
})
getAllUserList().then((data) => {
allUserOptions.value = data
})
}
function changeSchool() {
form.value.signPlace = undefined
form.value.signClass = undefined
}
function changePlace() {
form.value.signClass = undefined
getClassTypeOptions()
}
function changeClass() {
form.value.signPrice =
classOptions.value.find((it) => it.typeId == form.value.signClass).guidingPrice || 0
signPriceChange()
}
function signPriceChange() {
if (form.value.isPayoff) {
form.value.payAmount = form.value.signPrice
}
calcSignProfit()
}
const profitNum = ref(0)
function calcSignProfit() {
if (form.value.signClass) {
//
getSignProfit({ signClass: form.value.signClass, signPrice: form.value.signPrice }).then(
(data) => {
profitNum.value = data
}
)
}
}
function handleRemove(type, index) {
form.value[type].splice(index, 1)
}
</script>
<style lang="scss" scoped></style>

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

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

@ -19,7 +19,7 @@
:disabled="!row.editable"
>
<el-option
v-for="item in props.allUserOptions"
v-for="item in props.userOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
@ -88,7 +88,7 @@
<div class="w-100px">线索位置</div>
<el-input v-model="address" disabled placeholder="请输入线索位置" clearable />
</div>
<el-checkbox v-model="showSchool" :label="true" :value="true" @change="handleShowSchool">
<el-checkbox v-model="showSchool" :label="true" @change="handleShowSchool">
展示场地
</el-checkbox>
</div>
@ -170,7 +170,7 @@ const formSchema = computed(() => {
if (it.field == 'consultTime') {
it.componentProps['disabled-date'] = dateAfterToday
// it.componentProps['disabled'] = formType.value != 'create'
it.componentProps['disabled'] = appStore.getAppInfo?.instanceType == 1
it.componentProps['disabled'] = true
}
// else if (it.field == 'convertPeople' && formType.value == 'update') {
// it.componentProps['disabled'] = true
@ -335,14 +335,11 @@ async function handleSave() {
if (!followList.value || followList.value.length == 0) {
message.info('请添加跟进人')
return
} else if (followList.value.some((it) => !it.userId)) {
}
if (followList.value && followList.value.length && followList.value.some((it) => !it.userId)) {
message.info('请将跟进人填写完整!')
return
} else if (followList.value.some((it) => it.userId == useUserStore().getUser.id && !it.content)) {
message.info('请填写您的首次跟进内容或将线索跟进人改成他人!')
return
}
if (appStore.getAppInfo?.instanceType == 1 && !address.value) {
message.info('请选择学员位置!')
return
@ -398,7 +395,7 @@ let geoCoder = ref(null)
function initMap(data) {
AMapLoader.load({
key: import.meta.env.VITE_AMAP_KEY, //key
key: '713d839ff505943b0f18e6df45f3b0dc', //key
version: '2.0',
plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
}).then((AMap) => {

@ -17,6 +17,17 @@
/>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="下次跟进时间" prop="nextFollowTime">
<el-date-picker
v-model="form.nextFollowTime"
type="date"
format="YYYY-MM-DD"
valueFormat="YYYY-MM-DD"
placeholder="下次跟进时间"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="意向状态" prop="intentionState">
<el-select v-model="form.intentionState" filterable>
@ -29,21 +40,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col
:span="12"
:offset="0"
v-if="form.intentionState != 74 && form.intentionState != '1956731237364404224'"
>
<el-form-item label="下次跟进时间" prop="nextFollowTime">
<el-date-picker
v-model="form.nextFollowTime"
type="date"
format="YYYY-MM-DD"
valueFormat="YYYY-MM-DD"
placeholder="下次跟进时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24" :offset="0">

@ -1,149 +0,0 @@
<template>
<Dialog title="邀约报备" v-model="show" width="600px">
<el-form :model="form" ref="formRef" :rules="rules" label-width="0">
<el-form-item prop="remarkContent">
<el-input
type="textarea"
placeholder="请输入报备信息"
v-model="form.remarkContent"
:autosize="{ minRows: 10 }"
/>
</el-form-item>
<el-form-item prop="groupId">
<el-select v-model="form.groupId" placeholder="选择群聊发送报备信息并@区域" filterable>
<el-option
v-for="item in groupOptions"
:key="item.groupId"
:label="item.groupName"
:value="item.groupId"
/>
</el-select>
</el-form-item>
<el-form-item prop="schoolPlace">
<el-cascader
v-model="form.schoolPlace"
:options="placeOptions"
placeholder="选择邀约驾校和场地"
filterable
show-all-levels
style="width: 100%"
:props="{ expandTrigger: 'hover', multiple: false, checkStrictly: true }"
/>
</el-form-item>
</el-form>
<template #footer>
<span>
<el-button @click="show = false"> </el-button>
<el-button :disabled="formLoading" type="primary" @click="handleSave"> </el-button>
</span>
</template>
</Dialog>
</template>
<script setup>
import { getWxGroupSimpleList, getClueRemarkByClueId, reportClue } from '@/api/clue/clueRemark'
import { getPlaceList } from '@/api/school/place'
import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore()
const message = useMessage()
const form = ref({
remarkContent: '',
groupId: '',
schoolPlace: []
})
const rules = {
remarkContent: [{ required: true, message: '请输入报备信息', trigger: 'blur' }],
groupId: [{ required: true, message: '请选择群聊', trigger: 'change' }]
}
const formLoading = ref(false)
const show = ref(false)
async function open(row) {
show.value = true
//
getOptions()
//
const data = await getClueRemarkByClueId({ clueId: row.clueId })
if (data && data.remarkId) {
form.value = { ...data }
if (data.schoolId && data.placeId) {
form.value.schoolPlace = [data.schoolId, data.placeId]
} else if (data.schoolId) {
form.value.schoolPlace = [data.schoolId]
}
return
}
form.value.clueId = row.clueId
let remarkInfo = `学员姓名:${row.name}\n联系方式:${row.phone}\n意向驾校:\n意向班型:`
if (row.diyParams?.licenseType) {
remarkInfo += `${row.diyParams.licenseType}\n`
} else {
remarkInfo += `\n`
}
// const name = userStore.getUser.nickname.substring(0, 1)
const name = userStore.getUser.nickname
remarkInfo += `意向成交价:\n邀约时间:\n邀约人:${name}教练\n备注:`
form.value.remarkContent = remarkInfo
}
defineExpose({ open })
const groupOptions = ref([])
const placeOptions = ref([])
function getOptions() {
getWxGroupSimpleList().then((response) => {
groupOptions.value = response
})
getPlaceList({
placeStatus: 0,
schoolStatus: 0,
isSearchSchool: true
}).then((data) => {
placeOptions.value = data.schoolList.map((item) => ({
value: item.schoolId,
label: item.schoolName,
children: data.placeList
.filter((place) => item.schoolId == place.schoolId)
.map((place) => ({
value: place.placeId,
label: place.name
}))
}))
})
}
const formRef = ref(null)
function handleSave() {
formRef.value.validate(async (valid) => {
if (valid) {
formLoading.value = true
try {
const params = { ...form.value }
if (params.schoolPlace && params.schoolPlace.length) {
params.schoolId = params.schoolPlace[0]
if (params.schoolPlace.length == 2) {
params.placeId = params.schoolPlace[1]
}
}
await reportClue(params)
message.success('提交报备信息成功')
show.value = false
} catch (error) {
console.error('提交报备信息失败', error)
} finally {
formLoading.value = false
}
} else {
console.log('表单验证失败')
return false
}
})
}
</script>
<style lang="scss" scoped></style>

@ -1,29 +1,8 @@
<template>
<Dialog title="成交登记" v-model="show" width="1000px">
<Dialog title="成交登记" v-model="show" width="900px">
<template #btn>
<el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
</template>
<div v-if="showMergeOrder">
<div style="color: red">
查询到该客户已有成交订单请选择订单进行合并不选择则生成独立订单
</div>
<el-radio-group v-model="mergeOrderId" style="width: 100%">
<el-radio
v-for="item in mergeOrderList"
:key="item.signOrderId"
:label="item.signOrderId"
:value="item.signOrderId"
style="width: 100%; margin: 15px 0"
>
<div class="flex justify-between">
<div class="mr-20px">订单编号{{ item.signOrderId }}</div>
<div class="mr-20px">登记时间{{ item.dealDate }}</div>
<div>线索来源{{ item.source }}</div>
</div>
</el-radio>
</el-radio-group>
</div>
<div v-else>
<Descriptions
:title="`线索信息-${info.name}`"
:data="info"
@ -33,7 +12,7 @@
:defaultShow="false"
/>
<el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
<el-row>
<el-row :gutter="20">
<!-- 驾校招生模式 -->
<template v-if="appStore.getAppInfo?.instanceType == 1">
<el-col :span="8" :offset="0">
@ -116,8 +95,8 @@
<el-col :span="8" :offset="0">
<el-form-item label="是否全款">
<el-radio-group v-model="form.isPayoff">
<el-radio :label="true" :value="true"> 全款 </el-radio>
<el-radio :label="false" :value="false"> 非全款 </el-radio>
<el-radio :label="true"> 全款 </el-radio>
<el-radio :label="false"> 非全款 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -134,8 +113,8 @@
<el-col :span="8" :offset="0">
<el-form-item label="公司收款" prop="isCompanyReceipts">
<el-radio-group v-model="form.isCompanyReceipts">
<el-radio :label="true" :value="true"></el-radio>
<el-radio :label="false" :value="false"></el-radio>
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -186,12 +165,7 @@
/>
</template>
<template v-else-if="fieldItem.component == 'Radio'">
<el-radio
v-for="item in fieldItem.options"
:key="item.id"
:label="item.id"
:value="item.id"
>
<el-radio v-for="item in fieldItem.options" :key="item.id" :label="item.id">
{{ item.name }}
</el-radio>
</template>
@ -356,14 +330,7 @@
</el-col>
</el-row>
</el-form>
</div>
<template #footer v-if="showMergeOrder">
<span>
<el-button @click="show = false"> </el-button>
<el-button :disabled="formLoading" type="primary" @click="handleNext"> </el-button>
</span>
</template>
<template #footer v-else>
<template #footer>
<span>
<el-button @click="show = false"> </el-button>
<el-button :disabled="formLoading" type="primary" @click="handleSave"> </el-button>
@ -374,7 +341,7 @@
<script setup name="DialogSuccess">
import * as ClueApi from '@/api/clue'
import { createSign, getSignProfit, getSignPage } from '@/api/clue/sign'
import { createSign, getSignProfit } from '@/api/clue/sign'
import { getDiyFieldList } from '@/api/clue/orderField'
import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
@ -413,9 +380,6 @@ const props = defineProps({
})
const prodTotalPrice = computed(() => {
if (appStore.getAppInfo?.instanceType != 2) {
return 0
}
return form.value.signProducts.reduce(
(pre, cur) => pre + (cur?.price || 0) * (cur?.signNum || 0),
0
@ -423,7 +387,7 @@ const prodTotalPrice = computed(() => {
})
const extraTotalPrice = computed(() => {
return form.value.extraPay?.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
return form.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
})
const showSchema = computed(() => {
@ -452,6 +416,23 @@ const showSchema = computed(() => {
return [...list, ...arr]
})
// const rules = computed(() => {
// let ruleObj = {}
// props.schema.map((it) => {
// if (it.isRequired) {
// Reflect.set(ruleObj, it.field, {
// required: true,
// message: `${it.label}`,
// trigger: 'blur, change'
// })
// }
// })
// if (appStore.getAppInfo?.instanceType == 1) {
// ruleObj = { ...ruleObj, ...schoolRules }
// }
// return ruleObj
// })
const extraPayOptions = getDictOptions('other_pay_type')
async function open(id) {
@ -460,10 +441,6 @@ async function open(id) {
getDiyFields()
const data = await ClueApi.getClue(id)
info.value = { ...data, ...data.diyParams }
//
if (appStore.getAppInfo?.instanceType == 2) {
setMergeOrder(data.phone)
}
show.value = true
} catch (error) {
console.log(error)
@ -491,35 +468,6 @@ function getDiyFields() {
})
}
const showMergeOrder = ref(false)
const mergeOrderList = ref([])
const mergeOrderId = ref(undefined)
function setMergeOrder(phone) {
getSignPage({ phone, pageNo: 1, pageSize: 10 }).then((data) => {
if (data.total > 0) {
//
showMergeOrder.value = true
mergeOrderList.value = data.list
mergeOrderId.value = undefined
}
})
}
function handleNext() {
if (mergeOrderId.value) {
form.value.signOrderId = mergeOrderId.value
const order = mergeOrderList.value.find((it) => it.signOrderId == mergeOrderId.value)
if (order.orderDiyParams) {
for (const key in order.orderDiyParams) {
if (Object.prototype.hasOwnProperty.call(order.orderDiyParams, key)) {
form.value[key] = order.orderDiyParams[key]
}
}
}
}
showMergeOrder.value = false
}
async function resetForm(id) {
const data = await getConfigByConfigKey({ configKey: 'companyCollectionConfig' })
form.value = {
@ -529,7 +477,7 @@ async function resetForm(id) {
signPrice: 0,
payAmount: 0,
remark: undefined,
isCompanyReceipts: data?.configValue == 'true',
isCompanyReceipts: data.configValue == 'true',
receiver: undefined,
extraPay: [],
signProducts: [],

@ -16,8 +16,7 @@
<div class="flex" style="align-items: center">
<b class="mr-5px text-24px">{{ info.name }}</b>
<div class="mr-5px text-16px">{{ info.phone }}</div>
<!-- <el-tag type="success">{{ info.intentionStateName }}</el-tag> -->
<DictTag type="intention_state" :value="info.intentionState + ''" />
<el-tag type="success">{{ info.intentionStateName }}</el-tag>
</div>
<div>
<el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
@ -65,11 +64,8 @@
>
<el-card shadow="always" :body-style="{ padding: '10px' }">
<div>
<div class="flex items-center">
<b class="text-18px mr-10px" style="line-height: 36px">
{{ item.operateUserName }}
</b>
<DictTag type="intention_state" :value="item.intentionState + ''" />
<div>
<b class="text-18px" style="line-height: 36px">{{ item.operateUserName }}</b>
</div>
<div>{{ item.content }}</div>
<div class="flex mt-10px" style="align-items: center">
@ -90,7 +86,7 @@
<el-tab-pane label="详细信息" name="infoDetail">
<Descriptions :data="info" :schema="showSchema" :columns="2" />
<div v-if="appStore.getAppInfo?.instanceType == 1">
<el-checkbox v-model="showSchool" :label="true" :value="true" @change="handleShowSchool">
<el-checkbox v-model="showSchool" :label="true" @change="handleShowSchool">
展示场地
</el-checkbox>
<div id="dialogMap" class="mt-20px" style="height: 400px; width: 100%"></div>
@ -232,8 +228,7 @@ function getFollowList() {
content: item.content,
operateDate: formatDate(item.operateTime),
followTime: formatDate(item.operateTime, 'YYYY-MM-DD HH:mm'),
nextFollowTime: formatDate(item.nextFollowTime),
intentionState: item.intentionState
nextFollowTime: formatDate(item.nextFollowTime)
}))
})
}
@ -294,7 +289,7 @@ const defaultLatLng = ref({
function initMap(data) {
AMapLoader.load({
key: import.meta.env.VITE_AMAP_KEY, //key
key: '713d839ff505943b0f18e6df45f3b0dc', //key
version: '2.0'
}).then((AMap) => {
aMap.value = AMap

@ -5,7 +5,7 @@
<el-tab-pane label="全部" name="0" />
<el-tab-pane name="1">
<template #label>
<Tooltip message="过滤掉无效线索、已流失和已成交的线索" />
<Tooltip message="除了无效线索和已成交的线索" />
<el-badge v-if="clueCount.unSignNum" :value="clueCount.unSignNum" :max="9999">
<span class="ml-3px">未成交</span>
</el-badge>
@ -67,7 +67,6 @@
class="mt-20px"
v-model:tableObject="tableObject"
:tableColumns="allSchemas.tableColumns"
rowkey="clueId"
@get-list="getTableList"
@get-checked-columns="getCheckedColumns"
@selection-change="handleSelectionChange"
@ -84,7 +83,7 @@
<div v-if="item.field == 'followRecord'">
<el-button
type="primary"
link
text
style="padding: 0"
@click="handleFollow(row)"
v-if="queryType != 4"
@ -93,9 +92,6 @@
快速新增
</el-button>
</div>
<div v-else-if="item.field == 'intentionStateName'">
<DictTag type="intention_state" :value="row.intentionState + ''" />
</div>
<div v-else-if="item.field == 'contact'">
<span>{{ row[item.field] }}</span>
<Icon class="ml-5px" icon="ep:phone" @click="makeCall(row.contact)" />
@ -136,16 +132,7 @@
<el-button
type="primary"
link
@click="handleRemark(scope.row)"
:disabled="appStore.getAppInfo?.instanceType == 1 && scope.row.state == '成交'"
v-hasPermi="['clue:pool:remark']"
>
报备
</el-button>
<el-button
type="primary"
link
:disabled="appStore.getAppInfo?.instanceType == 1 && scope.row.state == '成交'"
:disabled="scope.row.state == '成交'"
@click="handleSuccess(scope.row)"
v-hasPermi="['clue:pool:enroll']"
>
@ -204,7 +191,6 @@
:userOptions="allStatusUserOptions"
@success="getTableList"
/>
<DialogRemark ref="remarkRef" />
</div>
</template>
@ -217,7 +203,6 @@ import DialogSuccess from './Comp/DialogSuccess.vue'
import DialogFollow from './Comp/DialogFollow.vue'
import ClueMap from './Comp/ClueMap.vue'
import DialogBatchChangeFollow from './Comp/DialogBatchChangeFollow.vue'
import DialogRemark from './Comp/DialogRemark.vue'
import {
getSimpleUserList as getUserOption,
getAllUserList,
@ -249,12 +234,11 @@ async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
searchFieldList.value = data.filter((it) => it.isCustom)
data.forEach((elem) => {
// if (['followUser', 'convertPeople'].includes(elem.field)) {
// elem.search.options = userOptions.value
// } else
if (['firstFollowUser', 'followUser', 'convertPeople'].includes(elem.field)) {
if (['followUser', 'convertPeople'].includes(elem.field)) {
elem.search.options = userOptions.value
} else if (['firstFollowUser'].includes(elem.field)) {
elem.search.options = allStatusUserOptions.value
}
})
@ -374,11 +358,6 @@ async function makeCall(phone) {
console.log('打电话:' + phone)
}
const remarkRef = ref()
function handleRemark(row) {
remarkRef.value.open(row)
}
//
function handleSuccess(row) {
successRef.value.open(row.clueId)

@ -1,111 +0,0 @@
<template>
<div>
<el-card shadow="always" :body-style="{ padding: '10px' }">
<template #header>
<div>
<span>报备</span>
</div>
</template>
<el-input
class="remark"
type="textarea"
v-model="form.remarkContent"
:autosize="{ minRows: 5 }"
readonly
/>
</el-card>
<el-card shadow="always" :body-style="{ padding: '10px' }" class="mt-10px">
<template #header>
<div>
<span>接待录入</span>
</div>
</template>
<el-form :model="form" ref="formRef" :rules="rules" label-width="0">
<el-form-item prop="signInfo">
<el-input
class="remark"
type="textarea"
placeholder="请输入报名信息"
v-model="form.signInfo"
:autosize="{ minRows: 5 }"
/>
</el-form-item>
<el-form-item prop="group">
<el-select v-model="form.groupId" placeholder="选择群聊并发送报名信息" filterable>
<el-option
v-for="item in groupOptions"
:key="item.groupId"
:label="item.groupName"
:value="item.groupId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button class="w-full" type="primary" size="large" @click="handleSubmit">
提交
</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</template>
<script setup>
import { getWxGroupSimpleList } from '@/api/clue/clueRemark'
import { getClueRemarkByRemarkId, registerClue } from '@/api/clue/clueRemark'
const route = useRoute()
const message = useMessage()
const groupOptions = ref([])
const form = ref({
signInfo: '',
groupId: ''
})
const rules = {
signInfo: [{ required: true, message: '请输入接待信息', trigger: 'blur' }],
groupId: [{ required: true, message: '请选择群聊', trigger: 'change' }]
}
const formRef = ref(null)
function handleSubmit() {
formRef.value.validate((valid) => {
if (valid) {
registerClue(form.value).then(() => {
message.success('提交接待信息成功')
})
} else {
console.log('表单验证失败')
return false
}
})
}
onMounted(() => {
if (route.params.id && route.params.id != 0) {
// API
getClueRemarkByRemarkId({ remarkId: route.params.id }).then((response) => {
form.value = response
})
} else {
//
window.close()
}
getWxGroupSimpleList().then((response) => {
groupOptions.value = response
})
})
</script>
<style lang="scss" scoped>
::v-deep(.remark .el-textarea__inner) {
font-size: 15px;
color: #333;
}
::v-deep(.el-card__header) {
padding: 10px;
}
</style>

@ -7,64 +7,21 @@
:rules="formRules"
label-width="80px"
>
<el-row :gutter="20">
<el-col v-if="formData.parentSource" :span="12" :offset="0">
<el-form-item label="上级来源">
<el-form-item v-if="formData.parentSource" label="上级来源">
<el-input v-model="formData.parentSource" disabled />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="来源名称" prop="sourceName">
<el-input v-model="formData.sourceName" placeholder="请输入来源名称" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="排序" prop="sort">
<el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="0"> 启用 </el-radio>
<el-radio :label="1"> 禁用 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="开户费用" prop="accountFee">
<el-input-number
v-model="formData.accountFee"
:controls="false"
style="width: 100%"
:min="0"
/>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="开户日期" prop="accountStartTime">
<el-date-picker
v-model="formData.accountStartTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期时间"
/>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="到期日期" prop="accountEndTime">
<el-date-picker
v-model="formData.accountEndTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期时间"
/>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
@ -73,64 +30,7 @@
:autosize="{ minRows: 4, maxRows: 8 }"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider direction="horizontal" content-position="left">线索成本</el-divider>
<el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
<el-table :data="formData.sourceCostVOS" border>
<el-table-column label="年份" width="120">
<template #default="{ row }">
<el-date-picker
v-model="row.year"
type="year"
placeholder="选择年份"
size="small"
format="YYYY"
value-format="YYYY"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
<el-table-column label="充值">
<template #default="{ row }">
<el-input-number
v-model="row.monthData[col - 1].rechargeFee"
size="small"
:min="0"
:controls="false"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column label="消耗">
<template #default="{ row }">
<el-input-number
v-model="row.monthData[col - 1].consumeFee"
size="small"
:controls="false"
:min="0"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column label="线索数">
<template #default="{ row }">
<el-input-number
v-model="row.monthData[col - 1].clueNum"
size="small"
:controls="false"
style="width: 100%"
:min="0"
/>
</template>
</el-table-column>
</el-table-column>
</el-table>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
@ -149,7 +49,6 @@ const formLoading = ref(false) // 表单的加载中:1)修改时的数据加
const formType = ref('') // create - update -
const formData = ref({
sourceName: '',
accountFee: undefined,
sort: 1,
remark: ''
})
@ -212,29 +111,8 @@ const resetForm = () => {
sourceName: '',
status: 0,
sort: 1,
remark: '',
costModel: 0,
sourceCostVOS: []
remark: ''
}
formRef.value?.resetFields()
}
function handleAddPrice() {
const obj = {
year: undefined,
monthData: []
}
for (let i = 1; i <= 12; i++) {
obj.monthData.push({
month: i,
consumeFee: 0,
rechargeFee: 0,
clueNum: 0
})
}
if (!formData.value.sourceCostVOS) {
formData.value.sourceCostVOS = []
}
formData.value.sourceCostVOS.push(obj)
}
</script>

@ -1,228 +0,0 @@
<template>
<div>
<el-form ref="queryForm" :model="searchForm" label-width="0" inline>
<el-form-item>
<el-input
v-model="searchForm.groupName"
placeholder="请输入群名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">搜索</el-button>
<el-button @click="resetQuery">重置</el-button>
<el-button type="primary" @click="openForm('create', null)">新增</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="tableList">
<el-table-column prop="groupName" label="群名称" />
<el-table-column label="区域负责人" prop="areaUserName" />
<el-table-column prop="remark" label="备注" />
<el-table-column label="操作">
<template #default="{ row }">
<el-button type="primary" style="padding: 0" text @click="openForm('update', row)">
修改
</el-button>
<el-button type="danger" text @click="handleDelete(row.groupId)"> 删除 </el-button>
</template>
</el-table-column>
</el-table>
<Pagination
v-model:limit="searchForm.pageSize"
v-model:page="searchForm.pageNo"
:total="total"
@pagination="getList"
/>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
<el-form
ref="formRef"
v-loading="formLoading"
:model="formData"
:rules="formRules"
label-width="100px"
>
<el-form-item label="微信群" prop="groupId">
<el-select
filterable
v-model="formData.groupId"
placeholder="请选择群聊"
:disabled="dialogType === 'update'"
style="width: 100%"
>
<el-option
v-for="item in groupOptions"
:key="item.wxGroupId"
:label="item.wxGroupName"
:value="item.wxGroupId"
/>
</el-select>
</el-form-item>
<el-form-item label="区域负责人" prop="areaUser">
<el-select v-model="formData.areaUser" placeholder="请选择" filterable multiple>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
v-model="formData.remark"
placeholder="请输入备注"
:autosize="{ minRows: 4, maxRows: 8 }"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</div>
</template>
<script setup>
import * as wxgroupApi from '@/api/clue/clueRemark'
import { getSimpleUserList as getUserOption } from '@/api/system/user'
import { getWxGroupList } from '@/api/okr/meeting'
const { t } = useI18n() //
const message = useMessage() //
const searchForm = ref({
groupName: '',
pageSize: 20,
pageNo: 1
})
const total = ref(0)
const tableList = ref([])
const loading = ref(false)
function handleQuery() {
searchForm.value.pageNo = 1
getList()
}
function resetQuery() {
searchForm.value = {
groupName: '',
pageSize: 20,
pageNo: 1
}
getList()
}
async function getList() {
loading.value = true
try {
const data = await wxgroupApi.getWxGroupPage(searchForm.value)
tableList.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const dialogType = ref('create') // create update
const formLoading = ref(false) // 12
const formData = ref({
groupId: '',
areaUser: [],
remark: ''
})
const formRules = reactive({
groupId: [{ required: true, message: '微信群不能为空', trigger: 'change' }],
areaUser: [{ required: true, message: '区域负责人不能为空', trigger: 'change' }]
})
const formRef = ref(null) // ref
const groupOptions = ref([]) //
const userOptions = ref([]) //
async function openForm(type, row) {
dialogType.value = type
dialogTitle.value = type === 'create' ? '新增报备群' : '修改报备群'
dialogVisible.value = true
resetForm()
//
if (row) {
formLoading.value = true
try {
formData.value = { ...row }
} finally {
formLoading.value = false
}
}
}
function resetForm() {
formData.value = {
groupId: '',
areaUser: [],
remark: ''
}
if (formRef.value) {
formRef.value.clearValidate()
}
}
async function handleDelete(id) {
try {
//
await message.delConfirm()
//
await wxgroupApi.deleteWxGroup(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
function submitForm() {
if (!formRef.value) return
formRef.value.validate(async (valid) => {
if (valid) {
formLoading.value = true
formData.value.groupName = groupOptions.value.find(
(item) => item.wxGroupId == formData.value.groupId
)?.wxGroupName
try {
if (dialogType.value === 'create') {
await wxgroupApi.createWxGroup(formData.value)
message.success(t('common.addSuccess'))
} else {
await wxgroupApi.updateWxGroup(formData.value)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
getList()
} finally {
formLoading.value = false
}
}
})
}
function getOptions() {
getWxGroupList().then((resp) => {
groupOptions.value = resp || []
})
//
getUserOption().then((data) => {
userOptions.value = data
})
}
onMounted(() => {
handleQuery()
getOptions()
})
</script>
<style lang="scss" scoped></style>

@ -33,10 +33,6 @@
<el-tab-pane label="其他费用项" :name="37" v-if="checkPermi(['clue:setting:other-pay'])">
<OtherPayType v-if="tabIndex == 37" />
</el-tab-pane>
<!-- 报备群设置 -->
<el-tab-pane label="报备群设置" :name="38" v-if="checkPermi(['clue:setting:remarkGroup'])">
<RemarkGroup v-if="tabIndex == 38" />
</el-tab-pane>
<el-tab-pane label="常规设置" :name="40" v-if="checkPermi(['clue:setting:general-setting'])">
<GeneralSet v-if="tabIndex == 40" :appType="appStore.getAppInfo?.instanceType" />
</el-tab-pane>
@ -58,7 +54,6 @@ import IntentionStatus from './Comp/IntentionStatus.vue'
import ExtraFeeType from './Comp/ExtraFeeType.vue'
import OtherPayType from './Comp/OtherPayType.vue'
import GeneralSet from './Comp/GeneralSet.vue'
import RemarkGroup from './Comp/RemarkGroup.vue'
import { checkPermi } from '@/utils/permission'
import { useAppStore } from '@/store/modules/app'

@ -23,9 +23,9 @@
<el-table v-loading="loading" :data="tableList" border stripe>
<el-table-column type="index" width="50" fixed="left" />
<el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
<el-table-column prop="nickname" label="姓名" width="80" />
<el-table-column
v-for="(item, index) in 12"
v-for="(item, index) in new Date().getMonth() + 1"
:key="index"
:label="item + '月'"
sortable
@ -102,6 +102,8 @@ function totalSort(pre, cur) {
}
function monthSort(pre, cur, idx) {
console.log(idx)
return (
Number(pre.monthClueSignRateReportList[idx].rate) -
Number(cur.monthClueSignRateReportList[idx].rate)

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save