owen
|
08be359578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-01 00:39:55 +08:00 |
|
owen
|
23a6bf5ef5
|
营销：商城装修增加控件【APP 链接选择】
|
2023-12-01 00:39:10 +08:00 |
|
YunaiV
|
88e5e67a89
|
crm: 增加基于客户查询商机分页
|
2023-11-30 20:21:45 +08:00 |
|
YunaiV
|
31a42fc3f7
|
crm：增加合同 List 组件
|
2023-11-30 19:12:57 +08:00 |
|
YunaiV
|
5f26c4afe9
|
crm：完善数据权限的界面
|
2023-11-30 13:42:49 +08:00 |
|
YunaiV
|
7de0e93d5a
|
crm：联系人增加 ContactList 组件，提供给其它模块内嵌
|
2023-11-29 21:42:10 +08:00 |
|
YunaiV
|
2cda0cdd9f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/crm/contact/ContactForm.vue
|
2023-11-29 14:01:20 +08:00 |
|
YunaiV
|
8b787176b6
|
crm：code review 客户详情
|
2023-11-29 13:59:53 +08:00 |
|
wanwan
|
443f65b5dc
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-29 13:59:52 +08:00 |
|
YunaiV
|
ddfceddf4a
|
crm：code review 联系人详情
|
2023-11-29 13:57:01 +08:00 |
|
YunaiV
|
ae8cb9218c
|
crm：code review 客户详情
|
2023-11-29 13:55:53 +08:00 |
|
wanwan
|
85810c0786
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-29 13:55:53 +08:00 |
|
YunaiV
|
c5b2fdecd5
|
crm：code review 商机类型
|
2023-11-29 13:55:53 +08:00 |
|
ljlleo
|
50430bb9cd
|
商机、商机状态类型
|
2023-11-29 13:55:53 +08:00 |
|
YunaiV
|
661dc2ff67
|
crm：code review 成员
|
2023-11-29 13:55:53 +08:00 |
|
zyna
|
ed22e02b5b
|
crm联系人review修改
|
2023-11-27 23:44:13 +08:00 |
|
YunaiV
|
1ba450103e
|
crm：code review 联系人详情
|
2023-11-27 20:33:53 +08:00 |
|
YunaiV
|
24773a6eaa
|
crm：code review 客户详情
|
2023-11-27 20:31:23 +08:00 |
|
wanwan
|
e1f9e16a77
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-27 20:31:23 +08:00 |
|
YunaiV
|
3c19cb1a85
|
crm：code review 商机类型
|
2023-11-27 20:31:23 +08:00 |
|
ljlleo
|
b3515b2db5
|
商机、商机状态类型
|
2023-11-27 20:31:23 +08:00 |
|
YunaiV
|
4e1748caa3
|
crm：code review 成员
|
2023-11-27 20:31:23 +08:00 |
|
zyna
|
46a8755c93
|
联系人review修改
|
2023-11-26 21:54:50 +08:00 |
|
芋道源码
|
54897b6d1b
|
!332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
|
2023-11-25 02:27:11 +00:00 |
|
芋道源码
|
c6192a1918
|
!329 完善团队成员公共组件,crm-客户：集成团队成员
Merge pull request !329 from puhui999/dev-crm
|
2023-11-25 02:24:45 +00:00 |
|
owen
|
c3cad3f3ee
|
商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题
|
2023-11-24 20:54:47 +08:00 |
|
YunaiV
|
1744c6ec6f
|
websocket 重新封装
|
2023-11-24 00:33:05 +08:00 |
|
puhui999
|
f8b56a8c46
|
crm-客户：公海数据区分
|
2023-11-23 09:35:59 +08:00 |
|
owen
|
253401ace3
|
营销：适配商城装修组件【优惠券】
|
2023-11-22 16:58:00 +08:00 |
|
puhui999
|
12b59200c1
|
crm-客户：集成团队成员
|
2023-11-22 15:45:10 +08:00 |
|
puhui999
|
19a0a83054
|
crm-数据权限：完善团队成员公共组件
|
2023-11-22 15:44:42 +08:00 |
|
YunaiV
|
f74ddf46ae
|
sms：移除 sendCode、sendMsg 字段
|
2023-11-21 22:53:49 +08:00 |
|
owen
|
1bb9df7b3c
|
商品中心：修复商品表格选择对话框，在多选时表头内的多选框不显示选中效果的问题
|
2023-11-21 10:27:29 +08:00 |
|
owen
|
e0a731dd86
|
商品评论、优惠券模板复用组件【商品橱窗】
|
2023-11-20 10:53:02 +08:00 |
|
owen
|
3198688eb5
|
营销：适配商城装修组件【商品栏】
|
2023-11-19 18:27:25 +08:00 |
|
芋道源码
|
b0b669129b
|
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
|
2023-11-18 16:32:02 +00:00 |
|
YunaiV
|
ebb19cfe8c
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-11-19 00:30:02 +08:00 |
|
YunaiV
|
b1f5ad55b8
|
crm：code review 权限列表
|
2023-11-19 00:28:22 +08:00 |
|
芋道源码
|
2e01944df9
|
!322 crm-团队成员：完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
|
2023-11-18 16:13:06 +00:00 |
|
芋道源码
|
5f0b0bd21d
|
!324 商城装修
Merge pull request !324 from 疯狂的世界/dev
|
2023-11-18 14:18:12 +00:00 |
|
芋道源码
|
9d7c578d48
|
!323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
|
2023-11-18 14:17:55 +00:00 |
|
YunaiV
|
526172af60
|
crm：code review 客户配置管理
|
2023-11-18 22:11:42 +08:00 |
|
芋道源码
|
c06223decd
|
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
|
2023-11-18 13:45:48 +00:00 |
|
YunaiV
|
85e953b920
|
crm：code review 联系人管理
|
2023-11-18 21:08:00 +08:00 |
|
YunaiV
|
7c5ae17d04
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/components/DiyEditor/components/ComponentContainer.vue
|
2023-11-18 20:39:31 +08:00 |
|
芋道源码
|
538783ce2d
|
!317 crm联系人前端
Merge pull request !317 from zyna/master
|
2023-11-18 12:35:34 +00:00 |
|
YunaiV
|
f1e3eccc8a
|
Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-18 18:00:41 +08:00 |
|
YunaiV
|
652698b871
|
代码生成：增加说明文档
|
2023-11-18 18:00:19 +08:00 |
|
芋道源码
|
26dba8b457
|
!325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
|
2023-11-18 09:57:33 +00:00 |
|
YunaiV
|
a42d0695fe
|
代码生成：增加主子表 erp 模式的示例
|
2023-11-17 13:21:17 +08:00 |
|