Commit Graph

7492 Commits

Author SHA1 Message Date
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
芋道源码
67b091620d
!879 完善 Excel 导入模版下拉选择生成实现
Merge pull request !879 from puhui999/develop
2024-02-24 04:58:14 +00: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
芋道源码
a64da48aa3
!876 CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
Merge pull request !876 from puhui999/develop
2024-02-23 07:01:08 +00: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
5892c8897f CRM: 流程状态转换封装 2024-02-23 12:20:08 +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
b0def8b586 CRM:完善合同的新增、修改实现 2024-02-23 00:04:57 +08:00
YunaiV
ef26b5e8dc CRM:完善合同的列表实现 2024-02-22 21:54:06 +08:00
puhui999
872fe53585 Merge remote-tracking branch 'yudao/develop' into develop 2024-02-22 21:26:28 +08:00
YunaiV
c97c9f882e CRM:完成商机状态的变更 2024-02-22 20:41:28 +08:00
puhui999
0f2d974e9c Merge remote-tracking branch 'yudao/develop' into develop 2024-02-22 11:08:11 +08:00
puhui999
41b8575b8d CRM:完善客户导入 2024-02-22 11:07:34 +08:00
YunaiV
740e9297fa CRM:完善商机和联系人之间的关联 2024-02-22 09:35:57 +08:00
puhui999
b26eb6266f CRM:新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择 2024-02-22 00:58:50 +08:00
YunaiV
d9b0c9b4cf CRM:完善商机的跟进记录 2024-02-21 23:37:10 +08:00
芋道源码
df2441def9
!875 完善 review 提到的问题
Merge pull request !875 from puhui999/develop
2024-02-21 14:57:22 +00: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
77f98c4d12 CRM:完善商机的新增、修改逻辑 2024-02-21 21:49:49 +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
66a34a6d90 CRM:完善联系人的列表 2024-02-20 21:18:45 +08:00
YunaiV
4b41c3c692 CRM:优化客户的 backlog 逻辑 2024-02-20 20:19:59 +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
芋道源码
bac476c131
!871 fix: 根据code-review修改Crm Backlog
Merge pull request !871 from dhb52/develop
2024-02-19 14:10:17 +00:00
YunaiV
38e410cae0 📖 CRM:线索的转化逻辑 2024-02-19 20:41:10 +08:00
YunaiV
fe330482b3 📖 CRM:线索 clue 新增/修改的完善 2024-02-19 19:02:12 +08:00
YunaiV
49bc70ed82 📖 CRM:线索 clue 列表的完善 2024-02-19 13:02:41 +08:00
dhb52
dca262c64b fix: 根据code-review修改 2024-02-18 22:58:23 +08:00
YunaiV
1bfb406041 📖 CRM:code review 待提醒逻辑 2024-02-18 21:47:36 +08:00
芋道源码
51f52ff4b7
!870 feat: CRM/backlog 提醒数量
Merge pull request !870 from dhb52/develop
2024-02-18 13:27:44 +00:00
YunaiV
4bf4432f93 CRM:单测暂时不写 2024-02-18 21:11:43 +08:00
YunaiV
9ea7bde751 📖 ERP:增加 ERP 首页的统计 2024-02-18 19:05:40 +08:00
dhb52
1ba2b7b600 fix: Customer,Clue增加followUpStatus自动查询 2024-02-18 00:21:10 +08:00
dhb52
cd1e73cc3f Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
2024-02-18 00:05:24 +08:00