zhanhong
|
8222c3a831
|
修复：CRM 更新回款报错 校验可回款金额超过上限 需要用到 不允许修改的字段的getContractId
|
2 years ago |
puhui999
|
c4ff0a1038
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
YunaiV
|
d134bfc4a6
|
✨ 进一步同步 boot 和 cloud 代码，移除多余无用的类
|
2 years ago |
|
YunaiV
|
2aade25e78
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
e7c_corp
|
a6e13da602
|
fix: 兼容有些21jdk getFirst 会找不到符合的错误
兼容有些21jdk getFirst 会找不到符合的错误
|
2 years ago |
|
YunaiV
|
a390fb4519
|
✨ CRM：更新最新代码，支持线索、客户、联系人、商机、合同等功能
|
2 years ago |
|
YunaiV
|
088fbb2096
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
|
YunaiV
|
cb8d4e0976
|
✨ CRM：增加回款的待办事项逻辑
|
2 years ago |
|
YunaiV
|
a531ba2902
|
✨ CRM：增加回款超过合同的退款金额校验
|
2 years ago |
|
puhui999
|
dc695e3cda
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
puhui999
|
462a4ee823
|
重构 excel 导入模版下拉生成逻辑使用字段注解的方式配置下拉选择
|
2 years ago |
|
YunaiV
|
5fbb423621
|
✨ CRM：完善合同的待回款金额
|
2 years ago |
|
YunaiV
|
33b056e6c4
|
✨ CRM：完善回款的审批
|
2 years ago |
|
YunaiV
|
2890de8103
|
✨ CRM：完善回款的新增/修改
|
2 years ago |
|
YunaiV
|
332eb30b6c
|
✨ CRM：完善回款列表
|
2 years ago |
|
YunaiV
|
91c179029f
|
✨ CRM：完善回款 plan 新增/修改
|
2 years ago |
|
YunaiV
|
ba47402a7f
|
✨ CRM：完善回款 plan 列表
|
2 years ago |
|
puhui999
|
e5c3e69f5c
|
CRM: 完善回款
|
2 years ago |
|
puhui999
|
b9ffb7833c
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
puhui999
|
88cb683752
|
CRM: 完善回款
|
2 years ago |
|
YunaiV
|
c726cd3aff
|
✨ CRM：将 bi 调整成 statistics
|
2 years ago |
|
YunaiV
|
cd87f2e4aa
|
✨ CRM：code review 客户导出的实现
|
2 years ago |
|
YunaiV
|
e7bd2a568d
|
✨ CRM：增加商机关联联系人
|
2 years ago |
|
YunaiV
|
53ebd39c73
|
✨ CRM：待办事项（接入合同）
|
2 years ago |
|
YunaiV
|
0b0830f445
|
✨ CRM：增加合同配置表
|
2 years ago |
|
YunaiV
|
616ae8eaeb
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2 years ago |
|
YunaiV
|
b6098cff83
|
✨ CRM：商机接入合同列表
|
2 years ago |
|
YunaiV
|
29f1eb2c18
|
✨ CRM：优化 CRM 跟进记录的实现
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
5dc1dbb3b2
|
完善 Excel 导入模版下拉选择生成实现
|
2 years ago |
|
YunaiV
|
3f8fa6b1bc
|
✨ CRM：简化 CRM 数据权限的实现
|
2 years ago |
|
YunaiV
|
a8f6a3d324
|
✨ CRM：完善 CRM 相关实现
|
2 years ago |
|
YunaiV
|
e53a0ca884
|
✨ CRM：code review 客户导入
|
2 years ago |
|
puhui999
|
be2431b73b
|
CRM: 完善回款审批逻辑
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
4066ad3e1a
|
✨ CRM：完善合同的审批逻辑
|
2 years ago |
|
puhui999
|
5892c8897f
|
CRM: 流程状态转换封装
|
2 years ago |
|
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
|
2 years ago |
|
puhui999
|
c6b133d919
|
CRM: 完善回款
|
2 years ago |
|
puhui999
|
b3cfad9396
|
CRM: 完善回款计划
|
2 years ago |
|
YunaiV
|
d604e76d16
|
✨ CRM：完善合同的跟进记录实现
|
2 years ago |
|
YunaiV
|
b0def8b586
|
✨ CRM：完善合同的新增、修改实现
|
2 years ago |
|
YunaiV
|
ef26b5e8dc
|
✨ CRM：完善合同的列表实现
|
2 years ago |
|
puhui999
|
872fe53585
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
YunaiV
|
c97c9f882e
|
✨ CRM：完成商机状态的变更
|
2 years ago |
|
puhui999
|
0f2d974e9c
|
Merge remote-tracking branch 'yudao/develop' into develop
|
2 years ago |
|
puhui999
|
41b8575b8d
|
CRM：完善客户导入
|
2 years ago |
|
YunaiV
|
740e9297fa
|
✨ CRM：完善商机和联系人之间的关联
|
2 years ago |
|
puhui999
|
b26eb6266f
|
CRM：新增客户导入模版所属行业、客户等级、客户来源、客户地区单元格下拉选择
|
2 years ago |
|
YunaiV
|
d9b0c9b4cf
|
✨ CRM：完善商机的跟进记录
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
77f98c4d12
|
✨ CRM：完善商机的新增、修改逻辑
|
2 years ago |
|
YunaiV
|
f76a7cd941
|
✨ CRM：重构商机状态的代码实现，不调整表结构
|
2 years ago |
|
YunaiV
|
e01dda9baf
|
✨ CRM：完善商机的列表
|
2 years ago |
|
puhui999
|
02b63de808
|
CRM：完善 review 提到的问题
|
2 years ago |
|
YunaiV
|
7dd35f3295
|
✨ CRM：完善联系人的编辑、详情
|
2 years ago |
|
YunaiV
|
66a34a6d90
|
✨ CRM：完善联系人的列表
|
2 years ago |
|
YunaiV
|
4b41c3c692
|
✨ CRM：优化客户的 backlog 逻辑
|
2 years ago |
|
YunaiV
|
b444312ea8
|
✨ CRM：优化客户的过期到公海的逻辑
|
2 years ago |
|
YunaiV
|
3e6524932b
|
✨ CRM：优化客户的详情、更新成交状态
|
2 years ago |
|
YunaiV
|
69a974ef02
|
📖 CRM：线索的跟进逻辑
|
2 years ago |
|
芋道源码
|
bac476c131
|
!871 fix: 根据code-review修改Crm Backlog
Merge pull request !871 from dhb52/develop
|
2 years ago |
|
YunaiV
|
38e410cae0
|
📖 CRM：线索的转化逻辑
|
2 years ago |
|
YunaiV
|
fe330482b3
|
📖 CRM：线索 clue 新增/修改的完善
|
2 years ago |
|
YunaiV
|
49bc70ed82
|
📖 CRM：线索 clue 列表的完善
|
2 years ago |
dhb52
|
dca262c64b
|
fix: 根据code-review修改
|
2 years ago |
|
YunaiV
|
1bfb406041
|
📖 CRM：code review 待提醒逻辑
|
2 years ago |
|
芋道源码
|
51f52ff4b7
|
!870 feat: CRM/backlog 提醒数量
Merge pull request !870 from dhb52/develop
|
2 years ago |
|
YunaiV
|
4bf4432f93
|
✨ CRM：单测暂时不写
|
2 years ago |
|
dhb52
|
1ba2b7b600
|
fix: Customer,Clue增加followUpStatus自动查询
|
2 years ago |
|
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
|
2 years ago |
|
dhb52
|
d23dfd4276
|
feat: CRM/backlog 提醒数量
|
2 years ago |
|
YunaiV
|
21452af780
|
✨ 2.0.1 版本发布准备
|
2 years ago |
|
YunaiV
|
0fba56cda8
|
📖 CRM：code review 合同逻辑
|
2 years ago |
|
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
|
2 years ago |
|
YunaiV
|
c40ea1eaa6
|
📖 CRM：code review 商业智能的排行版
|
2 years ago |
|
芋道源码
|
bba32c6ba3
|
!866 新增：CRM 商业智能，其他排名接口
Merge pull request !866 from 安浩浩/develop
|
2 years ago |
|
YunaiV
|
5955f39e24
|
📖 CRM：code review 待办项目的实现
|
2 years ago |
|
dhb52
|
a5d33692c1
|
refactor: TodayCustomer利用CrmCustomerController#getCustomerPage
|
2 years ago |
|
puhui999
|
9caaa96e5b
|
CRM-合同: 新增更新合同商品如果有关联商机的话则更新商机商品
|
2 years ago |
|
dhb52
|
3b612b2e6d
|
feat: 待回款提醒,即将到期的合同,待审核回款
|
2 years ago |
|
dhb52
|
6fc8c4809f
|
feat: 合同[审批状态]条件筛选
|
2 years ago |
|
puhui999
|
84f3b230d2
|
CRM-合同: 新增合同关联商品
|
2 years ago |
安浩浩
|
3213cad317
|
新增：CRM 商业智能，其他排名接口
|
2 years ago |
|
YunaiV
|
bf8ec22144
|
📖 CRM：code review 合同的代码实现
|
2 years ago |
|
YunaiV
|
3347d3320d
|
📖 CRM：code review 合同的代码实现
|
2 years ago |
|
puhui999
|
ba6218b835
|
CRM-合同: transfer
|
2 years ago |
|
puhui999
|
59dfa10461
|
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/business/CrmBusinessServiceImpl.java
|
2 years ago |
|
puhui999
|
53badfc367
|
CRM-CONTRACT: 完善合同编辑回显
|
2 years ago |
|
puhui999
|
6a63f2f078
|
CRM-CONTRACT: 完善合同编辑回显
|
2 years ago |
|
puhui999
|
59e6f23788
|
CRM-CONTRACT: 完善 TODO
|
2 years ago |
|
YunaiV
|
e9a29e6dd4
|
CRM：优化合同金额排行、回款金额排行
|
2 years ago |
|
芋道源码
|
1fd731a90a
|
!861 修改：CRM 商业智能，合并模块到 crm，优化查询
Merge pull request !861 from 安浩浩/develop
|
2 years ago |
|
puhui999
|
1a96fb2ffc
|
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
|
2 years ago |
|
YunaiV
|
f5f827b59f
|
📖 CRM：code review 合同流程
|
2 years ago |
|
puhui999
|
624b35988e
|
BPM: 实现业务流程结果监听器
|
2 years ago |
|
安浩浩
|
46e01e07a8
|
修改：CRM 商业智能，合并模块到 crm，优化查询
|
2 years ago |
|
芋道源码
|
acb8d3f23b
|
!858 CRM-客户: 完善客户导入
Merge pull request !858 from puhui999/develop
|
2 years ago |
|
YunaiV
|
6f95f37117
|
📖 CRM：code review 待进入公海的客户
|
2 years ago |
|
芋道源码
|
cd28128e42
|
!859 feat: CRM-backlog-待进入公海的客户
Merge pull request !859 from dhb52/crm-msg
|
2 years ago |