Commit Graph

404 Commits

Author SHA1 Message Date
YunaiV
1f35ef59d1 CRM:code review excel 导出的重构 2024-03-02 00:25:51 +08:00
YunaiV
fc7734319b Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
2024-03-01 23:46:50 +08:00
YunaiV
379bd95840 CRM:code review 客户分析(客户总量分析) 2024-03-01 23:37:07 +08:00
芋道源码
2bf5c7a701
!889 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !889 from dhb52/develop
2024-03-01 14:21:40 +00:00
YunaiV
dda0909843 🎉 2.0.1 版本发布! 2024-03-01 20:01:16 +08:00
zhanhong
814acb83ae fix:跟进记录分页不显示商机 2024-03-01 09:28:06 +08:00
YunaiV
8ff710e49d 同步 master 的一些 pr 代码变更 2024-03-01 09:00:43 +08:00
dhb52
34f68ce4c6 feat: CRM/数据统计/员工客户分析 初稿 2024-03-01 00:10:23 +08:00
dhb52
fbb624d826 feat: CRM/数据统计/员工客户分析/客户跟进次数分析 2024-02-28 23:07:38 +08:00
YunaiV
8b6bc7c54e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-02-28 23:04:18 +08:00
芋道源码
b135314482
!890 修复:CRM 更新回款报错、待办事项中即将到期的合同查询报错、新增商机产品不显示
Merge pull request !890 from 李占宏/develop
2024-02-28 14:56:07 +00:00
YunaiV
1f4889c68e 全局:将 dict 组件,融合到 excel 组件里,减少 starter 2024-02-28 21:42:32 +08:00
dhb52
a0b413b3a3 refactor: CRM/数据统计/排行榜 重命名 2024-02-28 21:41:53 +08:00
dhb52
7d120a2f36 feat: CRM/数据统计/客户总量分析 2024-02-28 21:41:10 +08:00
puhui999
720b54c353 CRM: 完善回款操作日志 2024-02-28 11:25:06 +08:00
zhanhong
b94cd08772 修复:CRM 新增商机产品不显示 CrmProductStatusEnum.ENABLE(1, "上架") CommonStatusEnum.DISABLE(1, "关闭"); 2024-02-28 00:07:51 +08:00
zhanhong
89aca4572d 修复:CRM 合同配置不提醒,待办事项中即将到期的合同查询报错 2024-02-28 00:00:23 +08:00
zhanhong
8222c3a831 修复:CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId 2024-02-27 23:51:26 +08:00
puhui999
c4ff0a1038 Merge remote-tracking branch 'yudao/develop' into develop 2024-02-27 21:28:23 +08:00
YunaiV
d134bfc4a6 进一步同步 boot 和 cloud 代码,移除多余无用的类 2024-02-27 17:15:55 +08:00
YunaiV
2aade25e78 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-02-26 23:18:03 +08:00
e7c_corp
a6e13da602
fix: 兼容有些21jdk getFirst 会找不到符合的错误
兼容有些21jdk getFirst 会找不到符合的错误
2024-02-26 15:00:50 +00:00
YunaiV
a390fb4519 CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能 2024-02-26 12:55:58 +08:00
YunaiV
088fbb2096 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21 2024-02-26 12:25:55 +08:00
YunaiV
cb8d4e0976 CRM:增加回款的待办事项逻辑 2024-02-26 12:24:40 +08:00
YunaiV
a531ba2902 CRM:增加回款超过合同的退款金额校验 2024-02-26 09:27:13 +08:00
puhui999
dc695e3cda Merge remote-tracking branch 'yudao/develop' into develop 2024-02-25 22:32:37 +08:00
puhui999
462a4ee823 重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择 2024-02-25 22:32:12 +08:00
YunaiV
5fbb423621 CRM:完善合同的待回款金额 2024-02-25 20:50:37 +08:00
YunaiV
33b056e6c4 CRM:完善回款的审批 2024-02-25 20:01:08 +08:00
YunaiV
2890de8103 CRM:完善回款的新增/修改 2024-02-25 18:44:26 +08:00
YunaiV
332eb30b6c CRM:完善回款列表 2024-02-25 16:52:13 +08:00
YunaiV
91c179029f CRM:完善回款 plan 新增/修改 2024-02-25 16:09:16 +08:00
YunaiV
ba47402a7f CRM:完善回款 plan 列表 2024-02-25 09:23:42 +08:00
puhui999
e5c3e69f5c CRM: 完善回款 2024-02-25 02:11:19 +08:00
puhui999
b9ffb7833c Merge remote-tracking branch 'yudao/develop' into develop 2024-02-25 00:39:47 +08:00
puhui999
88cb683752 CRM: 完善回款 2024-02-25 00:36:08 +08:00
YunaiV
c726cd3aff CRM:将 bi 调整成 statistics 2024-02-24 22:26:24 +08:00
YunaiV
cd87f2e4aa CRM:code review 客户导出的实现 2024-02-24 19:57:26 +08:00
YunaiV
e7bd2a568d CRM:增加商机关联联系人 2024-02-24 19:35:32 +08:00
YunaiV
53ebd39c73 CRM:待办事项(接入合同) 2024-02-24 17:55:40 +08:00
YunaiV
0b0830f445 CRM:增加合同配置表 2024-02-24 16:51:16 +08:00
YunaiV
616ae8eaeb Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2024-02-24 16:08:37 +08:00
YunaiV
b6098cff83 CRM:商机接入合同列表 2024-02-24 16:08:07 +08:00
YunaiV
29f1eb2c18 CRM:优化 CRM 跟进记录的实现 2024-02-24 15:46:57 +08:00
puhui999
dd6981d901 Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
2024-02-24 11:44:52 +08:00
puhui999
5dc1dbb3b2 完善 Excel 导入模版下拉选择生成实现 2024-02-24 11:40:58 +08:00
YunaiV
3f8fa6b1bc CRM:简化 CRM 数据权限的实现 2024-02-24 11:14:30 +08:00
YunaiV
a8f6a3d324 CRM:完善 CRM 相关实现 2024-02-24 08:18:10 +08:00
YunaiV
e53a0ca884 CRM:code review 客户导入 2024-02-23 18:50:22 +08:00