huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-27 01:32:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,271 Commits 1 Branch 0 Tags 176 MiB
6dcb1277b3
Commit Graph

161 Commits

Author SHA1 Message Date
芋道源码
19c0227cef
!826 CRM 产品分类和产品，优化了操作日志 ,新增获得产品操作日志 
Merge pull request !826 from 安浩浩/develop
 2024-01-13 02:04:37 +00:00
YunaiV
e79c750b46 📖 CRM：code review 跟进记录的实现 2024-01-13 09:56:53 +08:00
anhaohao
803816b162 修改：CRM 产品分类和产品，优化了操作日志 2024-01-11 16:02:05 +08:00
puhui999
6b426fcd01 CRM: 修复一下差异 2024-01-10 22:06:02 +08:00
puhui999
19fa65b0c3 CRM: 新增跟进记录 2024-01-10 21:09:08 +08:00
puhui999
ba103d6e86 CRM: 完善一些 TODO 提到的问题 2024-01-10 16:25:55 +08:00
puhui999
1a5fe6fa9a CRM: 完善客户、联系人、合同、回款计划、回款的操作日志 2024-01-10 15:28:53 +08:00
puhui999
9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2024-01-10 11:29:29 +08:00
YunaiV
772b794374 📖 CRM：code review CRM 产品分类 2024-01-08 19:08:03 +08:00
anhaohao
4afff6185e 新增：CRM 产品分类和产品，接入操作日志，数据权限控制 2024-01-08 15:15:42 +08:00
芋道源码
3c7f63c356
!810 fix：修复 issues 提到的一些公众号上的问题 
Merge pull request !810 from puhui999/develop
 2024-01-07 13:23:53 +00:00
YunaiV
19d5a0c2aa 📖 CRM：code review crm 联系人新增操作日志 2024-01-07 18:19:08 +08:00
zyna
44d828023c crm联系人新增操作日志 2024-01-06 21:06:38 +08:00
puhui999
3170e7fd97 CRM-客户: 简化客户公海配置 VO，完善相关操作日志 2024-01-06 13:48:22 +08:00
puhui999
269816446a CRM-客户：日志表达式调整 2024-01-06 12:27:30 +08:00
puhui999
a1c17b9b00 CRM-客户：日志表达式调整 2024-01-05 17:40:21 +08:00
puhui999
d8bb55fc0b CRM-客户：完善操作日志 2024-01-05 14:43:48 +08:00
YunaiV
d0df0e8e16 📖 CRM：【客户】优化锁定客户的逻辑实现 2024-01-03 13:06:49 +08:00
YunaiV
0253846fdf Merge branch 'develop' of https://gitee.com/zh8790/ruoyi-vue-pro_develop into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2024-01-02 22:21:14 +08:00
YunaiV
9e3055ee1e 📖 CRM：code review 商机模块 2024-01-02 18:49:14 +08:00
YunaiV
2d0537387b Merge branch 'develop' of https://gitee.com/zyna/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
 2023-12-30 21:43:04 +08:00
YunaiV
8c9b483ac5 📖 code review 操作日志的实现 2023-12-30 21:36:46 +08:00
puhui999
3e91ac73c4 CRM：完善数据分页查询条件构造 CrmQueryWrapperUtils 2023-12-19 10:29:41 +08:00
puhui999
3bab9748db 系统操作日志：使用自定义 starter 的方式重新集成 mzt-biz-log 2023-12-19 09:20:47 +08:00
zyna
bd76ea59a7 Merge remote-tracking branch 'origin/feature/crm' into develop 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contactbusinesslink/CrmContactBusinessLinkController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactBusinessLinkServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
 2023-12-17 17:47:46 +08:00
zyna
8434a8cd68 crm联系人商机功能修改 2023-12-17 17:33:52 +08:00
YunaiV
ddb6fe7ec8 📖 CRM：code review 客户管理的数据权限、操作权限 2023-12-17 10:57:49 +08:00
puhui999
3c74b22933 系统操作日志：集成 mzt-biz-log 4 2023-12-13 17:45:43 +08:00
puhui999
c74881c8f0 系统操作日志：集成 mzt-biz-log 3 2023-12-13 15:18:19 +08:00
puhui999
c5cc818a49 系统操作日志：集成 mzt-biz-log 2023-12-12 22:29:40 +08:00
puhui999
1ac68aca97 CRM-回款计划：添加数据权限 2023-12-11 15:56:12 +08:00
puhui999
e4d3175f06 CRM-数据权限：完善 review 提到的问题 2023-12-11 12:02:41 +08:00
Joey
9bac10c6f7 完善客户锁定/解锁接口，校验锁定上限 2023-12-09 17:25:47 +08:00
YunaiV
23df8633f4 📖 CRM：code review 数据权限的实现 2023-12-09 10:50:47 +08:00
puhui999
5c395fc1c4 CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
YunaiV
3707662187 📈 CRM：code review 数据权限 2023-12-06 20:04:15 +08:00
YunaiV
d430063eec Merge remote-tracking branch 'puhui/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
 2023-12-06 19:33:04 +08:00
芋道源码
21a3870c00
!775 crm联系人商机功能 
Merge pull request !775 from zyna/feature/crm
 2023-12-06 05:57:51 +00:00
YunaiV
a11d5dc5f1 🔨 CRM：优化产品代码的实现 2023-12-05 22:41:58 +08:00
puhui999
d59d1428d7 Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 2023-12-05 22:25:49 +08:00
芋道源码
c463f831f4
!776 【CRM：优化产品以及产品分类】 
Merge pull request !776 from ZanGe丶/feature/crm
 2023-12-05 12:15:54 +00:00
puhui999
78165f2161 CRM: 新增 CRM 分页查询工具类，实现通用构造 crm 数据类型数据分页查询条件 2023-12-05 15:03:22 +08:00
puhui999
9c1687dc25 CRM: 新增关注数据模块 2023-12-05 11:00:34 +08:00
ZanGe丶
d2e965fb02 【CRM：优化产品以及产品分类】 2023-12-03 21:33:01 +08:00
zyna
910bc09e19 crm联系人商机功能 2023-12-03 20:01:00 +08:00
YunaiV
f02b9464bd crm: 增加基于客户查询回款分页 2023-12-01 19:37:44 +08:00
YunaiV
2d9f5cc4d0 crm: 1）调整合同的 CRM 前缀；2）增加基于客户查询合同分页 2023-11-30 19:12:37 +08:00
YunaiV
fe4b51b9ad crm: 完善数据权限的逻辑 2023-11-30 13:42:36 +08:00
zyna
16084d468d crm联系人删除多余文件 2023-11-27 20:42:35 +08:00
zyna
3f3899f5d3 crm联系人review修改，新增地区字段 2023-11-27 20:42:34 +08:00
puhui999
4a51b20155 crm-客户：修复合并差异 2023-11-27 12:14:32 +08:00
puhui999
f87d73724b Merge remote-tracking branch 'yudao/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
 2023-11-27 12:12:52 +08:00
puhui999
8f06d02293 crm-客户：完善 code review 提到的问题 2023-11-27 12:00:53 +08:00
YunaiV
f766474ff4 crm：code review 客户配置 2023-11-26 19:57:40 +08:00
Wanwan
ab3748d102 feat: 客户配置 review 修改 2023-11-25 23:54:08 +08:00
YunaiV
d1579499f4 Merge remote-tracking branch 'ljlleo/feature/crm' into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
 2023-11-24 23:58:49 +08:00
ljlleo
4e1d9d6292 商机、商机状态类型和商机状态 2023-11-24 14:24:04 +08:00
puhui999
0d821d705d crm-客户管理：完善客户、公海客户分页查询 2023-11-23 10:12:50 +08:00
puhui999
b41d469d46 crm-客户管理：新增客户放入公海和领取公海客户 2023-11-22 18:44:49 +08:00
puhui999
77d7bcc73f crm-数据权限：完善数据权限 code review 提到的问题 2023-11-22 17:56:13 +08:00
puhui999
780526f484 crm-数据权限：完善数据权限相关操作接口 2023-11-22 17:27:00 +08:00
YunaiV
e519b41244 Merge branch 'feature/crm' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
#	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/customer/CrmCustomerServiceImpl.java
 2023-11-18 23:56:08 +08:00
YunaiV
86050d411b code review：权限模块 2023-11-18 23:45:24 +08:00
YunaiV
8c9873c425 Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm 
# 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/convert/contact/ContactConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
 2023-11-18 22:25:13 +08:00
Wanwan
5b295d56b6 feat: CRM 客户限制 2023-11-11 20:49:52 +08:00
Wanwan
2915b46fa5 feat: CRM 客户公海配置 2023-11-09 00:01:43 +08:00
puhui999
f4c92089e5 CRM-客户：添加分页数据场景过滤 2023-11-08 16:42:22 +08:00
xiaqing
645fe827a3 Merge remote-tracking branch 'origin/feature/crm' into feature/crm 2023-11-08 10:47:42 +08:00
xiaqing
b06432b8f8 增加客户的公海领取和分配 2023-11-08 10:46:59 +08:00
ZanGe丶
bf42f8e9ff 【增加CRM：产品以及产品分类】 2023-11-04 19:48:20 +08:00
芋道源码
9ee6a27b86
!715 feat: 客户详情 + review 修改 
Merge pull request !715 from wanwan/feature/crm
 2023-11-04 01:39:34 +00:00
Wanwan
64db1a9c90 feat: 客户详情 + review 修改 2023-11-04 03:21:20 +08:00
YunaiV
b7900c2035 code review：回款逻辑 2023-11-03 23:02:01 +08:00
芋道源码
71ce831d59
!706 完善回款管理和回款计划功能 
Merge pull request !706 from souvc/feature/crm
 2023-11-03 11:16:48 +00:00
puhui999
23cfbfe491 CRM-数据权限：完善数据团队操作-添加、编辑、移除团队成员，退出团队 2023-11-01 16:24:36 +08:00
puhui999
c6422dc657 完善 CRM-客户 数据权限校验2 2023-10-31 17:24:19 +08:00
liuhongfeng
f1f180ff77 【新增】字典归类 
【修改】规范实体命名和字段类型修改
 2023-10-31 00:35:41 +08:00
liuhongfeng
798dd3269f Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-30 21:35:14 +08:00
zhijiantianya@gmail.com
4dab376ca9 code review：数据权限的实现 2023-10-30 19:28:33 +08:00
puhui999
e6eaa3a24a 完善 CRM-数据权限校验方式 2023-10-30 16:29:24 +08:00
puhui999
19c9b6ae93 新增 CRM-数据权限 service 2023-10-30 11:17:43 +08:00
puhui999
bec8a27a21 新增 CRM-数据权限 注解实现 2023-10-30 00:49:36 +08:00
liuhongfeng
fc087fa252 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 19:27:16 +08:00
YunaiV
67ac11b56c code review：crm 客户转移 2023-10-29 18:39:54 +08:00
liuhongfeng
9608cf0539 Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 18:03:01 +08:00
liuhongfeng
677e8ab2fc 【修改】回款计划-修改字段类型 
【修改】修改回款计划-创建逻辑，添加客户的数据校验
 2023-10-29 18:00:34 +08:00
芋道源码
f73b857551
!702 CRM【商机】【联系人】【合同】新增 transfer 接口 
Merge pull request !702 from puhui999/feature/crm
 2023-10-29 09:55:09 +00:00
YunaiV
fe50356ae8 code review：crm 客户模块的实现 2023-10-29 17:38:59 +08:00
puhui999
722e9c8a04 CRM-商机：新增商机转移接口 2023-10-29 02:04:26 +08:00
puhui999
36a76c5ce6 CRM-联系人：新增联系人转移接口 2023-10-29 01:42:22 +08:00
puhui999
d9f6fb241a 合同：新增合同转移接口 2023-10-29 01:23:06 +08:00
Wanwan
3af9688383 feat: 调整客户表的字段 2023-10-29 00:33:42 +08:00
liuhongfeng
b0ddd522fb Merge branch 'feature/crm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-28 00:37:59 +08:00
liuhongfeng
301f497527 【新增】回款计划-审批枚举类 
【新增】回款计划-回款方式枚举类
【新增】回款计划-枚举类校验
【修改】回款计划-错误码调整
【修改】修改回款计划-创建逻辑，添加合同数据的校验
 2023-10-28 00:37:47 +08:00
YunaiV
81b6aebf47 code review：商机表的实现 2023-10-27 23:27:08 +08:00
YunaiV
bf247a6626 Merge branch 'feature/crm' of https://gitee.com/ljlleo/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
 2023-10-27 23:11:16 +08:00
ljlleo
75115bcc48 1、商机前端页面； 
2、商机状态类型和商机状态字段的处理；
 2023-10-26 16:22:44 +08:00
Wanwan
04613af0cd feat: 客户表的 crud 2023-10-25 00:25:00 +08:00
YunaiV
723707c7ed Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/crm.sql
#	yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
 2023-10-21 22:13:34 +08:00
YunaiV
b5560fa0be code review：CRM 线索表的逻辑 2023-10-21 22:05:37 +08:00