Commit Graph

164 Commits

Author SHA1 Message Date
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
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
YunaiV
a531ba2902 CRM:增加回款超过合同的退款金额校验 2024-02-26 09:27:13 +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
91c179029f CRM:完善回款 plan 新增/修改 2024-02-25 16:09:16 +08:00
YunaiV
0b0830f445 CRM:增加合同配置表 2024-02-24 16:51:16 +08:00
YunaiV
3f8fa6b1bc CRM:简化 CRM 数据权限的实现 2024-02-24 11:14:30 +08:00
YunaiV
e53a0ca884 CRM:code review 客户导入 2024-02-23 18:50:22 +08:00
puhui999
be2431b73b CRM: 完善回款审批逻辑 2024-02-23 14:37:03 +08:00
puhui999
eddd0a8801 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/contract/CrmContractServiceImpl.java
2024-02-23 14:16:24 +08:00
YunaiV
4066ad3e1a CRM:完善合同的审批逻辑 2024-02-23 12:59:16 +08:00
puhui999
0a97ff03c6 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/contract/CrmContractServiceImpl.java
2024-02-23 12:16:37 +08:00
puhui999
c6b133d919 CRM: 完善回款 2024-02-23 12:14:56 +08:00
puhui999
b3cfad9396 CRM: 完善回款计划 2024-02-23 10:42:36 +08:00
YunaiV
d604e76d16 CRM:完善合同的跟进记录实现 2024-02-23 09:31:41 +08:00
YunaiV
c97c9f882e CRM:完成商机状态的变更 2024-02-22 20:41:28 +08:00
YunaiV
d9b0c9b4cf CRM:完善商机的跟进记录 2024-02-21 23:37:10 +08:00
puhui999
1ad5602a19 Merge remote-tracking branch 'yudao/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
2024-02-21 22:42:41 +08:00
YunaiV
f76a7cd941 CRM:重构商机状态的代码实现,不调整表结构 2024-02-21 20:10:13 +08:00
YunaiV
e01dda9baf CRM:完善商机的列表 2024-02-21 18:45:10 +08:00
puhui999
02b63de808 CRM:完善 review 提到的问题 2024-02-21 14:27:25 +08:00
YunaiV
7dd35f3295 CRM:完善联系人的编辑、详情 2024-02-20 23:32:26 +08:00
YunaiV
b444312ea8 CRM:优化客户的过期到公海的逻辑 2024-02-20 19:07:48 +08:00
YunaiV
3e6524932b CRM:优化客户的详情、更新成交状态 2024-02-20 12:55:44 +08:00
YunaiV
69a974ef02 📖 CRM:线索的跟进逻辑 2024-02-19 22:47:28 +08:00
YunaiV
38e410cae0 📖 CRM:线索的转化逻辑 2024-02-19 20:41:10 +08:00
puhui999
9caaa96e5b CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品 2024-02-08 11:53:23 +08:00
puhui999
59e6f23788 CRM-CONTRACT: 完善 TODO 2024-02-03 12:29:28 +08:00
芋道源码
acb8d3f23b
!858 CRM-客户: 完善客户导入
Merge pull request !858 from puhui999/develop
2024-01-30 04:41:14 +00:00
puhui999
4418a7bebc CRM-合同:完善新增合同插入关联的商品 2024-01-28 20:15:11 +08:00
dhb52
5d8ca19b17 feat: CRM-backlog-待进入公海的客户 2024-01-28 00:22:58 +08:00
puhui999
4605e93105 CRM-客户: 完善客户导入 2024-01-27 14:30:30 +08:00
puhui999
ca9f3c522d CRM-线索:完善操作日志 2024-01-22 22:46:52 +08:00
YunaiV
206899bfc0 📖 CRM:code review 待办事项 2024-01-22 12:23:24 +08:00
dhb52
231fd68435 Merge remote-tracking branch 'upstream/develop' into crm-msg 2024-01-20 22:03:32 +08:00
min
604611e1d2 CRM:【线索】补充相关日志 2024-01-20 15:38:55 +08:00
YunaiV
ca55282516 CRM:商机 code review 2024-01-18 12:06:14 +08:00
puhui999
ff9cef6a92 CRM: 完善跟进,新增跟进信息处理器 handler 接口✔ 2024-01-17 12:00:51 +08:00
dhb52
08e23a7dc4 wip: style-fix 2024-01-15 22:47:46 +08:00
YunaiV
9819e05d4e Merge branch 'develop' of https://gitee.com/aberizofur/ruoyi-vue-pro into develop 2024-01-15 21:34:47 +08:00
YunaiV
a886ad9785 📖 CRM:跟进记录的 code review 2024-01-15 21:30:32 +08:00
lzxhqs
510b4fd3de 商机模块合并代码 2024-01-15 17:50:46 +08:00
dhb52
4bd97c4baf wip: 根据code review优化代码 2024-01-15 17:41:21 +08:00
芋道源码
e64e60c711
!832 CRM: 完善一些 TODO
Merge pull request !832 from puhui999/develop
2024-01-15 04:37:24 +00:00
YunaiV
9b7f6cfbac 📖 CRM:线索的 code review 2024-01-15 12:29:57 +08:00
芋道源码
4ca1f72d4f
!829 CRM:【线索】
Merge pull request !829 from Minh-X/develop
2024-01-15 04:22:23 +00:00
dhb52
4558ecd836 wip: 待办事项 2024-01-14 22:45:16 +08:00
lzxhqs
f361d05940 商机模块 2024-01-14 09:52:35 +08:00