931 Commits
Author SHA1 Message Date
YunaiV 66c6463f44 【修复】商城:seckill 导致打包失败的问题 2024-05-05 11:20:08 +08:00
YunaiV f4705ad4e1 【发版】全局:2.1.0 发版 2024-05-04 21:51:06 +08:00
YunaiV 143eb655b1 【发版】全局:2.1.0 发版 2024-05-04 11:14:41 +08:00
YunaiV bbf009e15d 【优化】首页增加“项目说明” 2024-05-04 11:14:11 +08:00
YunaiV ecf9052452 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-02 15:14:23 +08:00
芋道源码 869cae0675 !437 update src/views/infra/webSocket/index.vue. #434
Merge pull request !437 from AhJindeg/N/A
2024-05-02 07:14:15 +00:00
YunaiV dd36bbce42 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-02 15:04:52 +08:00
芋道源码 939ceb32ce !436 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题
Merge pull request !436 from Khalid/master
2024-05-02 07:04:38 +00:00
YunaiV e2fe04749b 【修复】商城系统:管理后台的商城订单统计数据有问题 2024-05-02 09:24:45 +08:00
YunaiV 20a9780654 【修复】商城:秒杀时段点击编辑报错 2024-05-01 20:53:01 +08:00
YunaiV f75e8d1fd4 【新增】在菜单管理中,可通过“路由地址”添加 ? 拼接参数 2024-05-01 18:47:51 +08:00
YunaiV bde5597467 【优化】结合 vite 机制,将 .env.local-dev 修改成 .env.local 2024-04-30 21:33:35 +08:00
AhJindeg de967a0160 update src/views/infra/webSocket/index.vue. #434
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2024-04-30 08:50:55 +00:00
YunaiV 9527b41b62 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-30 15:04:41 +08:00
khalidlife ff14cf90f0 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 2024-04-30 09:30:43 +08:00
YunaiV dcf66749af 【移除】stylelint.vscode-stylelint 插件的推荐,避免 vscode 样式红色波浪线 2024-04-29 22:01:59 +08:00
YunaiV 500b8632df 【优化】增加 pnpm-lock 保证大家更好的打包 2024-04-29 21:47:49 +08:00
YunaiV 730da857e1 【恢复】npm run dev 使用 local-dev 配置文件 2024-04-28 12:58:35 +08:00
芋道源码 c96902d622 !433 CRM: 修复客户导入、销售漏斗。上传组件的文件列表给拓展一个下载 。
Merge pull request !433 from puhui999/dev-crm
2024-04-28 04:52:53 +00:00
puhui999 0076236280 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-25 22:34:14 +08:00
puhui999 ae53ca6f4f feat:文件上传组件的文件列表拓展一个下载 2024-04-25 22:33:36 +08:00
puhui999 9a36d9d663 fix: import FunnelChart from echarts 2024-04-24 23:28:09 +08:00
YunaiV f55c9b7273 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-24 23:01:05 +08:00
puhui999 6ff31b90c7 CRM: 修复客户导入 2024-04-24 22:55:14 +08:00
YunaiV a0996bd0cf 【优化】移除 env 多余的 VITE_API_BASEPATH 配置项 2024-04-24 21:50:21 +08:00
YunaiV f405ac3293 【优化】新增 sslEnable 字段,支持 outlook 邮箱 2024-04-24 09:14:43 +08:00
YunaiV 2d999138ba 依赖升级:element-plus、axios 等依赖 2024-04-24 00:32:10 +08:00
YunaiV 1d533e49e4 crm:bugfix FunnelBusiness.vue 导致打包失败的问题 2024-04-24 00:31:44 +08:00
YunaiV dee479ce3c Merge remote-tracking branch 'origin/dev' into dev 2024-04-23 23:31:58 +08:00
YunaiV 715f37eb0b crm:code review 员工业绩统计 2024-04-23 23:31:52 +08:00
YunaiV 56543b8db4 Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
2024-04-23 23:17:15 +08:00
YunaiV 7f3950018e Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
# Conflicts:
#	src/api/infra/codegen/index.ts
#	src/views/system/sensitiveWord/index.vue
2024-04-23 00:28:26 +08:00
芋道源码 d26e0976db !430 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题
Merge pull request !430 from limz/bugfix-pull
2024-04-22 16:27:11 +00:00
芋道源码 95a51ce4f3 !432 fix:修复 issues 提到的一些问题
Merge pull request !432 from puhui999/dev-crm
2024-04-22 16:25:14 +00:00
YunaiV 0925253a9d 【移除】敏感词的管理,简化项目的复杂度 2024-04-22 19:52:05 +08:00
YunaiV 98bf5a102e 【移除】错误码的管理,简化项目的复杂度 2024-04-22 19:42:56 +08:00
YunaiV ff0c12c551 【移除】数据库文档,简化项目的复杂度 2024-04-22 19:13:57 +08:00
puhui999 243da124a8 fix: 调整价格弹窗不出来问题 2024-04-22 11:35:28 +08:00
puhui999 deb4585d4b fix: 适配 echarts map 的地名 2024-04-22 11:04:53 +08:00
puhui999 afdee2cd48 fix: 移除 form-crate 自带的富文本组件规则,使用 editorRule 替代 2024-04-22 10:56:16 +08:00
scholar f4dd1bed63 1, 修改数据列表无法刷新的问题;
2, 修改时间选择,后端按照年实现的,前端同样按照年份选择实现;
3,修改环比同比计算;
4,回款金额统计bug修复。
2024-04-19 17:46:09 +08:00
limingz d96f951113 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题 2024-04-18 14:45:43 +08:00
YunaiV f5d013187b crm:code review 销售漏斗 2024-04-18 09:28:07 +08:00
芋道源码 50ab864698 !428 CRM: 新增商机赢单转化率分析
Merge pull request !428 from puhui999/dev-crm
2024-04-18 01:10:12 +00:00
芋道源码 b1c832d27f !429 fix: Permissions filled in incorrectly
Merge pull request !429 from AhJindeg/hotfix/hasPermi
2024-04-18 01:08:58 +00:00
芋道源码 5ba6c5ee00 !427 修复第四个导航模式无法点开菜单的问题
Merge pull request !427 from moon69/N/A
2024-04-18 01:04:58 +00:00
AhJindeg ac6618a943 fix: 🐞 fix sensitiveWord hasPermi value 2024-04-16 18:24:56 +08:00
AhJindeg decdd1b25d fix: 🐞 fix post hasPermi value 2024-04-16 18:24:36 +08:00
AhJindeg 97c8cefb7d fix: 🐞 fix operatelog hasPermi value 2024-04-16 18:24:16 +08:00
AhJindeg bfb69ccccd fix: 🐞 fix template hasPermi value 2024-04-16 18:23:57 +08:00
AhJindeg 958ec41f4e fix: 🐞 fix loginlog hasPermi value 2024-04-16 18:23:39 +08:00
AhJindeg dc5bede084 fix: 🐞 fix fileConfig hasPermi value 2024-04-16 18:23:24 +08:00
AhJindeg 755526834e fix: 🐞 fix file hasPermi value 2024-04-16 18:23:08 +08:00
AhJindeg 221f78aa9a fix: 🐞 fix apiAccessLog hasPermi value 2024-04-16 18:22:46 +08:00
puhui999 4e640bae88 CRM: 新增商机赢单转化率分析 2024-04-15 16:38:24 +08:00
puhui999 014d1f8cd2 CRM: 新增商机赢单转化率分析 2024-04-15 16:32:48 +08:00
puhui999 6acfc77d08 CRM: 完善销售漏斗 2024-04-15 15:37:37 +08:00
moon69 033462d25f 修复第四个导航模式无法点开菜单的问题
Signed-off-by: moon69 <1016830869@qq.com>
2024-04-15 06:24:32 +00:00
YunaiV 2512253020 crm:code review 销售漏斗 2024-04-14 21:22:55 +08:00
YunaiV c331a83b74 crm:code review 销售漏斗 2024-04-14 21:21:52 +08:00
芋道源码 56829ff921 !426 CRM: 完善销售漏斗分析
Merge pull request !426 from puhui999/dev-crm
2024-04-14 12:19:51 +00:00
芋道源码 6037ac4052 !419 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !419 from dhb52/dev
2024-04-14 10:23:40 +00:00
YunaiV 1f0ef78219 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-14 18:23:04 +08:00
芋道源码 1c469300f5 !422 Infra模块>代码生成器>适配达梦数据库
Merge pull request !422 from 再见七月/infraBug-by-dm
2024-04-14 10:21:53 +00:00
YunaiV 7ba611bdb7 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-04-14 18:18:53 +08:00
芋道源码 aba61120e4 !421 fix(UserImportForm): fix a bunch of bugs
Merge pull request !421 from AhJindeg/hotfix-UserImportForm
2024-04-14 10:18:31 +00:00
YunaiV e885bf2f2a Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-04-14 18:17:53 +08:00
芋道源码 ddfa0a5a0f !424 fix:部署报错移除多余的代码
Merge pull request !424 from 李占宏/dev
2024-04-14 10:17:42 +00:00
芋道源码 855987d5fa !425 fix:部署报错移除多余的代码
Merge pull request !425 from 李占宏/dev
2024-04-14 10:14:42 +00:00
puhui999 bc95dc2959 CRM: 完善新增商机分析 2024-04-14 16:31:43 +08:00
puhui999 3c49ed570a CRM: 完善销售漏斗分析 2024-04-14 00:34:33 +08:00
zhanhong 2f0fdd1d36 fix:移除多余的代码 2024-04-13 12:39:41 +08:00
puhui999 2d7bab8adb CRM: 完善用户画像数据统计 2024-04-13 11:04:56 +08:00
YunaiV ab1c506226 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-04-12 20:37:50 +08:00
YunaiV 99addf2cfa README:移除 resilience4j 组件,增加分布式锁 2024-04-11 23:51:51 +08:00
puhui999 64af029c86 CRM: 完善用户画像数据统计 2024-04-11 15:25:48 +08:00
AhJindeg 4793897511 fix(UserImportForm): 🐞 add update formLoading and dialogVisible to submitFormSuccess 2024-04-11 11:03:06 +08:00
AhJindeg 786468f437 fix(UserImportForm): 🐞 add init updateSupport to open 2024-04-11 11:00:24 +08:00
byeJuly 1f517c3faf 修复 Infra 模块:
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因:
调整策略:删除-> autoIncrement <-字段
2024-04-10 19:33:01 +08:00
AhJindeg 4c15e6675a fix(UserImportForm): 🐞 add nextTick to resetForm 2024-04-10 18:09:43 +08:00
dhb52 5358863fc6 refactor: 统一处理null数据为'未知' 2024-04-09 18:47:31 +08:00
dhb52 0e15d6c9d2 feat: 客户成交周期分析(按区域、按产品) 2024-04-09 00:21:10 +08:00
芋道源码 f6e4753b34 !414 fix(role): add nextTick for open
Merge pull request !414 from AhJindeg/hotfix-role
2024-04-07 13:28:38 +00:00
YunaiV e8a3745b5e crm:code review 公海客户分析 2024-04-07 21:27:29 +08:00
芋道源码 091ce90359 !417 feat: 增加[客户公海分析]tab
Merge pull request !417 from dhb52/dev
2024-04-07 13:17:35 +00:00
AhJindeg b5fa188805 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into hotfix-role
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2024-04-06 14:37:34 +00:00
YunaiV 8f8edc9565 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-06 19:39:14 +08:00
dhb52 3c54f5f565 feat: 增加[客户公海分析]tab 2024-04-06 15:38:50 +08:00
dhb52 13cf1feefb refactor: 使用try finally停止loading 2024-04-06 15:38:04 +08:00
YunaiV 6772568a58 crm:code review 客户画像 2024-04-05 14:43:55 +08:00
芋道源码 8926dd1173 !415 CRM: 完善用户画像数据统计
Merge pull request !415 from puhui999/dev-crm
2024-04-05 05:54:06 +00:00
YunaiV dcfad7a427 crm:code review 员工业绩的前端 2024-04-05 13:53:14 +08:00
AhJindeg db4795744e style: 🌈 add more readable for open 2024-04-05 13:51:27 +08:00
芋道源码 f17dfb9a31 !416 CRM员工业绩统计分析v2.0
Merge pull request !416 from scholarli/dev
2024-04-05 05:45:09 +00:00
AhJindeg 7b84ddd358 perf: 🎈 add await for nextTick() 2024-04-04 18:54:51 +08:00
YunaiV 283a9d0507 【新增】system user 和 role 接入新操作日志 2024-04-04 09:57:25 +08:00
YunaiV c01571d11d 【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:21:27 +08:00
YunaiV 757281ce34 【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能 2024-04-03 19:55:54 +08:00
scholar b57a2c50a9 CRM员工业绩统计分析v2.0 2024-04-03 18:43:34 +08:00
puhui999 36385a74ba CRM: 完善用户画像数据统计 2024-04-03 12:19:09 +08:00
AhJindeg c048dcf02a fix(role): 🐞 add nextTick for open
- 增加 nextTick(),修复在权限范围为指定机构并且已选择数据时,编辑打开提示 setChecked undefined 问题
2024-04-01 16:14:30 +08:00
芋道源码 9ede8ffe4d !413 form-create-designer: 表单组件新增字典选择器和用户选择器
Merge pull request !413 from puhui999/dev-crm
2024-03-31 14:15:52 +00:00
puhui999 d16bed4ad7 form-create-designer: 表单组件新增用户选择器 2024-03-31 17:58:44 +08:00
puhui999 68dae2d1fe form-create-designer: 表单组件新增字典选择器 2024-03-30 23:18:23 +08:00
YunaiV d05c67ffaa infra:code review 表单增强 2024-03-30 21:15:01 +08:00
芋道源码 5ca3358237 !412 使用项目组件对 form-create-designer 进行增强
Merge pull request !412 from puhui999/dev-crm
2024-03-30 13:03:29 +00:00
YunaiV ffc81621d7 REPORT:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差 2024-03-30 20:41:32 +08:00
puhui999 a489d21add Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-30 18:53:30 +08:00
puhui999 bc004b3b27 使用项目组件对 form-create-designer 进行增强 2024-03-30 18:53:05 +08:00
芋道源码 52889e3504 !411 SYSTEM:修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误
Merge pull request !411 from aqiangaqiang/master
2024-03-30 07:56:52 +00:00
芋道源码 6764f86980 !409 fix(crontab): add inputChange for crontab
Merge pull request !409 from AhJindeg/hotfix-crontab
2024-03-30 07:55:47 +00:00
芋道源码 02af138069 !402 修复数据权限无法回显的问题
Merge pull request !402 from moon69/master
2024-03-30 07:50:38 +00:00
YunaiV 427c2d5d2a MALL:修复营销的商品范围枚举不正确的问题 2024-03-30 15:42:28 +08:00
YunaiV 87d1047fa9 CRM:code review【客户画像】的实现 2024-03-30 14:17:14 +08:00
YunaiV 34b788cb88 Merge branch 'dev-crm' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/bpm/definition/index.vue
#	src/views/bpm/model/index.vue
#	src/views/bpm/processInstance/create/index.vue
#	src/views/crm/statistics/customer/index.vue
2024-03-30 12:54:51 +08:00
YunaiV 291dc51849 CRM:完善【排行版】功能 2024-03-30 11:48:41 +08:00
YunaiV 1b7d604858 CRM:code review【客户统计】的代码实现 2024-03-30 11:02:29 +08:00
YunaiV b51397fe19 CRM:优化【客户统计】的代码实现 2024-03-30 09:23:02 +08:00
sunva 68e1556378 SYSTEM:修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误 2024-03-29 17:06:56 +08:00
YunaiV 23150fcfc3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	package.json
2024-03-28 19:30:02 +08:00
芋道源码 1f14bf4bda !404 feat: [CRM-客户分析]增加[时间间隔]选项
Merge pull request !404 from dhb52/dev
2024-03-28 11:18:52 +00:00
YunaiV b4677c4546 README:增加功能图,方便理解 2024-03-27 21:23:21 +08:00
YunaiV 9f3bc1ead8 BPM:修复 bpmnxml 为空时,展示的 key 被覆盖的问题 2024-03-27 18:51:06 +08:00
YunaiV 607c2b6c4a BPM:完善文档说明 2024-03-27 09:41:00 +08:00
puhui999 3820710c56 二次封装 form-create 组件,使用项目重新封装的文件上传组件实现文件上载 2024-03-26 10:59:03 +08:00
puhui999 cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2024-03-24 22:22:09 +08:00
YunaiV 77971f9c96 Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-03-24 10:47:04 +08:00
YunaiV 624594bb5c BPM:处理打开 bpmn 设计器时,key 和 name 覆盖更新 2024-03-24 10:46:37 +08:00
YunaiV eed7bb2e1a BPM:流程模型的 icon 维护 2024-03-24 10:08:59 +08:00
YunaiV cc14963bc8 BPM:增加流程表达式的管理 2024-03-23 21:12:09 +08:00
YunaiV 7218e71884 BPM:增加任务监听器、执行监听器的管理 2024-03-23 19:23:19 +08:00
YunaiV faf4557783 BPM:增加任务监听器、执行监听器的管理 2024-03-23 15:58:38 +08:00
YunaiV 728cf15c45 BPM:增加「发起人自选」的任务审批人的分配策略 2024-03-23 00:54:33 +08:00
YunaiV 48f6624737 BPM:新增【流程任务】菜单,用于全部流程任务的查询 2024-03-22 09:07:04 +08:00
YunaiV 5286ad1cd6 BPM:新增【流程实例】菜单,用于全部流程实例的查询 2024-03-22 08:26:26 +08:00
jason ee12e691be 暂时去掉原有设计器的审批人设置, 避免缺少资源报错。后续需要改造 2024-03-21 21:14:16 +08:00
AhJindeg c2f98043df fix: 🐞 add inputChange for crontab 2024-03-21 17:20:01 +08:00
YunaiV 05b408d107 BPM:新增流程的重新发起 2024-03-21 00:34:10 +08:00
jason 0d4b6f6344 流程模型中增加仿钉钉设计器入口 2024-03-20 22:26:35 +08:00
jason 07dc725857 整合仿钉钉流程设计器 https://github.com/StavinLi/Workflow-Vue3 2024-03-20 22:26:35 +08:00
YunaiV d16194b794 BPM:优化 task 审批详情界面,增加开始时间、结束时间的展示 2024-03-20 21:33:48 +08:00
YunaiV d0f73344bf BPM:增强 model 流程模型部署时,各种参数校验 2024-03-20 18:51:49 +08:00
YunaiV 08dd4ed072 BPM:支持多表单,每个流程任务都可以绑定流程表单 2024-03-20 12:50:59 +08:00
YunaiV 501a1c2f4d BPM:新增流程分类表,替代现有的 bpm_category 数据字典 2024-03-19 19:49:52 +08:00
YunaiV a0f157c8b6 BPM:简化 userGroup 的实现 2024-03-19 12:13:54 +08:00
YunaiV 2d424fc9a6 BPM:优化 task 加减签的实现 2024-03-19 01:31:51 +08:00
YunaiV a40866e27f BPM:完善 task 转派的实现 2024-03-18 20:45:39 +08:00
YunaiV 60ddc45b9b BPM:增加 task 的审批建议 2024-03-18 18:41:11 +08:00
YunaiV 03b8bd5e22 BPM:调整抄送逻辑的实现,改成审批通过、不通过时,可选择抄送 2024-03-17 22:14:28 +08:00
YunaiV de29528165 BPM:简化 task 接口的 VO,做一些合并。虽然字段上有冗余,但是读代码难度降低 2024-03-17 17:25:40 +08:00
芋道源码 6b45ed7e78 !406 适配顶部导航
Merge pull request !406 from 疯狂的世界/dev
2024-03-17 01:25:50 +00:00
YunaiV 59c7c49efa BPM:流程实例的 status 状态实现,使用 Flowable 的 variables 存储,移除 bpm_process_instance_ext 表 2024-03-16 16:43:47 +08:00
YunaiV 33d59c8b7d BPM:新增顺序会签、或签的能力 2024-03-16 00:05:58 +08:00
YunaiV 5f7ccd4e7c BPM:重构流程分配人的实现,通过 BpmTaskCandidateStrategy 策略模式 2024-03-15 00:19:23 +08:00
YunaiV 960f27f6ef BPM:新增 flowable expression 表达式,替代现有 BpmTaskAssignScript,更加灵活 2024-03-14 12:54:28 +08:00
owen aa57d89bea Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 00:13:58 +08:00
owen c5b1ad480f 适配顶部导航 2024-03-14 00:13:40 +08:00
YunaiV feadd022e7 BPM:重构审批人的分配规则实现,移除 bpm_task_assign_rule 表,存储在 bpmn 的 userTask 中 2024-03-13 21:18:26 +08:00
moon69 4c0a5e8c30 修复数据权限无法回显的问题 2024-03-10 11:59:49 +08:00
dhb52 b0d4c87d8e feat: [CRM-客户分析]增加[时间间隔]选项 2024-03-10 10:30:32 +08:00
芋道源码 1a0f0a11b1 !403 CRM:完善转移
Merge pull request !403 from puhui999/dev-crm
2024-03-09 10:35:39 +00:00
puhui999 d21c060903 CRM:完善转移 2024-03-09 17:57:24 +08:00
moon69 0230a4af01 修复数据权限无法回显的问题 2024-03-09 17:38:56 +08:00
芋道源码 2ed41ab164 !401 build(package): add prettier-eslint@16.3.0 #392
Merge pull request !401 from AhJindeg/N/A
2024-03-09 09:00:46 +00:00
YunaiV c89941d435 CRM:code review 客户总量统计 2024-03-09 16:51:42 +08:00
芋道源码 55856be1de !394 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !394 from dhb52/dev
2024-03-09 08:37:59 +00:00
芋道源码 a6e29c5615 !400 fix(LoginForm): update doSocialLogin
Merge pull request !400 from AhJindeg/dev
2024-03-09 07:35:04 +00:00
芋道源码 ecf9f26547 !398 删除重复的 pagination 事件
Merge pull request !398 from moon69/master
2024-03-09 07:34:06 +00:00
芋道源码 4dabfcba23 !399 CRM:完善数据权限,实现数据权限同时添加、同时转移
Merge pull request !399 from puhui999/dev-crm
2024-03-09 07:21:16 +00:00
AhJindeg 53c63ba68f build(package): 🔧 add prettier-eslint@16.3.0 #392
修复 settings.json 文件中设置格式化插件 rvest.vs-code-prettier-eslint 未生效问题。

Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2024-03-07 07:42:59 +00:00
AhJindeg 2d4ed85e94 fix(LoginForm): 🐞 update doSocialLogin
- 修复手动填写租户名称时,点击取消按钮,登录按钮 loading 状态未取消,并且会继续执行 LoginApi.socialAuthRedirect 方法
2024-03-07 14:38:31 +08:00
dhb52 470c5076a3 fix: 合同摘要信息(客户转化率页面) api 地址错误 2024-03-05 23:16:57 +08:00
dhb52 762b51a5b4 fix: [CRM-客户统计]根据Code-Review 修改 2024-03-04 23:51:42 +08:00
puhui999 13e925e29f CRM:完善数据权限,实现数据权限同时添加、同时转移 2024-03-03 20:11:52 +08:00
moon69 e4e37d0cb4 删除重复的 pagination 事件 2024-03-03 16:18:53 +08:00
puhui999 3660cd26ae CRM: 完善回款合同回款计划编辑合同回显 2024-03-02 23:38:13 +08:00
puhui999 a31c995508 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-02 23:26:26 +08:00
YunaiV 6f38676af7 🎉 2.0.1 版本发布! 2024-03-01 20:58:05 +08:00
YunaiV 9ea698e86c bugfix:暂时去掉 VITE_CJS_IGNORE_WARNING 变量,解决 Windows 无法启动的问题 2024-03-01 12:44:33 +08:00
YunaiV 9b0890d195 1. 忽略 VITE_CJS_IGNORE_WARNING 告警
2. 忽略 @unocss/order 和 @unocss/order-attributify 告警
3. 修复 https 配置项的告警
2024-03-01 01:05:03 +08:00
YunaiV ff0566bb7f 2024-02-06 fix: 修复Menu组件缩略菜单弹窗内样式不统一问题 2024-03-01 00:14:23 +08:00
dhb52 d0501ee0a6 feat: CRM/数据统计/员工客户分析 初稿 2024-03-01 00:10:38 +08:00
YunaiV db106834a7 bugfix 修复子菜单选中时,父菜单也高亮的问题 2024-02-29 23:37:25 +08:00
YunaiV 3be088e370 2023-11-29 feat: 持久化缓存 2024-02-29 23:14:47 +08:00
YunaiV 8f14355903 升级 element plus 到 2.5.3! 2024-02-29 23:05:14 +08:00
YunaiV 74a66b7c70 Merge remote-tracking branch 'origin/master' 2024-02-29 22:42:53 +08:00
YunaiV 1bc4eefeab 修复记住密码失效的问题 2024-02-29 22:42:10 +08:00
YunaiV 560a336f8c 修复用户退出登录时,把 LANG、THEME、LAYOUT、IS_DARK 给清空的问题 2024-02-29 22:23:10 +08:00
dhb52 3ddba81e24 Merge remote-tracking branch 'yudao/dev' into dev 2024-02-29 21:03:19 +08:00
芋道源码 9a4d1dcbce !397 修正校验文本错误
Merge pull request !397 from moon69/N/A
2024-02-29 12:48:41 +00:00
YunaiV f413556c73 ✨ 2023-08-10:style: 修改TabMenu样式 2024-02-29 20:06:03 +08:00
YunaiV 8d23c38f2f ✨ 2023-06-25:style: 移除不必要样式 2024-02-29 19:49:28 +08:00
YunaiV fe61119735 ✨ 2023-06-25:perf: ImageViewer组件优化 2024-02-29 19:39:58 +08:00
YunaiV d884f71d57 ✨ 2023-06-25:perf: 优化锁屏组件 2024-02-29 19:34:04 +08:00
YunaiV f8580fdf2a ✨ 2023-05-10:feat: 新增锁屏功能 2024-02-29 18:52:46 +08:00
moon69 ca8858a33f 修正校验文本错误
Signed-off-by: moon69 <1016830869@qq.com>
2024-02-29 05:40:40 +00:00
YunaiV 4e39c11d7c ✨ 升级 vite 等相关的依赖 2024-02-29 08:46:46 +08:00
YunaiV 4231a7d133 2023年06月15日:fix: expand clickable area of collapse-icon 2024-02-29 00:10:24 +08:00
YunaiV aebb04a7c2 2023年06月01日:ContentWrap 支持 header 区域 2024-02-29 00:08:44 +08:00
YunaiV 1a5e7902b8 Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 23:07:45 +08:00
芋道源码 8d88f4206b !395 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子
Merge pull request !395 from puhui999/dev-crm
2024-02-28 15:01:45 +00:00
芋道源码 035bccb472 !396 修复:回款管理-编辑:不显示合同名称
Merge pull request !396 from 李占宏/dev
2024-02-28 14:48:45 +00:00
puhui999 c9d5ec26a2 fix: 主子表 demo03 List props 2024-02-28 09:35:12 +08:00
dhb52 441b91381f feat: CRM/数据统计/客户总量分析 2024-02-27 23:45:13 +08:00
zhanhong 776846febc 修复:回款管理-编辑:不显示合同名称 2024-02-27 23:38:58 +08:00
puhui999 1694827c6c Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-02-27 23:36:16 +08:00
puhui999 32d5892422 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子 2024-02-27 23:34:32 +08:00
dhb52 0db264dcac Merge remote-tracking branch 'yudao/dev' into dev 2024-02-27 21:42:40 +08:00
dhb52 9e86e47c1c !391 perf: utils/formatDate.ts更好的ts类型
* perf: utils/formatDate.ts更好的ts类型
2024-02-27 12:36:49 +00:00
YunaiV c0eaad3a4b ✨ 完善 MALL、CRM、ERP 文档说明 2024-02-26 21:12:31 +08:00
YunaiV 249fe126ee ✨ 完善 MALL、CRM、ERP 文档说明 2024-02-26 20:23:14 +08:00
YunaiV c792e69aa5 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-02-26 12:24:57 +08:00
YunaiV d220ffae6a ✨ CRM:增加回款的待办事项逻辑 2024-02-26 12:24:47 +08:00
dhb52 783f6283ca Merge remote-tracking branch 'yudao/dev' into dev 2024-02-25 21:07:23 +08:00
YunaiV 154f84a89e ✨ CRM:完善合同的待回款金额 2024-02-25 20:50:30 +08:00
YunaiV 25665f548e ✨ CRM:完善回款在合同、客户的引入 2024-02-25 20:23:10 +08:00
YunaiV c5e5228e78 ✨ CRM:完善回款的详情 2024-02-25 19:34:52 +08:00
YunaiV 5369328b37 ✨ CRM:完善回款的新增/修改 2024-02-25 18:44:19 +08:00
YunaiV 70bf234133 ✨ CRM:完善回款列表 2024-02-25 16:52:07 +08:00
YunaiV 56d92e5bfb ✨ CRM:完善回款 plan 新增/修改 2024-02-25 16:09:22 +08:00
YunaiV fee444d191 ✨ CRM:完善回款 plan 详情 2024-02-25 12:33:01 +08:00
YunaiV 5cb86589c6 ✨ CRM:完善回款 plan 列表 2024-02-25 09:23:36 +08:00
芋道源码 f30f71b775 !393 CRM:完善回款
Merge pull request !393 from puhui999/dev-crm
2024-02-25 00:15:58 +00:00
puhui999 174724da98 CRM:完善回款集成客户详情和合同详情 2024-02-25 02:10:21 +08:00
puhui999 d9e1ffd522 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-02-25 00:40:49 +08:00
puhui999 41e5cf667e CRM:完善回款 2024-02-25 00:35:50 +08:00
puhui999 6725318f27 CRM:完善回款计划 2024-02-24 23:01:29 +08:00
YunaiV 12972cdf5c ✨ CRM:将 bi 调整成 statistics 2024-02-24 22:26:10 +08:00
YunaiV dcfe1abb67 ✨ CRM:增加商机关联联系人 2024-02-24 19:35:24 +08:00
YunaiV 6caa94ec47 ✨ CRM:待办事项(接入合同) 2024-02-24 17:55:34 +08:00
YunaiV 8f8591fc45 ✨ CRM:增加合同配置表 2024-02-24 16:51:25 +08:00
YunaiV 43bdb3cdba ✨ CRM:商机接入合同列表 2024-02-24 16:08:00 +08:00
YunaiV 7164ae5d49 ✨ CRM:完善 CRM 跟进记录(联系人的展示、添加) 2024-02-24 15:46:36 +08:00
YunaiV 28eb23738c ✨ CRM:完善 CRM 跟进记录(商机的展示、添加) 2024-02-24 15:19:03 +08:00
YunaiV a9e4ef9b7b ✨ CRM:完善 CRM 相关实现(产品) 2024-02-24 09:50:35 +08:00
YunaiV 56db6bf307 ✨ CRM:完善 CRM 相关实现 2024-02-24 08:18:36 +08:00
YunaiV c1f507bcae ✨ CRM:完善合同的审批逻辑 2024-02-23 12:58:39 +08:00
YunaiV 9acd01e768 ✨ CRM:完善合同的跟进记录实现 2024-02-23 09:31:48 +08:00
YunaiV 3bfdb2df33 ✨ CRM:完善合同的新增、修改需求 2024-02-23 00:20:14 +08:00
YunaiV 9d44b9acaa ✨ CRM:完善合同的新增、修改需求 2024-02-23 00:06:03 +08:00
YunaiV 11766f5107 ✨ CRM:完善合同的列表实现 2024-02-22 21:53:39 +08:00
YunaiV bbf6c16b8d ✨ CRM:完成商机状态的变更 2024-02-22 20:41:37 +08:00
YunaiV cf7036d34b ✨ CRM:完善商机产品的展示列表 2024-02-22 12:45:15 +08:00
YunaiV 8512fe6b43 ✨ CRM:完善商机和联系人之间的关联 2024-02-22 09:35:35 +08:00
YunaiV 01684aa6e8 ✨ CRM:完善商机的详情、跟进记录、操作日志、团队成员 2024-02-22 08:32:07 +08:00
YunaiV 29605800b5 ✨ CRM:完善商机的新增、修改逻辑 2024-02-21 21:49:55 +08:00
YunaiV 6baeadc87a ✨ CRM:完善商机状态的实现 2024-02-21 21:13:30 +08:00
YunaiV a2443e48f7 ✨ CRM:完善商机的列表 2024-02-21 18:44:54 +08:00
YunaiV 08bb022cb5 ✨ CRM:完善联系人的编辑、详情 2024-02-20 23:31:52 +08:00
YunaiV 094b1925d6 ✨ CRM:完善联系人的列表 2024-02-20 21:18:38 +08:00
YunaiV a401fff74c ✨ CRM:完成客户的分配接入 2024-02-20 20:19:11 +08:00
YunaiV 4362251b59 ✨ CRM:优化客户的详情、更新成交状态 2024-02-20 12:55:33 +08:00
YunaiV ac9a77e6e4 ✨ CRM:优化客户的列表、编辑的样式 2024-02-20 09:35:48 +08:00
YunaiV 04a42bc6d4 📖 CRM:线索的跟进逻辑 2024-02-19 22:47:35 +08:00
YunaiV 0ae6139e92 📖 CRM:线索的转化逻辑 2024-02-19 20:40:37 +08:00
YunaiV 1047c5b097 📖 CRM:线索 clue 新增/修改的完善 2024-02-19 19:02:03 +08:00
YunaiV e7bb17dc4e 📖 CRM:线索 clue 列表的完善 2024-02-19 13:02:48 +08:00
芋道源码 c804ec5e7a !387 feat: CRM/backlog 提醒数量
Merge pull request !387 from dhb52/crm-msg
2024-02-18 13:49:08 +00:00
YunaiV f5b8d92d97 Merge remote-tracking branch 'origin/master' 2024-02-18 20:58:30 +08:00
YunaiV f01bb2dc78 🐛 bugfix:无法打包问题,原因:import clone 从 unocss 导致 2024-02-18 20:58:01 +08:00
YunaiV cd86c08e59 📖 ERP:增加 ERP 首页的统计 2024-02-18 19:05:57 +08:00
dhb52 e067d5073d feat: CRM/backlog 提醒数量 2024-02-18 00:04:43 +08:00
dhb52 42b8df4767 refactor: 清理【待回款提醒】页面代码 2024-02-18 00:04:15 +08:00
芋道源码 ea68da9d8e !386 ✨ 2.0.1 版本发布准备
Merge pull request !386 from 芋道源码/dev
2024-02-17 13:52:47 +00:00
YunaiV 71ac59f22e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-02-17 20:41:43 +08:00
芋道源码 a3b21e70dc !375 修复权限范围默认展开,deptExpand 却默认折叠的问题
Merge pull request !375 from moon69/N/A
2024-02-17 12:41:36 +00:00
芋道源码 1549a57c4b !385 fix: 用户头像、昵称修改,同步更新Layout/UserInfo
Merge pull request !385 from dhb52/hotfix/dhb52/avatarupdate
2024-02-17 12:37:34 +00:00
YunaiV d3fab9a0fd 📖 CRM:code review 前端直接上传 2024-02-17 20:35:35 +08:00
芋道源码 ffeaa891df !382 基础设施:前端直连上传文件
Merge pull request !382 from 疯狂的世界/dev
2024-02-17 11:34:00 +00:00
dhb52 a3e95b56ca fix: 用户头像、昵称修改 2024-02-17 19:19:51 +08:00
芋道源码 b603515855 !383 新增:CRM 商业智能,其他排名接口
Merge pull request !383 from 安浩浩/dev
2024-02-17 10:03:59 +00:00
YunaiV 06e2019adf 📖 CRM:code review 待办项目的实现 2024-02-17 18:02:40 +08:00
YunaiV 2f37232f5e Merge remote-tracking branch 'origin/dev' into dev 2024-02-17 16:45:08 +08:00
YunaiV 6e9e9e88a8 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-02-17 16:44:59 +08:00
芋道源码 a0497a6485 !384 feat: 待回款提醒,即将到期的合同,待审核回款
Merge pull request !384 from dhb52/crm-msg
2024-02-17 08:43:34 +00:00
芋道源码 96071bdcb7 !379 【轻PR】label错误
Merge pull request !379 from NiceShow/master
2024-02-17 08:41:07 +00:00
YunaiV 8d532dfc3a ✨ 默认开启文档地址 2024-02-17 11:50:30 +08:00
芋道源码 a451c0b7c8 !311 修复DocAlert无法配置是否启用的问题
Merge pull request !311 from dhb52/master
2024-02-17 03:45:58 +00:00
芋道源码 6fd8856735 !371 update src/types/descriptions.d.ts.
Merge pull request !371 from AKING/N/A
2024-02-17 02:19:54 +00:00
芋道源码 2a1e6518e2 !372 update src/components/Descriptions/src/Descriptions.vue.
Merge pull request !372 from AKING/N/A
2024-02-17 02:19:34 +00:00
YunaiV bb6d6dac79 ✨ 增加 ERP 系统的介绍 2024-02-17 10:12:01 +08:00
dhb52 c1c48c20a3 refactor: TodayCustomer利用CustomerApi 2024-02-16 22:38:06 +08:00
YunaiV c18b24e611 ✨ ERP:初始化 receipt 收款单的逻辑 100% 2024-02-16 08:13:25 +08:00
YunaiV e07e19106c ✨ ERP:销售订单的 receiptPrice 调整,为接入财务的收款单做准备 2024-02-15 09:16:18 +08:00
dhb52 a2de0665eb fix: Backlog侧边栏样式黑暗模式显示问题 2024-02-14 23:28:25 +08:00
YunaiV e951ed1bd1 ✨ ERP:完成 payment 付款单的逻辑 100% 2024-02-14 17:13:55 +08:00
YunaiV 8a70b3fbba ✨ ERP:付款单 60%(接入)【可付款的采购入库单列表】 2024-02-14 15:20:17 +08:00
YunaiV d7427bf49c ✨ ERP:付款单 50%(详情) 2024-02-14 11:25:55 +08:00
YunaiV aa964e17d6 ✨ ERP:付款单 30%(列表) 2024-02-14 08:39:50 +08:00
YunaiV 58972e0b98 ✨ ERP:采购订单的 paymentPrice 调整,为接入财务的付款单做准备 2024-02-13 14:33:09 +08:00
YunaiV fcba2b4c48 ✨ ERP:采购退货 100% 2024-02-12 21:06:46 +08:00
YunaiV db446330c3 ✨ ERP:采购退货 70%(详情) 2024-02-12 21:03:29 +08:00
YunaiV ee35056767 ✨ ERP:采购退货 50%(列表) 2024-02-12 20:54:50 +08:00
YunaiV 57044cb716 ✨ ERP:采购入库 100% 2024-02-12 16:51:18 +08:00
YunaiV 3d4feeff6b ✨ ERP:采购入库 50% 2024-02-12 11:28:16 +08:00
YunaiV 5339cca40e ✨ ERP:基本完成采购订单 100% 2024-02-12 10:00:09 +08:00
YunaiV 600892b112 ✨ ERP:初始化采购订单 50% 2024-02-12 08:56:25 +08:00
YunaiV eae2ea0a82 ✨ ERP:初始化销售退货逻辑 100% 2024-02-12 06:52:24 +08:00
YunaiV 3860aaef6f ✨ ERP:初始化销售退货逻辑 70%(详情) 2024-02-12 06:29:03 +08:00
YunaiV 949096f776 ✨ ERP:初始化销售退货逻辑 50% 2024-02-12 06:20:56 +08:00
YunaiV 5736083534 ✨ ERP:基本完成销售入库模块 2024-02-11 22:13:02 +08:00
YunaiV 00a386dd7c ✨ ERP:增加 ERP 销售出库的编辑界面 2024-02-11 16:12:12 +08:00
YunaiV c0db4df880 ✨ ERP:增加 ERP 可出库订单列表 2024-02-11 10:33:27 +08:00
YunaiV e535384f45 ✨ ERP:增加 ERP 销售出库的实现 30%(列表) 2024-02-10 22:47:14 +08:00
YunaiV f7c5266015 ✨ ERP:增加 ERP 销售订单的实现 90% 2024-02-10 21:48:15 +08:00
YunaiV b25d9c0f09 ✨ ERP:增加结算账户 100% 2024-02-10 08:32:34 +08:00
YunaiV 5deabcf692 ✨ ERP:增加 ERP 销售订单的实现 60%(详情) 2024-02-10 00:50:56 +08:00
YunaiV ab63660bf8 ✨ ERP:增加 ERP 销售订单的实现 50%(详情)
新年快乐~
2024-02-10 00:07:00 +08:00
YunaiV 2615054fb2 ✨ ERP:增加 ERP 销售订单的实现 40%(列表) 2024-02-09 21:56:01 +08:00
YunaiV b55c8417fb ✨ ERP:增加 ERP 销售订单的实现 30% 2024-02-09 20:20:15 +08:00
YunaiV 14ab46c870 ✨ ERP:增加 ERP 盘点单的实现 100% 2024-02-08 09:06:24 +08:00
YunaiV 0319056e4b ✨ ERP:增加 ERP 盘点单的实现 50% 2024-02-08 08:36:20 +08:00
dhb52 ae3d44d8bd feat: 待回款提醒,即将到期的合同,待审核回款 2024-02-07 23:52:46 +08:00
YunaiV 3c4932bc77 ✨ ERP:增加 ERP 调拨单的实现 100% 2024-02-07 20:48:20 +08:00
YunaiV 896f9758ed ✨ ERP:增加 ERP 客户的实现 2024-02-07 15:41:07 +08:00
YunaiV 616fd3f7ba ✨ ERP:初始化其它出库的实现 2024-02-07 15:00:47 +08:00
YunaiV 318d5261ad ✨ ERP:增加金额计算的四舍五入 2024-02-07 12:29:34 +08:00
YunaiV 3308a494c7 ✨ ERP:增加金额计算的四舍五入 2024-02-07 10:34:32 +08:00
YunaiV 1c98deaf27 ✨ ERP:增加入库单号的自动生成 2024-02-07 00:37:51 +08:00
YunaiV 115c30ea40 ✨ ERP:增加入库单的审批功能 2024-02-06 23:28:48 +08:00
dhb52 361c06bd6f feat: crm-backlog 待审核合同 2024-02-06 22:58:33 +08:00
YunaiV 5bdf0fc0ff ✨ ERP:增加供应商的实现 2024-02-06 18:00:08 +08:00
YunaiV 9cbdfe0ecb ✨ ERP:初始化其它入库的表单 50% 2024-02-06 15:58:25 +08:00
YunaiV 53c94af027 ✨ ERP:初始化其它入库的表单 40% 2024-02-06 12:44:39 +08:00
YunaiV d92404f351 ✨ ERP:初始化其它入库的表单 20% 2024-02-06 00:56:43 +08:00
YunaiV 26343635e4 ✨ ERP:完成 stock 产品库存、库存明细的实现 2024-02-05 19:24:26 +08:00
YunaiV 6d9ca290b3 ✨ ERP:完成 stock 仓库信息的实现 2024-02-05 01:36:24 +08:00
YunaiV 36a0330277 ✨ ERP:完成 product 信息、分类、单位的实现 2024-02-05 00:15:40 +08:00
安浩浩 3cdcd67a6a 新增:CRM 商业智能,其他排名接口 2024-02-04 23:55:26 +08:00
dhb52 e033793a94 Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-02-04 22:27:37 +08:00
owen 89fdb5ced9 基础设施:前端直连上传,优先使用自定义域名 2024-02-04 20:57:05 +08:00
YunaiV ce9317e3d0 ✨ ERP:初始化 product 信息、分类、单位的实现 2024-02-04 19:57:56 +08:00
owen dd08fbcb46 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 19:42:14 +08:00
owen 490bb901e1 基础设施:增加前端直连上传文件到S3服务的功能 2024-02-04 19:41:48 +08:00
YunaiV cac39ae126 CRM:优化合同列的新增/修改界面 2024-02-04 12:57:39 +08:00
YunaiV 6d0231d409 CRM:优化合同列表界面 2024-02-04 12:10:49 +08:00
YunaiV 3ad68c3227 CRM:合同的 code review 2024-02-04 09:48:44 +08:00
芋道源码 fffc9aed63 !381 CRM-合同:完善 TODO
Merge pull request !381 from puhui999/dev-crm
2024-02-04 01:42:52 +00:00
puhui999 fe91c5ec5c CRM:transfer 2024-02-03 22:17:45 +08:00
puhui999 6d0e242387 CRM-合同:完善 TODO 2024-02-03 20:47:50 +08:00
YunaiV 4549f8ed3c CRM:优化合同金额排行、回款金额排行 2024-02-03 01:14:24 +08:00
芋道源码 d6438943b8 !380 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改
Merge pull request !380 from 安浩浩/dev
2024-02-02 15:49:13 +00:00
YunaiV 956f19d9d0 CRM:合同的 code review 2024-02-01 13:38:14 +08:00
安浩浩 34a796de89 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改 2024-01-31 23:37:21 +08:00
dhb52 9d9cdf427a Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-30 23:33:49 +08:00
芋道源码 a5f8c3d79c !376 完善客户导入,统一日志获取接口
Merge pull request !376 from puhui999/dev-crm
2024-01-30 04:42:33 +00:00
芋道源码 4271788a83 !377 feat: CRM-backlog-待进入公海的客户
Merge pull request !377 from dhb52/crm-msg
2024-01-30 04:10:25 +00:00
芋道源码 f0a2c529b2 !378 新增:商业智能-排行榜,合同金额排行和回款金额排行
Merge pull request !378 from 安浩浩/dev
2024-01-30 01:34:09 +00:00
NiceShow df7806d8d3 fix: label错误-砍价商品 2024-01-29 15:45:45 +08:00
anhaohao 770e551900 新增:商业智能-排行榜,合同金额排行和回款金额排行 2024-01-28 20:04:42 +08:00
puhui999 41195d5b4a CRM-合同:新增合同预览审批流程和提交审核 2024-01-28 16:33:06 +08:00
puhui999 668da2fa86 CRM-合同:新增合同详情 2024-01-28 01:32:49 +08:00
puhui999 90e0baf5bc CRM-合同:完善合同表单 2024-01-27 23:43:30 +08:00
dhb52 4a2349ecf5 feat: CRM-backlog-待进入公海的客户 2024-01-27 23:42:13 +08:00
puhui999 331b6c5611 CRM-合同:完善合同表单 2024-01-27 23:18:52 +08:00
puhui999 ed94205fa7 CRM-合同:完善合同表单 2024-01-27 23:11:43 +08:00
puhui999 a64d4240a3 CRM-联系人:完善联系人转移、数据权限 2024-01-27 17:03:07 +08:00
puhui999 5adf75d15b CRM:统一日志获取接口 2024-01-27 15:15:07 +08:00
puhui999 26daa3a1ff CRM-客户:完善客户导入 2024-01-27 15:02:25 +08:00
moon69 6203744272 修复权限范围默认展开,deptExpand 却默认折叠的问题
Signed-off-by: moon69 <1016830869@qq.com>
2024-01-26 15:40:24 +00:00
dhb52 acc3a6bcfd fix: warning UnoCSS utilities are not ordered 2024-01-26 21:54:17 +08:00
YunaiV a0ce1f3a5b 🔥 2.0.0 版本发布! 2024-01-26 21:53:59 +08:00
芋道源码 10a5d4d265 !373 update src/permission.ts.
Merge pull request !373 from AKING/N/A
2024-01-26 13:45:59 +00:00
dhb52 b3ed46db72 Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-26 21:41:14 +08:00
AKING 024d08555b update src/permission.ts.
解决了跳转不带参数的问题

Signed-off-by: AKING <2734339436@qq.com>
2024-01-24 02:44:33 +00:00
YunaiV 64cfcbf6e0 Merge branch 'crm-msg' of https://gitee.com/dhb52/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/backlog/tables/TodayCustomer.vue
2024-01-22 09:45:23 +08:00
AKING 24062c7a3b update src/components/Descriptions/src/Descriptions.vue.
字段映射的功能点添加,已测

Signed-off-by: AKING <2734339436@qq.com>
2024-01-22 01:41:37 +00:00
AKING 530107eba7 update src/types/descriptions.d.ts.
此处添加了字段映射字段,方便在description在展示的时候减少slot的使用使用方式如下

// 确认人 confirmUser
  {
    label: '确认人',
    field: 'confirmUser',
    minWidth: 120,
    isForm: false,
    isDetail: true,
    detail: {
      mappedField: 'confirmUserName'
    }
  },

Signed-off-by: AKING <2734339436@qq.com>
2024-01-22 01:40:08 +00:00
芋道源码 bc934f56ad !370 CRM线索
Merge pull request !370 from Minh-X/dev
2024-01-22 01:36:44 +00:00
YunaiV 66ff10d00c CRM:code review 跟进记录, 2024-01-22 09:35:59 +08:00
芋道源码 213af427a2 !366 fix: 修复 CRM 的一些 bug
Merge pull request !366 from puhui999/dev-crm
2024-01-22 01:20:02 +00:00
min e0bc3ea6dc CRM:线索创建时增加负责人选择框 2024-01-21 18:58:48 +08:00
min 3471b5c5b2 CRM:线索表单去掉客户字段 2024-01-21 17:54:07 +08:00
dhb52 c38bbb99a1 refactor: 提取公共选项定义 2024-01-21 12:47:12 +08:00
dhb52 7c0c651592 feat: backlog 分配给我的线索、客户 2024-01-20 23:08:27 +08:00
puhui999 d735f782fc fix: 修复 CRM 的一些 bug 2024-01-20 22:46:52 +08:00
dhb52 24e8bd4c47 Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-20 22:06:16 +08:00
puhui999 9628517b8b CRM: 跟进组件完善 2024-01-20 18:56:24 +08:00
puhui999 f88b26e3c3 多图上传组件优化 2024-01-20 17:31:10 +08:00
YunaiV 948ef08533 ✨ PAY:增加钱包、微信条码支付的渠道配置界面 2024-01-18 23:40:38 +08:00
YunaiV bf3e051d74 BPM:抄送任务的 code review 2024-01-18 19:07:12 +08:00
YunaiV 49a806a6f9 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-01-18 12:47:44 +08:00
YunaiV 2dcd131097 ✨ 调整启动命令,恢复 npm run dev;如果要连接远程服务 2024-01-18 12:47:23 +08:00
芋道源码 d852103929 !365 流程增加抄送功能
Merge pull request !365 from 云开/feature/BPM_CC
2024-01-18 04:46:09 +00:00
kyle 2c9393702d feat: 新增流程抄送 2024-01-17 09:40:05 +08:00
dhb52 040b80b35f wip: CRM-代办消息-添加其他页面草稿 2024-01-15 22:45:42 +08:00
dhb52 48693b50f2 wip: CRM-代办消息-修改模块为backlog 2024-01-15 22:45:12 +08:00
dhb52 39da43cc7d Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-15 21:48:32 +08:00
YunaiV 9fa769b16a 📖 CRM:跟进记录的 code review 2024-01-15 21:30:25 +08:00
芋道源码 163613e90c !363 crm:新增跟进组件、转移表单组件封装,完善按钮数据权限控制、客户公海抽离
Merge pull request !363 from puhui999/dev-crm
2024-01-15 04:36:13 +00:00
YunaiV 1e70a1d57e 📖 CRM:待办事项的 code review 2024-01-15 12:15:59 +08:00
芋道源码 68fc1760a5 !364 wip: CRM-待办事项
Merge pull request !364 from dhb52/crm-msg
2024-01-15 01:34:14 +00:00
dhb52 24849335a8 wip: 待办事项 2024-01-14 22:44:25 +08:00
puhui999 2a55d88a44 Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
#	src/router/modules/remaining.ts
2024-01-14 21:53:31 +08:00
puhui999 9cbb3aa84a crm-客户:完善转移和按钮权限 2024-01-14 21:48:20 +08:00
puhui999 5151824110 crm-客户:公海抽离,完善跟进 2024-01-14 20:57:06 +08:00
dhb52 25347b3ea5 Merge remote-tracking branch 'yudao/dev' into dev 2024-01-14 11:50:26 +08:00
puhui999 d29dfef7c7 新增客户跟进 2024-01-14 00:00:50 +08:00
YunaiV 26bb847383 ✨ MALL:简化商品分类的 VO 转化 2024-01-13 22:58:32 +08:00
芋道源码 fdfb028dd9 !360 Review代码修改
Merge pull request !360 from 疯狂的世界/dev
2024-01-13 03:16:16 +00:00
YunaiV a77658b336 Merge remote-tracking branch 'origin/dev' into dev 2024-01-13 10:24:54 +08:00
芋道源码 66c48a913c 📖 CRM:产品模块的 review 2024-01-13 10:24:48 +08:00
芋道源码 2be14817a0 !361 新增:产品详情页面
Merge pull request !361 from 安浩浩/dev
2024-01-13 02:04:20 +00:00
YunaiV a9400c5171 ✨ MALL:简化 SPU 属性的维护逻辑 2024-01-12 23:17:48 +08:00
YunaiV 10afbe8e2f 📖 MALL:商品编辑 => 优化 DescriptionForm 表单 2024-01-12 21:01:10 +08:00
YunaiV a38ddb699a 📖 MALL:商品编辑 => 优化 DeliveryForm 表单 2024-01-12 20:53:17 +08:00
YunaiV 20b4a7fd66 📖 MALL:商品编辑 => 优化 SKU 表单 2024-01-11 22:22:07 +08:00
anhaohao 4f89eb6ba9 新增:产品详情页面 2024-01-11 17:51:45 +08:00
owen 2b8eb49f71 Review代码修改 2024-01-11 12:25:34 +08:00
owen bdf95dc0f8 Merge remote-tracking branch 'origin/dev' into dev 2024-01-11 11:35:08 +08:00
owen a9c231bed6 营销:统一装修预览图片字段名称 2024-01-11 11:21:23 +08:00
YunaiV efe702d383 📖 MALL:商品编辑 => 简化 InfoForm 基础设置 2024-01-11 09:42:23 +08:00
YunaiV 2c76d3aeee 📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本 2024-01-11 00:25:39 +08:00
YunaiV c0905fdc8e 📖 MALL:商品编辑的简化 2024-01-11 00:00:43 +08:00
YunaiV f1c858b9af 📖 MALL:商品编辑的简化 2024-01-10 23:50:19 +08:00
YunaiV a5d6d18b6a 📖 MALL:优化商品列表的样式 2024-01-10 13:51:00 +08:00
YunaiV ab64a1d1df 📖 MALL:code review 满减送活动 2024-01-07 22:41:17 +08:00
芋道源码 1e68cd53a0 !352 满减送模块
Merge pull request !352 from Bluemark/dev
2024-01-07 14:16:02 +00:00
芋道源码 804859bbd8 !357 update src/views/bpm/model/ModelForm.vue.
Merge pull request !357 from 水人/N/A
2024-01-07 13:25:10 +00:00
YunaiV ec87c1b61d 📖 CRM:code review crm 客户列表 2024-01-07 21:20:00 +08:00
芋道源码 4eb3c8a2f9 !358 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
Merge pull request !358 from puhui999/dev-crm
2024-01-07 12:53:49 +00:00
YunaiV a0f7775321 📖 CRM:code review crm 联系人新增操作日志 2024-01-07 18:19:15 +08:00
芋道源码 09fa30b0d6 !359 crm联系人新增操作日志
Merge pull request !359 from zyna/dev
2024-01-07 10:15:05 +00:00
YunaiV 29e7161eba 📖 MALL:code review 商品统计的代码 2024-01-07 16:23:24 +08:00
芋道源码 9bdba0f67e !351 商品统计
Merge pull request !351 from 疯狂的世界/dev
2024-01-07 07:23:49 +00:00
zyna 3af6811c72 crm联系人新增操作日志 2024-01-06 21:04:58 +08:00
answer-huang 8801c82e15 fix: remove bg color with xl size 2024-01-06 21:00:02 +08:00
puhui999 17be1abb65 客户详情完善 2024-01-06 12:29:35 +08:00
YunaiV d36c4ab36c ✨ MALL:去除分销提现的银行配置 2024-01-05 22:46:22 +08:00
owen 1fb7701e6e Merge remote-tracking branch 'origin/dev' into dev 2024-01-05 15:26:41 +08:00
水人 81d84877bc update src/views/bpm/model/ModelForm.vue.
创建的是用路由地址,但那个表单查看的是VUE源码的组件地址,不是路由。给我造成了很大的困扰~

Signed-off-by: 水人 <417693680@qq.com>
2024-01-04 07:17:02 +00:00
puhui999 7fd564307d fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题 2024-01-04 12:10:01 +08:00
YunaiV 5e265a9094 ✨ CRM:【联系人】统一字段 2024-01-03 23:30:29 +08:00
YunaiV d71097ac31 📖 CRM:【客户配置】调整目录结构 2024-01-03 20:09:56 +08:00
YunaiV 4fbb3b88e6 📖 CRM:【客户】微调客户列表界面 2024-01-03 19:38:55 +08:00
YunaiV 7448f6e08c 📖 CRM:【客户】微调客户列表界面 2024-01-02 21:44:38 +08:00
YunaiV 0a4023ef00 📖 CRM:code review 商机模块 2024-01-02 18:48:47 +08:00
芋道源码 45521c139c !350 crm联系人商机review修改
Merge pull request !350 from zyna/dev
2023-12-30 13:54:56 +00:00
芋道源码 0338caeef6 !355 修复一些 issues 提到的问题
Merge pull request !355 from puhui999/dev-crm
2023-12-30 13:26:46 +00:00
YunaiV 1eefa02c4c 📖 操作日志的界面实现 2023-12-30 21:25:08 +08:00
芋道源码 631c105f94 !346 feat:新增公共操作日志详情组件
Merge pull request !346 from puhui999/dev-crm
2023-12-30 12:54:53 +00:00
puhui999 d766b36e72 fix: 修复请假申请提交后页面不返回的bug 2023-12-30 20:53:44 +08:00
YunaiV 8aa49f2e1d Merge remote-tracking branch 'origin/dev' into dev 2023-12-30 19:12:35 +08:00
YunaiV ccb997ac2a 🐛 修复 Excel 导出失败时,依然下载的问题 2023-12-30 19:11:29 +08:00
puhui999 aadad39a69 fix: 修复文件上传数据回显错误 2023-12-30 18:46:44 +08:00
puhui999 261d8b2aa4 crm-客户:集成操作日志详情组件 2023-12-30 17:06:09 +08:00
芋道源码 67630e31b2 !353 Update return list API endpoint
Merge pull request !353 from AhJindeg/fix/return-list
2023-12-29 15:06:29 +00:00
芋道源码 32dab6bc08 !348 update src/api/bpm/task/index.ts.
Merge pull request !348 from 水人/N/A
2023-12-29 15:06:04 +00:00
AhJindeg 2223f7f197 fix(task): 🐞 Update return list API endpoint
- 修改获取回退节点列表接口地址
2023-12-26 11:32:40 +08:00
落日晚风 21e8dbf985 满减送数据对接 2023-12-22 18:04:29 +08:00
YunaiV 9591ed7084 📖 code review:店铺装修逻辑 2023-12-20 23:01:09 +08:00
YunaiV b86f082306 📖 code review:店铺装修逻辑 2023-12-19 23:10:58 +08:00
zyna 2cfe006def crm联系人商机修改 2023-12-17 17:54:42 +08:00
zyna dd4482fad2 crm联系人商机修改 2023-12-17 17:37:40 +08:00
zyna a1fd3afc32 crm联系人商机修改 2023-12-17 17:34:32 +08:00
owen ca35e1a4af 统计:增加商品统计 2023-12-16 23:48:09 +08:00
YunaiV df1c565cd9 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-12-16 20:49:56 +08:00
YunaiV be4750a174 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-12-16 20:49:47 +08:00
水人 346863a8a9 update src/api/bpm/task/index.ts.
后台接口地址是return-list,前台写成了get-return-list

Signed-off-by: 水人 <417693680@qq.com>
2023-12-16 00:00:14 +00:00
芋道源码 1abff21e56 !347 商城装修
Merge pull request !347 from 疯狂的世界/dev
2023-12-15 15:37:01 +00:00
owen 80355f3acd 营销:优化商城装修组件 2023-12-15 17:12:02 +08:00
owen 33162a12c0 营销:适配商城装修组件【标题栏】 2023-12-15 13:26:28 +08:00
owen 41a404a52c 营销:适配商城装修组件【热区】 2023-12-14 20:22:52 +08:00
puhui999 455688eaa8 crm-客户:集成操作日志详情组件 2023-12-14 18:19:34 +08:00
puhui999 59c6670775 feat:新增公共操作日志详情组件 2023-12-14 18:18:55 +08:00
芋道源码 26a082788d !345 商城装修
Merge pull request !345 from 疯狂的世界/dev
2023-12-10 01:33:19 +00:00
owen edfdee8cc1 营销:适配商城装修组件【悬浮按钮】 2023-12-09 21:33:47 +08:00
owen 76025b6821 营销:适配商城装修组件【弹窗广告】 2023-12-09 16:45:54 +08:00
芋道源码 605f906056 !344 商城装修
Merge pull request !344 from 疯狂的世界/dev
2023-12-09 03:41:45 +00:00
owen 59ff6b13fb 封装拖拽组件,提供移动、新增、删除功能 2023-12-08 21:54:11 +08:00
owen 9ff4f1f7a9 商城装修:修复同一类型的组件切换时,右侧属性面板不更新的问题 2023-12-07 21:18:51 +08:00
owen a7512ba2c7 修复商城首页,快捷入口的图标宽高不一致的问题 2023-12-07 21:02:07 +08:00
owen 5002fc5fcc local不能作为环境名,改为local-dev 2023-12-07 20:53:30 +08:00
owen 16aac73858 整理运行环境配置文件 2023-12-07 20:43:58 +08:00
owen cd89f75b07 营销:完善装修编辑器预览功能 2023-12-07 19:59:32 +08:00
owen 784623724d 营销:完善装修编辑器预览功能 2023-12-07 19:58:52 +08:00
owen eec3a21852 营销:完善装修编辑器重置功能 2023-12-07 16:25:15 +08:00
owen 9128fa98f5 修复首页头像不显示 2023-12-07 12:19:46 +08:00
芋道源码 b4aa09aa6c !327 【新增】ureport2 集成
Merge pull request !327 from souvc/master
2023-12-06 12:57:44 +00:00
芋道源码 1e6ceabd3b !343 ✨ 优化:商品库存为0时,商品列表商品封面显示已售罄,商品详情页用户无法下单
Merge pull request !343 from 奕泽云/master
2023-12-06 12:16:28 +00:00
YunaiV ce79dd68a3 📈 CRM:code review 联系人商机功能 2023-12-06 19:26:39 +08:00
芋道源码 d6291382e8 !341 crm联系人商机功能
Merge pull request !341 from zyna/dev
2023-12-06 05:55:59 +00:00
YunaiV f8c4700c2e 🔨 CRM:优化产品分类代码的实现 2023-12-06 12:56:55 +08:00
YunaiV b3d66cd0aa 🔨 CRM:优化产品代码的实现 2023-12-06 12:32:51 +08:00
芋道源码 ee9667504f !342 【CRM:优化产品以及产品分类】
Merge pull request !342 from ZanGe丶/master
2023-12-05 14:36:16 +00:00
YunaiV 0c613e94a8 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2023-12-05 20:03:40 +08:00
ZENGlei11350 dee8215da2 优化:添加商品时0库存商品无法保存改为可以保存 2023-12-04 13:42:18 +08:00
liuhongfeng d9ed3d1a6b Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-12-03 23:01:52 +08:00
ZanGe丶 dde61c29a0 【crm:优化产品及产品分类】 2023-12-03 21:24:38 +08:00
zyna ba49b2851c 联系人商机功能 2023-12-03 19:56:46 +08:00
YunaiV 2f10f0ffc1 Merge remote-tracking branch 'origin/master' 2023-12-03 19:26:33 +08:00
Marvin aac60380bc feat: 跳转到例外一个标签页预览 2023-12-03 19:26:22 +08:00
Marvin 2a0b329565 feat: 新增文件内容项,图片时展示,pdf时跳转到预览,其他文件下载 2023-12-03 19:26:22 +08:00
Marvin 19e3297667 feat: 文件列表增加图片的展示和预览 2023-12-03 19:26:22 +08:00
puhui999 55c64d9c1b fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误 2023-12-03 19:26:22 +08:00
Evol郑天 3009c04d0a 修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-12-03 19:26:22 +08:00
芋道源码 c47aabe880 !333 文件列表增加图片的展示和预览
Merge pull request !333 from boide/file-preview
2023-12-03 11:02:48 +00:00
芋道源码 f9994c585c !340 fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决列表预览图片层级出现错误
Merge pull request !340 from puhui999/master
2023-12-03 11:01:11 +00:00
YunaiV 7748704639 🐛 修复 accessLog、errorLog 在 IDEA 报错的问题 2023-12-03 18:33:33 +08:00
YunaiV 5eb30c7e85 🐛 修复 job 在 IDEA 报错的问题 2023-12-03 18:11:54 +08:00
liuhongfeng 0b9cf35b17 【修改】ureport2 集成 2023-12-03 17:00:00 +08:00
YunaiV 85fe4ad8d6 🐛 修复 file 在 IDEA 报错的问题 2023-12-03 10:34:08 +08:00
YunaiV aecc9bb8cb 🐛 修复 IDEA 在 v-for="dict in getIntDictOptions(...)" 时,el-option 的 key 会告警的问题 2023-12-03 09:52:13 +08:00
YunaiV 3d2d48b601 🐛 修复 user 在 IDEA 报错的问题 2023-12-03 01:03:41 +08:00
puhui999 f3e89c0c55 fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误 2023-12-03 00:14:04 +08:00
YunaiV fa421d0895 🐛 修复 tenant 在 IDEA 报错的问题 2023-12-02 23:43:16 +08:00
YunaiV a6deb69ddc 🐛 修复 social 在 IDEA 报错的问题 2023-12-02 23:01:31 +08:00
YunaiV 3407cc66a9 🐛 修复 sms 在 IDEA 报错的问题 2023-12-02 22:39:52 +08:00
YunaiV dd4a77ff22 🐛 修复 sensitiveWord 在 IDEA 报错的问题 2023-12-02 22:02:20 +08:00
YunaiV 6593c603a2 🐛 修复 menu 在 IDEA 报错的问题 2023-12-02 21:47:20 +08:00
YunaiV 2ceb3b978c 🐛 修复 oauth2 在 IDEA 报错的问题 2023-12-02 20:49:08 +08:00
YunaiV 5766dc81d1 🐛 修复 notify 在 IDEA 报错的问题 2023-12-02 20:25:29 +08:00
YunaiV b103c40874 🐛 修复 notice 在 IDEA 报错的问题 2023-12-02 20:08:05 +08:00
YunaiV 1066551fd1 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2023-12-02 19:25:50 +08:00
YunaiV 757fbddef2 🐛 修复 dictType 和 dictData 在 IDEA 报错的问题 2023-12-02 18:22:02 +08:00
YunaiV a77173f2ae 🐛 修复 post 和 dept 在 IDEA 报错的问题 2023-12-02 10:20:09 +08:00
芋道源码 d6ff66dc1d !339 商城装修
Merge pull request !339 from 疯狂的世界/dev
2023-12-02 01:01:14 +00:00
owen b982397449 Merge remote-tracking branch 'origin/dev' into dev 2023-12-02 00:00:50 +08:00
owen 3c8ffc8c21 营销:适配商城装修组件【用户卡券】 2023-12-01 23:58:57 +08:00
owen c058048fac 营销:适配商城装修组件【用户资产】 2023-12-01 23:40:07 +08:00
owen 2c1edfa781 营销:适配商城装修组件【用户订单】 2023-12-01 23:34:19 +08:00
owen af67db577d 营销:适配商城装修组件【用户卡片】 2023-12-01 23:12:44 +08:00
YunaiV b0c1e55c6a crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:20 +08:00
owen d5f9d31d32 营销:适配商城装修组件【拼团】(待重写) 2023-12-01 21:00:39 +08:00
owen 7e44b621a5 营销:适配商城装修组件【秒杀】(待重写) 2023-12-01 20:24:55 +08:00
YunaiV bdc80ea55b crm: 增加基于客户查询回款分页 2023-12-01 19:37:51 +08:00
owen b4ba1043d6 eslint 2023-12-01 18:57:46 +08:00
Marvin a711e96b23 feat: 跳转到例外一个标签页预览 2023-12-01 09:53:41 +08:00
Marvin 915702183d feat: 新增文件内容项,图片时展示,pdf时跳转到预览,其他文件下载 2023-12-01 09:50:39 +08:00
owen 08be359578 Merge remote-tracking branch 'origin/dev' into dev 2023-12-01 00:39:55 +08:00
owen 23a6bf5ef5 营销:商城装修增加控件【APP 链接选择】 2023-12-01 00:39:10 +08:00
芋道源码 fa6ec8f07f !338 修复公众号-素材管理 上传时缺少accountId参数
Merge pull request !338 from Evol郑天/N/A
2023-11-30 12:38:24 +00:00
YunaiV 88e5e67a89 crm: 增加基于客户查询商机分页 2023-11-30 20:21:45 +08:00
YunaiV 31a42fc3f7 crm:增加合同 List 组件 2023-11-30 19:12:57 +08:00
YunaiV 5f26c4afe9 crm:完善数据权限的界面 2023-11-30 13:42:49 +08:00
YunaiV 7de0e93d5a crm:联系人增加 ContactList 组件,提供给其它模块内嵌 2023-11-29 21:42:10 +08:00
YunaiV 2cda0cdd9f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/crm/contact/ContactForm.vue
2023-11-29 14:01:20 +08:00
YunaiV 8b787176b6 crm:code review 客户详情 2023-11-29 13:59:53 +08:00
wanwan 443f65b5dc !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2023-11-29 13:59:52 +08:00
YunaiV ddfceddf4a crm:code review 联系人详情 2023-11-29 13:57:01 +08:00
YunaiV ae8cb9218c crm:code review 客户详情 2023-11-29 13:55:53 +08:00
wanwan 85810c0786 !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2023-11-29 13:55:53 +08:00
YunaiV c5b2fdecd5 crm:code review 商机类型 2023-11-29 13:55:53 +08:00
ljlleo 50430bb9cd 商机、商机状态类型 2023-11-29 13:55:53 +08:00
YunaiV 661dc2ff67 crm:code review 成员 2023-11-29 13:55:53 +08:00
芋道源码 c322959c40 !337 crm联系人review修改
Merge pull request !337 from zyna/master
2023-11-29 05:54:39 +00:00
Evol郑天 fd266516fe 修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-11-29 01:24:42 +00:00
dhb52 e106fb73b6 Merge remote-tracking branch 'yudao/master' into dhb52_master 2023-11-28 21:53:20 +08:00
zyna ed22e02b5b crm联系人review修改 2023-11-27 23:44:13 +08:00
YunaiV d69134adfa Merge remote-tracking branch 'origin/dev' into dev 2023-11-27 20:38:49 +08:00
芋道源码 57b20f1810 !336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
2023-11-27 12:35:25 +00:00
YunaiV 1ba450103e crm:code review 联系人详情 2023-11-27 20:33:53 +08:00
YunaiV 24773a6eaa crm:code review 客户详情 2023-11-27 20:31:23 +08:00
wanwan e1f9e16a77 !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2023-11-27 20:31:23 +08:00
YunaiV 3c19cb1a85 crm:code review 商机类型 2023-11-27 20:31:23 +08:00
ljlleo b3515b2db5 商机、商机状态类型 2023-11-27 20:31:23 +08:00
YunaiV 4e1748caa3 crm:code review 成员 2023-11-27 20:31:23 +08:00
芋道源码 038f3d6ab0 !335 crm联系人review修改
Merge pull request !335 from zyna/master
2023-11-27 12:30:20 +00:00
Evol郑天 633965b07d 同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-11-27 07:07:32 +00:00
zyna 46a8755c93 联系人review修改 2023-11-26 21:54:50 +08:00
YunaiV cec8582a90 crm:code review 客户详情 2023-11-26 20:18:33 +08:00
wanwan 324d1e859e !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2023-11-26 12:02:08 +00:00
Marvin c2e8eaed60 feat: 文件列表增加图片的展示和预览 2023-11-25 22:56:31 +08:00
芋道源码 8aa17b673b !331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
2023-11-25 10:50:20 +00:00
liuhongfeng 7df7719be3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-25 17:45:32 +08:00
owen d4dc105b4f 营销:适配商城装修组件【营销文章】 2023-11-25 15:53:07 +08:00
YunaiV 36702f5f90 crm:code review 商机类型 2023-11-25 12:01:35 +08:00
芋道源码 937fc17150 !330 商机、商机状态类型页面
Merge pull request !330 from 刘先生/dev
2023-11-25 03:56:08 +00:00
YunaiV eb97447bb7 crm:code review 成员 2023-11-25 10:42:44 +08:00
芋道源码 54897b6d1b !332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
2023-11-25 02:27:11 +00:00
芋道源码 c6192a1918 !329 完善团队成员公共组件,crm-客户:集成团队成员
Merge pull request !329 from puhui999/dev-crm
2023-11-25 02:24:45 +00:00
Marvin b95b8008f7 feat: 菜单右上角加一个搜索图标 2023-11-25 03:52:59 +08:00
liuhongfeng 764e1715be Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-24 22:56:39 +08:00
芋道源码 8f97155b43 !328 商城装修
Merge pull request !328 from 疯狂的世界/dev
2023-11-24 14:41:12 +00:00
owen c3cad3f3ee 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题 2023-11-24 20:54:47 +08:00
ljlleo 2700b08c69 商机、商机状态类型 2023-11-24 14:21:21 +08:00
YunaiV 1744c6ec6f websocket 重新封装 2023-11-24 00:33:05 +08:00
puhui999 f8b56a8c46 crm-客户:公海数据区分 2023-11-23 09:35:59 +08:00
dhb52 c2038b95bf Merge remote-tracking branch 'yudao/master' 2023-11-23 08:47:06 +08:00
liuhongfeng aceac6daae 【修改】ureport2 集成 2023-11-22 22:09:48 +08:00
owen 253401ace3 营销:适配商城装修组件【优惠券】 2023-11-22 16:58:00 +08:00
puhui999 12b59200c1 crm-客户:集成团队成员 2023-11-22 15:45:10 +08:00
puhui999 19a0a83054 crm-数据权限:完善团队成员公共组件 2023-11-22 15:44:42 +08:00
YunaiV f74ddf46ae sms:移除 sendCode、sendMsg 字段 2023-11-21 22:53:49 +08:00
owen 1bb9df7b3c 商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题 2023-11-21 10:27:29 +08:00
liuhongfeng 4440ec866c 【新增】ureport2 集成 2023-11-20 23:32:54 +08:00
owen e0a731dd86 商品评论、优惠券模板复用组件【商品橱窗】 2023-11-20 10:53:02 +08:00
owen 3198688eb5 营销:适配商城装修组件【商品栏】 2023-11-19 18:27:25 +08:00
芋道源码 b0b669129b !314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
2023-11-18 16:32:02 +00:00
芋道源码 4423e9b804 !326 CRM 客户最新的代码
Merge pull request !326 from 芋道源码/dev
2023-11-18 16:30:42 +00:00
YunaiV ebb19cfe8c Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-19 00:30:02 +08:00
YunaiV b1f5ad55b8 crm:code review 权限列表 2023-11-19 00:28:22 +08:00
芋道源码 2e01944df9 !322 crm-团队成员:完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
2023-11-18 16:13:06 +00:00
芋道源码 5f0b0bd21d !324 商城装修
Merge pull request !324 from 疯狂的世界/dev
2023-11-18 14:18:12 +00:00
芋道源码 9d7c578d48 !323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
2023-11-18 14:17:55 +00:00
YunaiV 526172af60 crm:code review 客户配置管理 2023-11-18 22:11:42 +08:00
芋道源码 c06223decd !316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
2023-11-18 13:45:48 +00:00
芋道源码 f07d37438d !321 修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Merge pull request !321 from 柯杨/master
2023-11-18 13:43:22 +00:00
YunaiV 85e953b920 crm:code review 联系人管理 2023-11-18 21:08:00 +08:00
YunaiV 7c5ae17d04 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/components/DiyEditor/components/ComponentContainer.vue
2023-11-18 20:39:31 +08:00
芋道源码 538783ce2d !317 crm联系人前端
Merge pull request !317 from zyna/master
2023-11-18 12:35:34 +00:00
YunaiV f1e3eccc8a Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-18 18:00:41 +08:00
YunaiV 652698b871 代码生成:增加说明文档 2023-11-18 18:00:19 +08:00
芋道源码 26dba8b457 !325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
2023-11-18 09:57:33 +00:00
owen f5d611968f Merge remote-tracking branch 'origin/dev' into dev 2023-11-17 21:51:42 +08:00
YunaiV a42d0695fe 代码生成:增加主子表 erp 模式的示例 2023-11-17 13:21:17 +08:00
口口口 68f6683e52 update src/views/Profile/components/UserSocial.vue.
在这里绑定,绑定成功后,列表重复

Signed-off-by: 口口口 <17975121@qq.com>
2023-11-17 05:17:17 +00:00
owen b4a1772584 营销:适配商城装修组件【商品卡片】 2023-11-17 10:14:26 +08:00
YunaiV 6c405ba420 代码生成:增加主子表 inner 模式的示例 2023-11-16 23:48:20 +08:00
YunaiV 9aca49c1ff 代码生成:增加主子表 normal 模式的示例 2023-11-16 23:24:03 +08:00
YunaiV bbc37613b6 代码生成:增加 tree 树形的示例 2023-11-16 20:39:12 +08:00
YunaiV 3d0c4f4422 代码生成:支持树形表结构的配置 2023-11-16 00:11:23 +08:00
YunaiV 40b1522ed0 代码生成:增加 crud 单表示例 2023-11-15 23:48:00 +08:00
Wanwan 22206b25e1 feat: CRM 客户限制 2023-11-15 21:55:44 +08:00
xingyu 821c804189 fix: stylelint 2023-11-14 21:56:54 +08:00
xingyu 249e0d21a3 fix: eslint 2023-11-14 21:56:02 +08:00
xingyu 8a74b954d0 docs: update deps 2023-11-14 21:53:30 +08:00
xingyu e56afbf80f chore: update deps 2023-11-14 21:49:49 +08:00
puhui999 8e0cf5c1e5 crm-团队成员:新增获得权限级别名称函数 getLevelName 2023-11-14 12:06:42 +08:00
puhui999 ba702d03bc Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-11-14 11:26:41 +08:00
puhui999 015a1640c1 crm-团队成员:完善团队成员通用组件封装 2023-11-14 11:26:07 +08:00
YunaiV 45656562a8 代码生成:支持设置主子表的信息 2023-11-14 09:50:54 +08:00
柯杨 8bb9dec328 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
2023-11-14 01:43:59 +00:00
芋道源码 c1a92ba22a !319 商城装修
Merge pull request !319 from 疯狂的世界/dev
2023-11-14 00:31:55 +00:00
puhui999 27c9a0f32d crm-团队成员: 先提交一波 2023-11-13 17:49:27 +08:00
puhui999 2385cd9b9a fix:如果已经到重新登录页面则不进行弹窗提示 2023-11-13 15:48:21 +08:00
YunaiV 999d8de9e9 代码生成:增加主子表(内嵌)的示例 2023-11-13 13:57:15 +08:00
YunaiV f0f7886025 代码生成:增加主子表(普通)的示例 2023-11-12 22:33:38 +08:00
YunaiV 72c5eaae31 代码生成:增加 one 情况下的示例代码 2023-11-12 19:50:38 +08:00
owen 49ebadd748 营销:适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
Wanwan 702f23e672 feat: CRM 客户限制 2023-11-12 14:34:25 +08:00
zyna ed26142bb0 crm联系人init 2023-11-11 23:35:18 +08:00
Wanwan a7f86dfd8b feat: CRM 客户限制 2023-11-11 21:06:11 +08:00
Wanwan 6369b334e3 feat: CRM 客户限制 2023-11-11 20:50:33 +08:00
YunaiV 55f6e4ca25 主子表:确认列表编辑的支持组件情况 2023-11-10 23:01:36 +08:00
Wanwan b63e2a9efb Merge remote-tracking branch 'origin/dev' into dev 2023-11-10 22:47:34 +08:00
YunaiV 9f9e0f8bda 主子表:同步三种模式的代码 2023-11-10 19:54:55 +08:00
niou233 af5d1cf25e update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:36:11 +00:00
niou233 1ab5b44254 update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:35:54 +00:00
niou233 2ff97758fd update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:34:32 +00:00
YunaiV 86d9a97ccb 主子表:暂时存储,参数校验-表单数据跑通 2023-11-10 08:51:01 +08:00
YunaiV d45ebd4fcf 主子表:暂时存储,样式跑通 2023-11-10 00:20:00 +08:00
YunaiV 4e413a10e6 主子表:暂时存储,准备重构 2023-11-09 23:10:54 +08:00
owen 55b477acdb unplugin-auto-import:排除自动导入店铺装修组件 2023-11-09 15:48:20 +08:00
芋道源码 6160c2fa8a !315 商城装修
Merge pull request !315 from 疯狂的世界/dev
2023-11-09 01:30:21 +00:00
YunaiV e9299c6710 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-09 09:20:21 +08:00
YunaiV a08e9bea7c 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-09 09:20:21 +08:00
owen 82aed175ab 营销:适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +08:00
Wanwan 59b2d89a18 feat: CRM 客户公海配置 2023-11-09 00:08:09 +08:00
Wanwan 288aa72cdd feat: CRM 客户公海配置 2023-11-09 00:05:10 +08:00
owen ac42493659 营销:适配商城装修组件【宫格导航】 2023-11-08 22:22:35 +08:00
owen 325e2e4ff2 营销:适配商城装修组件【列表导航】 2023-11-08 21:10:05 +08:00
niou233 084009f7f2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-08 17:30:04 +08:00
niou233 f2c71d5836 refactor: 会员商品收藏 2023-11-08 17:29:57 +08:00
Wanwan 57474c0644 Merge remote-tracking branch 'origin/dev' into dev 2023-11-07 22:54:50 +08:00
Wanwan 7146fdc9b9 style: 客户 review 修改 2023-11-06 22:00:40 +08:00
YunaiV eb9f8c9f6f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-06 21:43:55 +08:00
YunaiV 85ee558bef 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-06 19:42:28 +08:00
YunaiV c0d5c76a06 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-06 19:09:20 +08:00
芋道源码 821217501c !310 fix: 修复关闭拼团活动请求URL错误的问题
Merge pull request !310 from VicoHu/N/A
2023-11-06 07:03:30 +00:00
芋道源码 ead30e8cd9 !312 商城装修
Merge pull request !312 from 疯狂的世界/dev
2023-11-06 07:02:18 +00:00
owen 4253173a2a 营销:适配商城装修组件【轮播图】 2023-11-06 09:31:42 +08:00
owen 6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 08:33:16 +08:00
dhb52 89dbb8c9e8 perf: 优化.env配置 2023-11-05 23:14:56 +08:00
owen bb2b7ffd03 营销:增加商城装修组件【视频播放】 2023-11-05 22:53:30 +08:00
VicoHu 3f803767c4 fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
2023-11-05 13:59:28 +00:00
YunaiV 47bb88d892 code review:产品分类 2023-11-05 20:50:13 +08:00
YunaiV e1cff74f41 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:48:12 +08:00
owen fa710b560d 营销:增加商城装修组件【图片展示】 2023-11-05 20:42:50 +08:00
芋道源码 596ad888e1 !308 【增加CRM:产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
2023-11-05 12:28:31 +00:00
YunaiV 17742988c9 code review:回款 2023-11-05 20:25:52 +08:00
YunaiV 65d85e30ca Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:23:56 +08:00
芋道源码 f0c45103e1 !309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
2023-11-05 12:20:46 +00:00
owen 434aa864da 营销:优化装修编辑器 2023-11-05 12:40:32 +08:00
owen 0b0ba1f313 营销:优化装修编辑器样式 2023-11-05 10:08:03 +08:00
owen 984351fbf0 修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致 2023-11-05 09:47:54 +08:00
owen aedf014407 营销:装修页面适配搜索框 2023-11-04 22:06:40 +08:00
YunaiV 4f2f4f72b5 优化:社交登录、用户的管理 2023-11-04 20:43:36 +08:00
ZanGe丶 ff6f05df84 【crm:产品及产品分类】 2023-11-04 18:28:59 +08:00
YunaiV a9b91e7436 优化:社交登录、用户的管理 2023-11-04 14:37:23 +08:00
YunaiV ac7f1e29fb Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 10:50:04 +08:00
芋道源码 df646175dc !296 新增社交客户端 CRUD,新增社交用户 RUD
Merge pull request !296 from puhui999/dev_tmp
2023-11-04 02:49:27 +00:00
芋道源码 71e6d51c12 !299 update src/layout/components/Message/src/Message.vue.
Merge pull request !299 from lzy/N/A
2023-11-04 02:44:57 +00:00
YunaiV f79d31a64a code review:满减送活动 2023-11-04 10:39:39 +08:00
芋道源码 27defa7268 !291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
2023-11-04 02:30:50 +00:00
YunaiV a9faeb1bdb code review:客户管理 2023-11-04 10:12:40 +08:00
芋道源码 09c44cd4fe !306 feat: 客户详情 + review 修改
Merge pull request !306 from wanwan/dev
2023-11-04 01:50:33 +00:00
Wanwan 23f483ac45 feat: 客户详情 + review 修改 2023-11-04 03:21:01 +08:00
liuhongfeng 8ef5227f88 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 00:48:51 +08:00
芋道源码 188de1031b !302 update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
Merge pull request !302 from 风狗/N/A
2023-11-03 16:28:27 +00:00
芋道源码 f6adb4ebaf !303 商城装修
Merge pull request !303 from 疯狂的世界/dev
2023-11-03 15:07:04 +00:00
YunaiV de62a7a5b7 bugfix:注释掉 uno 的 transformerVariantGroup,解决 vite 监控到 css 变化,导致 Login.vue 登录时的重加载问题 2023-11-03 18:44:56 +08:00
jason fcc748dc63 Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 08:47:57 +08:00
jason 753f5de81e 转账 - 新增转账订单查询 2023-11-03 08:46:53 +08:00
owen 3c0f3ceed5 营销:装修模板,底部导航适配APP 2023-11-03 06:47:46 +08:00
风狗 bf418653e4 update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
2023-11-02 02:08:26 +00:00
芋道源码 20c59b8122 !301 营销:完善商城装修
Merge pull request !301 from 疯狂的世界/dev
2023-11-01 00:48:16 +00:00
liuhongfeng 3d54ad3a6a 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-31 23:32:35 +08:00
owen 9bd33355e2 营销:装修编辑器样式优化 2023-10-31 17:17:46 +08:00
dongshanshan 18e2c33cef Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-31 16:53:48 +08:00
dongshanshan 9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
owen 881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
xingyu 10483577b7 fix: types 2023-10-31 14:26:17 +08:00
xingyu 52755b38a9 fix: props 2023-10-31 14:25:49 +08:00
xingyu 13f31c19f5 chore: words warn 2023-10-31 14:25:41 +08:00
xingyu 4365ca6177 fix: title name 2023-10-31 14:10:05 +08:00
xingyu ce93c8d4e9 fix: name warn 2023-10-31 14:04:43 +08:00
xingyu 7321ff2136 chore: wh-full 2023-10-31 10:20:39 +08:00
xingyu af7c6f3b2c fix: url error 2023-10-31 10:17:00 +08:00
xingyu 80e72fd924 feat: coding 2023-10-31 10:13:22 +08:00
xingyu 2a029ba35b feat: add useTagsView hooks 2023-10-31 10:12:04 +08:00
xingyu 57e8256e9a feat: add useNow hooks 2023-10-31 10:11:55 +08:00
xingyu bdcef303ff perf: useValidator hooks 2023-10-31 10:11:43 +08:00
xingyu f8fdebffe6 feat: add useNetwork hooks 2023-10-31 10:11:34 +08:00
xingyu 4ba264e00d perf: use driver.js 2023-10-31 10:07:21 +08:00
xingyu f26a4cae10 feat: unocss add shortcuts 2023-10-31 10:04:31 +08:00
xingyu 899880bfe1 chore: update deps 2023-10-31 09:52:08 +08:00
liuhongfeng 2b84de7e09 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:32:50 +08:00
lzy c269cab6b2 update src/layout/components/Message/src/Message.vue.
fix:  处理站内信内容过多回显问题

Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
2023-10-30 06:20:16 +00:00
jason c1534bf168 Merge remote-tracking branch 'origin/dev' into dev 2023-10-29 23:48:20 +08:00
jason 55a961e862 转账 - 管理后台新增转账示例 2023-10-29 23:48:10 +08:00
YunaiV 0c81a0d96a code review:客户表的实现 2023-10-29 22:29:03 +08:00
芋道源码 4fba270f1c !298 商城装修
Merge pull request !298 from 疯狂的世界/feature/mall_diy
2023-10-29 14:16:58 +00:00
owen e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
YunaiV dc5cf9f24c code review:客户表的实现 2023-10-29 17:55:39 +08:00
YunaiV 690b208a4e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-29 10:38:48 +08:00
芋道源码 5d760d5450 !297 feat: 调整 crm 客户表的字段
Merge pull request !297 from wanwan/master
2023-10-29 02:37:30 +00:00
Wanwan 60d53126c4 feat: 调整客户表的字段 2023-10-29 00:33:38 +08:00
Wanwan 59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
Wanwan 4cdab6fb3e feat: 调整客户表的字段 2023-10-28 19:50:42 +08:00
芋道源码 cca34e0acb !295 订单:解决列数据中的 table#header 数据不刷新的问题
Merge pull request !295 from puhui999/dev-to-dev
2023-10-27 15:03:42 +00:00
YunaiV b9ab22dad1 code review:客户表的实现 2023-10-27 23:01:00 +08:00
芋道源码 32b3c874f5 !294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
2023-10-27 14:41:47 +00:00
puhui999 a624db04e9 三方应用新增授权方的网页应用 agentId 属性 2023-10-26 17:00:13 +08:00
puhui999 88a22d90e5 解决钉钉绑定失败的问题 2023-10-26 16:19:22 +08:00
puhui999 6ee2492ff1 新增社交用户 RUD 2023-10-25 17:02:11 +08:00
puhui999 8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
puhui999 d060d27ab2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-25 11:14:26 +08:00
puhui999 ca385bc08e 解决列数据中的 table#header 数据不刷新的问题 2023-10-25 11:14:00 +08:00
xingyu 309c3f30d1 chore: remove vue-macros/volar 2023-10-25 10:43:03 +08:00
xingyu 238537df83 fix: ElLoading need import 2023-10-25 10:36:06 +08:00
xingyu bf2c59c6e0 chore: stylelint config 2023-10-25 10:35:30 +08:00
xingyu 50f1ae9524 chore: eslint config 2023-10-25 10:35:20 +08:00
xingyu 96db6ab538 chore: vscode setting 2023-10-25 10:35:10 +08:00
xingyu b8403c1b90 chore: update vue v3.3.7 2023-10-25 10:34:54 +08:00
Wanwan 044754cdb4 feat: 客户表的 crud 2023-10-25 00:24:20 +08:00
YunaiV ef334dfc66 1.8.3 版本发布 2023-10-24 21:07:51 +08:00
YunaiV 539352f598 修复 banner 返回字段不对 2023-10-24 20:29:23 +08:00
YunaiV 6644a4d4a6 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-24 20:12:39 +08:00
YunaiV e5d6a9dae1 code review:banner 逻辑 2023-10-24 20:07:48 +08:00
芋道源码 ed0f3a3043 !293 完善 banner 管理。商品 spu 剔除优惠卷相关逻辑
Merge pull request !293 from puhui999/dev-to-dev
2023-10-24 12:00:48 +00:00
puhui999 95d7d1eb42 优惠卷模版样式调整 2023-10-24 17:39:02 +08:00
puhui999 75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
puhui999 a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
KONGDY-PC\Kongdy 7c8f7d570f 满减页面布局 2023-10-23 10:37:39 +08:00
芋道源码 54cce467ab !286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
2023-10-21 13:58:13 +00:00
YunaiV 6c6c2cb058 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-21 21:56:41 +08:00
芋道源码 af79d4a653 !285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
2023-10-21 13:56:12 +00:00
芋道源码 73578ce8b2 !290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
2023-10-21 13:06:19 +00:00
YunaiV 2dbfa77bee code review:banner 逻辑 2023-10-21 19:59:41 +08:00
芋道源码 4709c18a6e !284 完善 SPU,订单列表:完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
2023-10-21 11:08:44 +00:00
芋道源码 bb73a6edfd !287 reward
Merge pull request !287 from Bluemark/dev
2023-10-21 11:08:16 +00:00
芋道源码 929fa9a208 !289 满减页面布局
Merge pull request !289 from 落日晚风/master
2023-10-21 11:05:51 +00:00
YunaiV 423ea319e0 code review:限时折扣 2023-10-21 18:18:40 +08:00
kehaiyou 5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 2023-10-21 18:16:39 +08:00
jason bb5945958b 钱包 - 优化
支付应用 - 证书模式增加应用私钥
2023-10-21 15:33:31 +08:00
芋道源码 e187c55408 !283 mall模块
Merge pull request !283 from zxiaoxiu/discount
2023-10-21 06:23:04 +00:00
puhui999 491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
913752709@qq.com fb90a85e43 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:32 +08:00
liuhongfeng 26780c3525 【新增】回款计划 功能 2023-10-20 23:48:39 +08:00
liuhongfeng 7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
puhui999 0730e215d8 完善文章管理 review 提到的问题 2023-10-20 22:16:18 +08:00
puhui999 2a150cf0c0 修复合并差异 2023-10-20 21:42:50 +08:00
zhangshuai 9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
puhui999 d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
puhui999 1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
puhui999 01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
puhui999 18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
YunaiV 2457665b55 code review:门店自提 2023-10-20 09:46:15 +08:00
芋道源码 826199dc22 !281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
2023-10-19 16:25:00 +00:00
芋道源码 83501f9b09 !279 交易:核销订单
Merge pull request !279 from 疯狂的世界/dev
2023-10-19 16:06:33 +00:00
芋道源码 6dc7315e17 !280 feat: CRM 线索表 crud
Merge pull request !280 from wanwan/master
2023-10-19 15:16:34 +00:00
1351515658@qq.com 3074adb1df fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 2023-10-19 18:43:02 +08:00
puhui999 3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
puhui999 5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
puhui999 094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
puhui999 70778fd9e6 UserOrderList 重构完善 2023-10-19 10:54:10 +08:00
puhui999 5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00
913752709@qq.com 7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
puhui999 04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
puhui999 d1a3fe5d5a 营销文章:新增表单属性移除浏览量 2023-10-18 11:33:42 +08:00
owen ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen 431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
owen 61b3bdfd4c 交易:核销订单 2023-10-17 23:18:07 +08:00
芋道源码 d6b0305d78 !277 修复前端支付渠道配置权限
Merge pull request !277 from 小玩家/master
2023-10-17 14:55:14 +00:00
YunaiV 8832eafaae code review:crm 合同流程 2023-10-17 22:52:24 +08:00
1163996518@qq.com 533b4e5006 支付渠道配置--修复权限 2023-10-17 21:27:13 +08:00
1163996518@qq.com d5328918ab 支付渠道配置--修复权限 2023-10-17 20:58:28 +08:00
芋道源码 40ec1b08ae !275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
2023-10-17 12:52:28 +00:00
芋道源码 0089d59d36 !274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
2023-10-17 12:01:51 +00:00
YunaiV c27685285a code review:修复工作流的审批界面报错问题 2023-10-17 19:50:09 +08:00
YunaiV 63fd52828c Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 19:03:02 +08:00
YunaiV aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/statistics/member/index.vue
2023-10-17 19:02:37 +08:00
芋道源码 0242c84196 !267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
2023-10-17 11:01:18 +00:00
owen 57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00
owen 6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
dhb52 dced551698 feat: CRM/合同 crud 2023-10-16 23:56:34 +08:00
jason c3f06f5fbe 钱包 - 钱包余额流水 2023-10-16 22:45:32 +08:00
jason 8626bccc4c 钱包 - 钱包余额流水 2023-10-16 22:32:10 +08:00
jason ae2c3f2ad5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 22:27:39 +08:00
owen e3a0cfe5e9 统计:修复错误 2023-10-16 22:18:51 +08:00
owen 6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
YunaiV 66ec610801 code review:文章管理 2023-10-16 21:55:11 +08:00
芋道源码 7b9ea62e6b !273 商城首页
Merge pull request !273 from 疯狂的世界/dev
2023-10-16 12:11:23 +00:00
xingyu 8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
xingyu 5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
xingyu 1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
xingyu 42c8db4f34 chore: update deps 2023-10-16 15:03:55 +08:00
owen edfd03903f 统计:会员终端统计,处理未知终端情况 2023-10-16 14:26:04 +08:00
owen 2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
owen 661e72bcfd 统计:修复错误 2023-10-16 13:15:17 +08:00
owen 8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
xingyu a2ded16718 docs: element plus 2.4.0 2023-10-16 10:25:24 +08:00
xingyu de3fa7a765 chore: update deps 2023-10-16 10:24:35 +08:00
YunaiV 99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
owen 195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
owen 3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
芋道源码 cbb0cfefdb !272 营销活动:新增文章管理,文章分类管理
Merge pull request !272 from puhui999/dev-to-dev
2023-10-15 14:04:48 +00:00
YunaiV e2a08ddbac 恢复 SSO 界面的路由 2023-10-15 21:58:19 +08:00
芋道源码 04e83e268a !271 添加社交登录页面,修复登录多次重定向问题
Merge pull request !271 from dhb52/master
2023-10-15 13:37:55 +00:00
jason 90d6f4da9f 钱包- 钱包余额查询 2023-10-15 17:47:36 +08:00
puhui999 50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-15 16:14:32 +08:00
puhui999 befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
dhb52 89417ac393 fix: 删除SSOLogin.vue组建,解决登录界面不停重定向问题 2023-10-15 14:58:13 +08:00
dhb52 3587d1ef97 fix: 路由缺少name字段,ts不高兴 2023-10-15 14:29:16 +08:00
dhb52 4d77d7e136 feat: 社交平台登录 2023-10-15 14:26:20 +08:00
puhui999 36bb90fbb8 营销活动:新增文章分类管理 2023-10-15 00:54:28 +08:00
芋道源码 889334bc37 !266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
2023-10-14 10:19:37 +00:00
芋道源码 b57b45c96f !255 站内信测试增加 Member 用户类型支持
Merge pull request !255 from 风狗/dev
2023-10-14 10:18:54 +00:00
芋道源码 fa71f85221 !265 修复,刷新菜单缓存失效问题
Merge pull request !265 from 天痕/N/A
2023-10-14 10:15:13 +00:00
jason 8b6ca3028a Merge remote-tracking branch 'origin/dev' into dev 2023-10-14 11:33:15 +08:00
jason f9d0c1aa1c 钱包-充值套餐 2023-10-14 11:32:54 +08:00
YunaiV 529a821cdb Merge remote-tracking branch 'origin/master' 2023-10-13 18:44:27 +08:00
YunaiV 470fb23ae1 同步最新 README.md 功能列表 2023-10-13 18:35:44 +08:00
xingyu 9b09304c50 docs: update deps 2023-10-13 10:41:10 +08:00
xingyu e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00
xingyu 73b2030c7f chore: update deps 2023-10-13 10:31:36 +08:00
芋道源码 6ed7b3a69e !270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
2023-10-12 13:53:25 +00:00
芋道源码 532b237712 !268 统计:会员统计
Merge pull request !268 from 疯狂的世界/dev
2023-10-11 04:34:07 +00:00
YunaiV 855b37c1ab code review:拼团记录列表 2023-10-11 11:04:03 +08:00
芋道源码 19c19d78dd !269 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
Merge pull request !269 from puhui999/dev-to-dev
2023-10-11 02:40:01 +00:00
puhui999 b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:55:53 +08:00
puhui999 3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
youkehai 62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
owen ad4607db09 Merge remote-tracking branch 'owen/dev' into dev 2023-10-09 23:29:36 +08:00
owen 6b7040404e 统计:会员统计 2023-10-09 23:27:32 +08:00
owen d4a521eff1 统计:交易统计Review修改 2023-10-09 23:27:32 +08:00
owen 22adab8590 统计:会员统计 2023-10-09 23:27:09 +08:00
kehaiyou 683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
风狗 aa5f27bec7 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
2023-10-08 08:26:07 +00:00
YunaiV 86323f970b code review:拼团记录列表 2023-10-08 07:30:14 +08:00
芋道源码 523784ce41 !264 营销活动:添加拼团记录
Merge pull request !264 from puhui999/dev-to-dev
2023-10-07 23:06:18 +00:00
天痕 fff4cfd012 修复,刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
2023-10-07 10:51:56 +00:00
puhui999 5b4983a3e9 拼团记录:优化页面布局,添加日期快捷选项 2023-10-07 11:10:26 +08:00
puhui999 8c347e5990 拼团活动:表单添加虚拟成团控制按钮 2023-10-07 10:04:05 +08:00
puhui999 e86dfa30fd Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-06 22:21:10 +08:00
puhui999 c445173855 拼团记录:接口对接 2023-10-06 22:20:40 +08:00
YunaiV 24fc36e23a promotion:调整拼团活动的界面 2023-10-06 21:03:17 +08:00
puhui999 eee3d0fef5 拼团记录: 完成 UI 部分 2023-10-06 18:40:21 +08:00
owen c8a476ac7c Merge remote-tracking branch 'origin/dev' into dev 2023-10-06 14:17:13 +08:00
owen 2a58b04a98 统计:交易统计Review修改 2023-10-06 14:15:58 +08:00
YunaiV 78062dd474 promotion:调整拼团活动的界面 2023-10-06 10:58:31 +08:00
puhui999 869bac2501 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-05 21:50:33 +08:00
YunaiV cf7ac2cb10 promotion:新增记录记录列表 2023-10-05 12:42:00 +08:00
YunaiV 860872a890 promotion:新增砍价记录列表 2023-10-05 12:06:57 +08:00
YunaiV 42f0bf07f0 promotion:优化砍价活动的管理 2023-10-05 02:17:44 +08:00
芋道源码 4c2eb3d8b2 !262 核销
Merge pull request !262 from 疯狂的世界/dev
2023-10-04 09:34:20 +00:00
owen 58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
YunaiV 7c491ff62a promotion:优化秒杀活动的界面 2023-10-03 18:41:57 +08:00
YunaiV 40f44fc78e promotion:优化优惠劵的界面 2023-10-03 13:01:31 +08:00
YunaiV 59ab6218ca trade:优化分销界面的 width 列宽度,和一些非空判断 2023-10-03 12:16:24 +08:00
芋道源码 04a94ad941 !254 解决处理顶级非目录路由的组件名称逻辑缺失的问题
Merge pull request !254 from clockdotnet/master_pr
2023-10-03 02:27:37 +00:00
芋道源码 e6ee0ab445 !261 对齐面包屑的图标和文字
Merge pull request !261 from 疯狂的世界/dev
2023-10-02 16:00:45 +00:00
owen 6515e218e2 Merge branch 'dev' into dev_local 2023-10-02 23:58:41 +08:00
owen a06a63c1be Merge remote-tracking branch 'origin/dev' into dev 2023-10-02 23:52:23 +08:00
YunaiV ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 2023-10-02 21:18:31 +08:00
YunaiV a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
YunaiV bb08f6f54f trade:完善退款详情 2023-10-02 15:44:26 +08:00
owen df8a3941c1 对齐面包屑的图标和文字 2023-10-02 11:11:07 +08:00
owen 4c077711a1 对齐面包屑的图标和文字 2023-10-02 11:03:46 +08:00
YunaiV 4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
YunaiV 588ce1c9ae trade:微调 order 列表界面 2023-10-01 23:44:38 +08:00
芋道源码 a5808c9e9c !259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
2023-10-01 13:57:56 +00:00
YunaiV 17c31978f7 product:优化商品评论 2023-10-01 21:23:50 +08:00
YunaiV 8b7543acd5 product:优化属性列表 2023-10-01 21:11:47 +08:00
YunaiV 5f80d1611c product:优化分类列表 2023-10-01 20:55:51 +08:00
YunaiV 88677ee121 product:优化商品发布页 2023-10-01 20:16:02 +08:00
YunaiV 3a9668d632 product:优化商品列表的样式、实现代码 2023-10-01 19:44:13 +08:00
owen 3a96812d47 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:20 +08:00
owen 3ab1ed707f 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen 0066d79876 签到:签到后增加用户积分、经验 2023-10-01 09:53:52 +08:00
owen 6508d841f5 Merge remote-tracking branch 'origin/dev' into dev 2023-09-30 22:08:45 +08:00
owen 4b7e57e67d 会员详情,修改会员积分 2023-09-30 15:50:12 +08:00
owen 940a102546 会员:会员详情-推广用户列表 2023-09-30 14:10:15 +08:00
owen b48f19c646 会员:会员详情-优惠券列表 2023-09-30 13:55:42 +08:00
owen 675f3df5cb 会员详情,查询钱包信息 2023-09-30 12:40:21 +08:00
芋道源码 654094b4fd !258 交易统计
Merge pull request !258 from 疯狂的世界/dev
2023-09-30 03:24:07 +00:00
owen 6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
owen c322fb3d0d 统计:交易统计 2023-09-29 21:08:14 +08:00
owen 150c77cff0 fix eslint problems 2023-09-29 16:25:38 +08:00
YunaiV fb94ae9674 trade:退款理由的维护 2023-09-29 13:35:52 +08:00
kehaiyou a438353308 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:38:53 +08:00
kehaiyou b1469669e2 Merge branch 'feature/bpm-delegate'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:37:32 +08:00
YunaiV 04e02ffbd2 trade:分佣界面的微调 2023-09-28 16:38:51 +08:00
YunaiV 74de8e9687 trade:优化交易配置的参数校验 2023-09-28 15:29:15 +08:00
YunaiV 2f82eff526 Merge remote-tracking branch 'origin/dev' into dev 2023-09-27 23:30:48 +08:00
YunaiV 888c1371c6 Merge remote-tracking branch 'origin/master' 2023-09-27 23:30:16 +08:00
YunaiV c6031ba2b2 增加 user detail 的 todo 2023-09-27 23:30:09 +08:00
芋道源码 65047b93a4 !250 【工作流】委派
Merge pull request !250 from Youkehai/feature/bpm-delegate
2023-09-25 12:10:52 +00:00
绮梦 f832d26a0d 站内信测试增加 Member 用户类型支持 2023-09-25 16:04:32 +08:00
shizhong 361e4fadda 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:25:33 +08:00
youkehai 0fba0d9a6a feat: 对齐后端-工作流委派的参数 2023-09-25 11:31:13 +08:00
youkehai 2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-25 09:37:22 +08:00
芋道源码 b9881f2941 !252 分销:Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
2023-09-25 00:37:31 +00:00
owen a5dd7f4a81 分销:修正分享海报 2023-09-24 23:18:50 +08:00
owen 2c22ef8ef1 分销:重命名提现类型字段 2023-09-24 22:32:10 +08:00
kehaiyou 20fe343646 feat: 【工作流】--委派 2023-09-24 15:44:02 +08:00
puhui999 dd5a1f2d43 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-20 16:39:19 +08:00
puhui999 8778f5746f spu:分佣属性和分佣保持一致 2023-09-13 10:17:14 +08:00
895 changed files with 80973 additions and 6000 deletions

No files matched your search

+3
View File
@@ -13,5 +13,8 @@ VITE_APP_TENANT_ENABLE=true
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true
# 文档地址的开关
VITE_APP_DOCALERT_ENABLE=true
# 百度统计
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
-19
View File
@@ -1,19 +0,0 @@
# 本地开发环境
NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
# 接口地址
VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/
+18 -13
View File
@@ -1,31 +1,36 @@
# 开发环境
NODE_ENV=development
# 开发环境:本地只启动前端项目,依赖开发环境(后端、APP)
NODE_ENV=production
VITE_DEV=false
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
# 接口地址
VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/
# 是否删除debugger
VITE_DROP_DEBUGGER=true
VITE_DROP_DEBUGGER=false
# 是否删除console.log
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=false
VITE_SOURCEMAP=true
# 打包路径
VITE_BASE_PATH=/
# 输出路径
VITE_OUT_DIR=dist
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true
-34
View File
@@ -1,34 +0,0 @@
# 本地开发环境
NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# 上传路径
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
# 接口地址
VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/
# 项目本地运行端口号, 与.vscode/launch.json配合
VITE_PORT=80
# 是否删除debugger
VITE_DROP_DEBUGGER=false
# 是否删除console.log
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=true
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false
+33
View File
@@ -0,0 +1,33 @@
# 本地开发环境:本地启动所有项目(前端、后端、APP)时使用,不依赖外部环境
NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口地址
VITE_API_URL=/admin-api
# 是否删除debugger
VITE_DROP_DEBUGGER=false
# 是否删除console.log
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=false
# 打包路径
VITE_BASE_PATH=/
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://localhost:3000'
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false
+7 -5
View File
@@ -1,4 +1,4 @@
# 生产环境
# 生产环境:只在打包时使用
NODE_ENV=production
VITE_DEV=false
@@ -6,12 +6,11 @@ VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://localhost:48080'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
@@ -28,4 +27,7 @@ VITE_SOURCEMAP=false
VITE_BASE_PATH=/
# 输出路径
VITE_OUT_DIR=dist-pro
VITE_OUT_DIR=dist-prod
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
+6 -4
View File
@@ -1,4 +1,4 @@
# 生产环境
# 预发布环境:只在打包时使用
NODE_ENV=production
VITE_DEV=false
@@ -6,12 +6,11 @@ VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
@@ -29,3 +28,6 @@ VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'
# 输出路径
VITE_OUT_DIR=dist-stage
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
+7 -5
View File
@@ -1,4 +1,4 @@
# 开发环境
# 测试环境:只在打包时使用
NODE_ENV=production
VITE_DEV=false
@@ -6,12 +6,11 @@ VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://localhost:48080'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
@@ -28,4 +27,7 @@ VITE_SOURCEMAP=false
VITE_BASE_PATH=/admin-ui-vue3/
# 输出路径
VITE_OUT_DIR=dist-dev
VITE_OUT_DIR=dist-test
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
+7 -4
View File
@@ -8,7 +8,6 @@ module.exports = defineConfig({
es6: true
},
parser: 'vue-eslint-parser',
plugins: ['vue'],
parserOptions: {
parser: '@typescript-eslint/parser',
ecmaVersion: 2020,
@@ -22,13 +21,13 @@ module.exports = defineConfig({
'plugin:vue/vue3-recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
'plugin:prettier/recommended',
'plugin:prettier/recommended',
'@unocss'
],
rules: {
'vue/no-setup-props-destructure': 'off',
'vue/script-setup-uses-vars': 'error',
'vue/no-reserved-component-names': 'off',
'vue/no-setup-props-destructure': 'off',
'@typescript-eslint/ban-ts-ignore': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-explicit-any': 'off',
@@ -54,6 +53,7 @@ module.exports = defineConfig({
'vue/attribute-hyphenation': 'off',
'vue/require-default-prop': 'off',
'vue/require-explicit-emits': 'off',
'vue/require-toggle-inside-transition': 'off',
'vue/html-self-closing': [
'error',
{
@@ -67,6 +67,9 @@ module.exports = defineConfig({
}
],
'vue/multi-word-component-names': 'off',
'vue/no-v-html': 'off'
'vue/no-v-html': 'off',
'prettier/prettier': 'off', // 芋艿:默认关闭 prettier 的 ESLint 校验,因为我们使用的是 IDE 的 Prettier 插件
'@unocss/order': 'off', // 芋艿:禁用 unocss 【css】顺序的提示,因为暂时不需要这么严格,警告也有点繁琐
'@unocss/order-attributify': 'off' // 芋艿:禁用 unocss 【属性】顺序的提示,因为暂时不需要这么严格,警告也有点繁琐
}
})
-1
View File
@@ -4,7 +4,6 @@ dist
dist-ssr
*.local
/dist*
*-lock.*
pnpm-debug
auto-*.d.ts
.idea
Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

-1
View File
@@ -3,7 +3,6 @@
"christian-kohler.path-intellisense",
"vscode-icons-team.vscode-icons",
"davidanson.vscode-markdownlint",
"stylelint.vscode-stylelint",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"mrmlnc.vscode-less",
+7 -7
View File
@@ -1,5 +1,5 @@
{
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.tsdk": "node_modules/typescript/lib",
"npm.packageManager": "pnpm",
"editor.tabSize": 2,
"prettier.printWidth": 100, // 超过最大值换行
@@ -83,18 +83,15 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"[vue]": {
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.fixAll.stylelint": true
}
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
},
"i18n-ally.localesPaths": ["src/locales"],
"i18n-ally.keystyle": "nested",
"i18n-ally.sortKeys": true,
"i18n-ally.namespace": true,
"i18n-ally.namespace": false,
"i18n-ally.enabledParsers": ["ts"],
"i18n-ally.sourceLanguage": "en",
"i18n-ally.displayLanguage": "zh-CN",
@@ -105,6 +102,7 @@
"codemirror",
"commitlint",
"cropperjs",
"echart",
"echarts",
"esnext",
"esno",
@@ -119,10 +117,12 @@
"sider",
"sortablejs",
"stylelint",
"svgs",
"unocss",
"unplugin",
"unref",
"videojs",
"VITE",
"vitejs",
"vueuse",
"wangeditor",
+97 -67
View File
@@ -38,15 +38,15 @@
| 框架 | 说明 | 版本 |
|----------------------------------------------------------------------|------------------|--------|
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 |
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.14 |
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.8 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.5.0 |
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.4.2 |
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 |
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 |
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.4.1 |
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.7 |
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.6.1 |
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.6.5 |
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.1 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.57.4 |
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
@@ -66,6 +66,18 @@
| ESLint | 脚本代码检查 |
| DotENV | env 文件高亮 |
## 🔥 后端架构
支持 Spring Boot、Spring Cloud 两种架构:
① Spring Boot 单体架构:<https://github.com/YunaiV/ruoyi-vue-pro>
![架构图](/.image/common/ruoyi-vue-pro-architecture.png)
② Spring Cloud 微服务架构:<https://github.com/YunaiV/yudao-cloud>
![架构图](/.image/common/yudao-cloud-architecture.png)
## 内置功能
系统内置多种多种业务功能,可以用于快速你的业务系统:
@@ -78,6 +90,8 @@
* 数据报表
* 商城系统
* 微信公众号
* ERP 系统
* CRM 系统
### 系统功能
@@ -103,6 +117,8 @@
| 🚀 | 应用管理 | 管理 SSO 单点登录的应用,支持多种 OAuth2 授权方式 |
| 🚀 | 地区管理 | 展示省份、城市、区镇等城市信息,支持 IP 对应城市 |
![功能图](/.image/common/system-feature.png)
### 工作流程
| | 功能 | 描述 |
@@ -115,6 +131,8 @@
| 🚀 | 已办任务 | 查看自己【已】审批的工作任务,未来会支持回退操作 |
| 🚀 | OA 请假 | 作为业务自定义接入工作流的使用示例,只需创建请求对应的工作流程,即可进行审批 |
![功能图](/.image/common/bpm-feature.png)
### 支付系统
| | 功能 | 描述 |
@@ -128,27 +146,27 @@ ps:核心功能已经实现,正在对接微信小程序中...
### 基础设施
| | 功能 | 描述 |
|-----|----------|----------------------------------------------|
| 🚀 | 代码生成 | 前后端代码的生成(Java、Vue、SQL、单元测试),支持 CRUD 下载 |
| 🚀 | 系统接口 | 基于 Swagger 自动生成相关的 RESTful API 接口文档 |
| 🚀 | 数据库文档 | 基于 Screw 自动生成数据库文档,支持导出 Word、HTML、MD 格式 |
| | 表单构建 | 拖动表单元素生成相应的 HTML 代码,支持导出 JSON、Vue 文件 |
| 🚀 | 配置管理 | 对系统动态配置常用参数,支持 SpringBoot 加载 |
| ⭐️ | 定时任务 | 在线(添加、修改、删除)任务调度包含执行结果日志 |
| 🚀 | 文件服务 | 支持将文件存储到 S3(MinIO、阿里云、腾讯云、七牛云)、本地、FTP、数据库等 |
| 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 |
| | MySQL 监控 | 监视当前系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈 |
| | Redis 监控 | 监控 Redis 数据库的使用情况,使用的 Redis Key 管理 |
| 🚀 | 消息队列 | 基于 Redis 实现消息队列,Stream 提供集群消费,Pub/Sub 提供广播消费 |
| 🚀 | Java 监控 | 基于 Spring Boot Admin 实现 Java 应用的监控 |
| 🚀 | 链路追踪 | 接入 SkyWalking 组件,实现链路追踪 |
| 🚀 | 日志中心 | 接入 SkyWalking 组件,实现日志中心 |
| 🚀 | 分布式锁 | 基于 Redis 实现分布式锁,满足并发场景 |
| 🚀 | 幂等组件 | 基于 Redis 实现幂等组件,解决重复请求问题 |
| 🚀 | 服务保障 | 基于 Resilience4j 实现服务的稳定性,包括限流、熔断等功能 |
| 🚀 | 日志服务 | 轻量级日志中心,查看远程服务器的日志 |
| 🚀 | 单元测试 | 基于 JUnit + Mockito 实现单元测试,保证功能的正确性、代码的质量等 |
| | 功能 | 描述 |
|----|----------|----------------------------------------------|
| 🚀 | 代码生成 | 前后端代码的生成(Java、Vue、SQL、单元测试),支持 CRUD 下载 |
| 🚀 | 系统接口 | 基于 Swagger 自动生成相关的 RESTful API 接口文档 |
| 🚀 | 数据库文档 | 基于 Screw 自动生成数据库文档,支持导出 Word、HTML、MD 格式 |
| | 表单构建 | 拖动表单元素生成相应的 HTML 代码,支持导出 JSON、Vue 文件 |
| 🚀 | 配置管理 | 对系统动态配置常用参数,支持 SpringBoot 加载 |
| ⭐️ | 定时任务 | 在线(添加、修改、删除)任务调度包含执行结果日志 |
| 🚀 | 文件服务 | 支持将文件存储到 S3(MinIO、阿里云、腾讯云、七牛云)、本地、FTP、数据库等 |
| 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 |
| | MySQL 监控 | 监视当前系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈 |
| | Redis 监控 | 监控 Redis 数据库的使用情况,使用的 Redis Key 管理 |
| 🚀 | 消息队列 | 基于 Redis 实现消息队列,Stream 提供集群消费,Pub/Sub 提供广播消费 |
| 🚀 | Java 监控 | 基于 Spring Boot Admin 实现 Java 应用的监控 |
| 🚀 | 链路追踪 | 接入 SkyWalking 组件,实现链路追踪 |
| 🚀 | 日志中心 | 接入 SkyWalking 组件,实现日志中心 |
| 🚀 | 服务保障 | 基于 Redis 实现分布式锁、幂等、限流功能,满足高并发场景 |
| 🚀 | 日志服务 | 轻量级日志中心,查看远程服务器的日志 |
| 🚀 | 单元测试 | 基于 JUnit + Mockito 实现单元测试,保证功能的正确性、代码的质量等 |
![功能图](/.image/common/infra-feature.png)
### 数据报表
@@ -174,62 +192,74 @@ ps:核心功能已经实现,正在对接微信小程序中...
### 商城系统
建设中...
![功能图](/.image/common/mall-feature.png)
![功能图](http://static.iocoder.cn/mall%20%E5%8A%9F%E8%83%BD%E5%9B%BE-min.png)
![功能图](/.image/common/mall-preview.png)
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-admin-min.gif)
_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入芋道快速开发平台_
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-h5-min.gif)
演示地址:<https://doc.iocoder.cn/mall-preview/>
### ERP 系统
![功能图](/.image/common/erp-feature.png)
演示地址:<https://doc.iocoder.cn/erp-preview/>
### CRM 系统
![功能图](/.image/common/crm-feature.png)
演示地址:<https://doc.iocoder.cn/crm-preview/>
## 🐷 演示图
### 系统功能
| 模块 | biu | biu | biu |
|------------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
| 登录 & 首页 | ![登录](https://static.iocoder.cn/images/ruoyi-vue-pro/登录.jpg?imageView2/2/format/webp/w/1280) | ![首页](https://static.iocoder.cn/images/ruoyi-vue-pro/首页.jpg?imageView2/2/format/webp/w/1280) | ![个人中心](https://static.iocoder.cn/images/ruoyi-vue-pro/个人中心.jpg?imageView2/2/format/webp/w/1280) |
| 用户 & 应用 | ![用户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/用户管理.jpg?imageView2/2/format/webp/w/1280) | ![令牌管理](https://static.iocoder.cn/images/ruoyi-vue-pro/令牌管理.jpg?imageView2/2/format/webp/w/1280) | ![应用管理](https://static.iocoder.cn/images/ruoyi-vue-pro/应用管理.jpg?imageView2/2/format/webp/w/1280) |
| 租户 & 套餐 | ![租户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/租户管理.jpg?imageView2/2/format/webp/w/1280) | ![租户套餐](https://static.iocoder.cn/images/ruoyi-vue-pro/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](https://static.iocoder.cn/images/ruoyi-vue-pro/部门管理.jpg?imageView2/2/format/webp/w/1280) | ![岗位管理](https://static.iocoder.cn/images/ruoyi-vue-pro/岗位管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 菜单 & 角色 | ![菜单管理](https://static.iocoder.cn/images/ruoyi-vue-pro/菜单管理.jpg?imageView2/2/format/webp/w/1280) | ![角色管理](https://static.iocoder.cn/images/ruoyi-vue-pro/角色管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 审计日志 | ![操作日志](https://static.iocoder.cn/images/ruoyi-vue-pro/操作日志.jpg?imageView2/2/format/webp/w/1280) | ![登录日志](https://static.iocoder.cn/images/ruoyi-vue-pro/登录日志.jpg?imageView2/2/format/webp/w/1280) | - |
| 短信 | ![短信渠道](https://static.iocoder.cn/images/ruoyi-vue-pro/短信渠道.jpg?imageView2/2/format/webp/w/1280) | ![短信模板](https://static.iocoder.cn/images/ruoyi-vue-pro/短信模板.jpg?imageView2/2/format/webp/w/1280) | ![短信日志](https://static.iocoder.cn/images/ruoyi-vue-pro/短信日志.jpg?imageView2/2/format/webp/w/1280) |
| 字典 & 敏感词 | ![字典类型](https://static.iocoder.cn/images/ruoyi-vue-pro/字典类型.jpg?imageView2/2/format/webp/w/1280) | ![字典数据](https://static.iocoder.cn/images/ruoyi-vue-pro/字典数据.jpg?imageView2/2/format/webp/w/1280) | ![敏感词](https://static.iocoder.cn/images/ruoyi-vue-pro/敏感词.jpg?imageView2/2/format/webp/w/1280) |
| 错误码 & 通知 | ![错误码管理](https://static.iocoder.cn/images/ruoyi-vue-pro/错误码管理.jpg?imageView2/2/format/webp/w/1280) | ![通知公告](https://static.iocoder.cn/images/ruoyi-vue-pro/通知公告.jpg?imageView2/2/format/webp/w/1280) | - |
| 模块 | biu | biu | biu |
|----------|-----------------------------|---------------------------|--------------------------|
| 登录 & 首页 | ![登录](/.image/登录.jpg) | ![首页](/.image/首页.jpg) | ![个人中心](/.image/个人中心.jpg) |
| 用户 & 应用 | ![用户管理](/.image/用户管理.jpg) | ![令牌管理](/.image/令牌管理.jpg) | ![应用管理](/.image/应用管理.jpg) |
| 租户 & 套餐 | ![租户管理](/.image/租户管理.jpg) | ![租户套餐](/.image/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](/.image/部门管理.jpg) | ![岗位管理](/.image/岗位管理.jpg) | - |
| 菜单 & 角色 | ![菜单管理](/.image/菜单管理.jpg) | ![角色管理](/.image/角色管理.jpg) | - |
| 审计日志 | ![操作日志](/.image/操作日志.jpg) | ![登录日志](/.image/登录日志.jpg) | - |
| 短信 | ![短信渠道](/.image/短信渠道.jpg) | ![短信模板](/.image/短信模板.jpg) | ![短信日志](/.image/短信日志.jpg) |
| 字典 & 敏感词 | ![字典类型](/.image/字典类型.jpg) | ![字典数据](/.image/字典数据.jpg) | ![敏感词](/.image/敏感词.jpg) |
| 错误码 & 通知 | ![错误码管理](/.image/错误码管理.jpg) | ![通知公告](/.image/通知公告.jpg) | - |
### 工作流程
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 流程模型 | ![流程模型-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-列表.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-设计](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-设计.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-定义](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-定义.jpg?imageView2/2/format/webp/w/1280) |
| 表单 & 分组 | ![流程表单](https://static.iocoder.cn/images/ruoyi-vue-pro/流程表单.jpg?imageView2/2/format/webp/w/1280) | ![用户分组](https://static.iocoder.cn/images/ruoyi-vue-pro/用户分组.jpg?imageView2/2/format/webp/w/1280) | - |
| 我的流程 | ![我的流程-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-列表.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-发起.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-详情.jpg?imageView2/2/format/webp/w/1280) |
| 待办 & 已办 | ![任务列表-审批](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-审批.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-待办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-待办.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-已办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-已办.jpg?imageView2/2/format/webp/w/1280) |
| OA 请假 | ![OA请假-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-列表.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-发起.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-详情.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------|---------------------------------|---------------------------------|---------------------------------|
| 流程模型 | ![流程模型-列表](/.image/流程模型-列表.jpg) | ![流程模型-设计](/.image/流程模型-设计.jpg) | ![流程模型-定义](/.image/流程模型-定义.jpg) |
| 表单 & 分组 | ![流程表单](/.image/流程表单.jpg) | ![用户分组](/.image/用户分组.jpg) | - |
| 我的流程 | ![我的流程-列表](/.image/我的流程-列表.jpg) | ![我的流程-发起](/.image/我的流程-发起.jpg) | ![我的流程-详情](/.image/我的流程-详情.jpg) |
| 待办 & 已办 | ![任务列表-审批](/.image/任务列表-审批.jpg) | ![任务列表-待办](/.image/任务列表-待办.jpg) | ![任务列表-已办](/.image/任务列表-已办.jpg) |
| OA 请假 | ![OA请假-列表](/.image/OA请假-列表.jpg) | ![OA请假-发起](/.image/OA请假-发起.jpg) | ![OA请假-详情](/.image/OA请假-详情.jpg) |
### 基础设施
| 模块 | biu | biu | biu |
|---------------|----------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------|
| 代码生成 | ![代码生成](https://static.iocoder.cn/images/ruoyi-vue-pro/代码生成.jpg?imageView2/2/format/webp/w/1280) | ![生成效果](https://static.iocoder.cn/images/ruoyi-vue-pro/生成效果.jpg?imageView2/2/format/webp/w/1280) | - |
| 文档 | ![系统接口](https://static.iocoder.cn/images/ruoyi-vue-pro/系统接口.jpg?imageView2/2/format/webp/w/1280) | ![数据库文档](https://static.iocoder.cn/images/ruoyi-vue-pro/数据库文档.jpg?imageView2/2/format/webp/w/1280) | - |
| 文件 & 配置 | ![文件配置](https://static.iocoder.cn/images/ruoyi-vue-pro/文件配置.jpg?imageView2/2/format/webp/w/1280) | ![文件管理](https://static.iocoder.cn/images/ruoyi-vue-pro/文件管理2.jpg?imageView2/2/format/webp/w/1280) | ![配置管理](https://static.iocoder.cn/images/ruoyi-vue-pro/配置管理.jpg?imageView2/2/format/webp/w/1280) |
| 定时任务 | ![定时任务](https://static.iocoder.cn/images/ruoyi-vue-pro/定时任务.jpg?imageView2/2/format/webp/w/1280) | ![任务日志](https://static.iocoder.cn/images/ruoyi-vue-pro/任务日志.jpg?imageView2/2/format/webp/w/1280) | - |
| API 日志 | ![访问日志](https://static.iocoder.cn/images/ruoyi-vue-pro/访问日志.jpg?imageView2/2/format/webp/w/1280) | ![错误日志](https://static.iocoder.cn/images/ruoyi-vue-pro/错误日志.jpg?imageView2/2/format/webp/w/1280) | - |
| MySQL & Redis | ![MySQL](https://static.iocoder.cn/images/ruoyi-vue-pro/MySQL.jpg?imageView2/2/format/webp/w/1280) | ![Redis](https://static.iocoder.cn/images/ruoyi-vue-pro/Redis.jpg?imageView2/2/format/webp/w/1280) | - |
| 监控平台 | ![Java监控](https://static.iocoder.cn/images/ruoyi-vue-pro/Java监控.jpg?imageView2/2/format/webp/w/1280) | ![链路追踪](https://static.iocoder.cn/images/ruoyi-vue-pro/链路追踪.jpg?imageView2/2/format/webp/w/1280) | ![日志中心](https://static.iocoder.cn/images/ruoyi-vue-pro/日志中心.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------------|-------------------------------|-----------------------------|---------------------------|
| 代码生成 | ![代码生成](/.image/代码生成.jpg) | ![生成效果](/.image/生成效果.jpg) | - |
| 文档 | ![系统接口](/.image/系统接口.jpg) | ![数据库文档](/.image/数据库文档.jpg) | - |
| 文件 & 配置 | ![文件配置](/.image/文件配置.jpg) | ![文件管理](/.image/文件管理2.jpg) | ![配置管理](/.image/配置管理.jpg) |
| 定时任务 | ![定时任务](/.image/定时任务.jpg) | ![任务日志](/.image/任务日志.jpg) | - |
| API 日志 | ![访问日志](/.image/访问日志.jpg) | ![错误日志](/.image/错误日志.jpg) | - |
| MySQL & Redis | ![MySQL](/.image/MySQL.jpg) | ![Redis](/.image/Redis.jpg) | - |
| 监控平台 | ![Java监控](/.image/Java监控.jpg) | ![链路追踪](/.image/链路追踪.jpg) | ![日志中心](/.image/日志中心.jpg) |
### 支付系统
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 商家 & 应用 | ![商户信息](https://static.iocoder.cn/images/ruoyi-vue-pro/商户信息.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-列表.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 支付 & 退款 | ![支付订单](https://static.iocoder.cn/images/ruoyi-vue-pro/支付订单.jpg?imageView2/2/format/webp/w/1280) | ![退款订单](https://static.iocoder.cn/images/ruoyi-vue-pro/退款订单.jpg?imageView2/2/format/webp/w/1280) | --- |
| 模块 | biu | biu | biu |
|---------|---------------------------|---------------------------------|---------------------------------|
| 商家 & 应用 | ![商户信息](/.image/商户信息.jpg) | ![应用信息-列表](/.image/应用信息-列表.jpg) | ![应用信息-编辑](/.image/应用信息-编辑.jpg) |
| 支付 & 退款 | ![支付订单](/.image/支付订单.jpg) | ![退款订单](/.image/退款订单.jpg) | --- |
### 数据报表
| 模块 | biu | biu | biu |
|-------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|
| 报表设计器 | ![数据报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-数据报表.jpg?imageView2/2/format/webp/w/1280) | ![图形报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-图形报表.jpg?imageView2/2/format/webp/w/1280) | ![报表设计器-打印设计](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-打印设计.jpg?imageView2/2/format/webp/w/1280) |
| 大屏设计器 | ![大屏列表](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-列表.jpg?imageView2/2/format/webp/w/1280) | ![大屏预览](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-预览.jpg?imageView2/2/format/webp/w/1280) | ![大屏编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|-------|---------------------------------|---------------------------------|---------------------------------------|
| 报表设计器 | ![数据报表](/.image/报表设计器-数据报表.jpg) | ![图形报表](/.image/报表设计器-图形报表.jpg) | ![报表设计器-打印设计](/.image/报表设计器-打印设计.jpg) |
| 大屏设计器 | ![大屏列表](/.image/大屏设计器-列表.jpg) | ![大屏预览](/.image/大屏设计器-预览.jpg) | ![大屏编辑](/.image/大屏设计器-编辑.jpg) |
Loaded 100 of 895 files, more files were not shown because too many files have changed in this diff. Show more