Commit Graph

6422 Commits

Author SHA1 Message Date
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
dhb52
d23dfd4276 feat: CRM/backlog 提醒数量 2024-02-18 00:03:11 +08:00
YunaiV
21452af780 2.0.1 版本发布准备 2024-02-17 23:44:23 +08:00
YunaiV
3b2200ad80 2.0.1 版本发布准备 2024-02-17 23:26:50 +08:00
YunaiV
169c1e4907 2.0.1 版本发布准备 2024-02-17 21:40:50 +08:00
YunaiV
20f8cb1606 2.0.1 版本发布准备 2024-02-17 21:01:59 +08:00
YunaiV
63f322cb17 📖 CRM:code review 前端直接上传 2024-02-17 20:35:48 +08:00
芋道源码
b2782e1d9a
!865 基础设施:前端直连上传文件
Merge pull request !865 from 疯狂的世界/develop
2024-02-17 11:21:06 +00:00
YunaiV
0fba56cda8 📖 CRM:code review 合同逻辑 2024-02-17 19:14:48 +08:00
YunaiV
c6041da3c4 Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImplTest.java
2024-02-17 18:17:32 +08:00
YunaiV
c40ea1eaa6 📖 CRM:code review 商业智能的排行版 2024-02-17 18:14:28 +08:00
芋道源码
bba32c6ba3
!866 新增:CRM 商业智能,其他排名接口
Merge pull request !866 from 安浩浩/develop
2024-02-17 10:06:18 +00:00
YunaiV
5955f39e24 📖 CRM:code review 待办项目的实现 2024-02-17 18:02:48 +08:00
芋道源码
a03e661a56
!868 feat: 待回款提醒,即将到期的合同,待审核回款
Merge pull request !868 from dhb52/develop
2024-02-17 08:44:33 +00:00
YunaiV
c777237d93 增加 ERP 系统的介绍 2024-02-17 10:11:04 +08:00
YunaiV
94153cb59e 增加 ERP 系统的介绍 2024-02-17 10:10:09 +08:00
dhb52
a5d33692c1 refactor: TodayCustomer利用CrmCustomerController#getCustomerPage 2024-02-16 22:45:37 +08:00
dhb52
72113bbbc6 Merge remote-tracking branch 'upstream/develop' into develop 2024-02-16 22:16:44 +08:00
YunaiV
eefd787de6 ERP:初始化 receipt 收款单的逻辑 100% 2024-02-16 08:13:21 +08:00
YunaiV
f93bad282f ERP:初始化 receipt 收款单的逻辑 30% 2024-02-15 19:28:54 +08:00
YunaiV
33f654b73b ERP:销售订单的 receiptPrice 调整,为接入财务的收款单做准备 2024-02-15 09:16:11 +08:00