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
|
ddfceddf4a
|
crm：code review 联系人详情
|
2023-11-29 13:57:01 +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 |
|
ljlleo
|
50430bb9cd
|
商机、商机状态类型
|
2023-11-29 13:55:53 +08:00 |
|
芋道源码
|
57b20f1810
|
!336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
|
2023-11-27 12:35:25 +00:00 |
|
Evol郑天
|
633965b07d
|
同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
|
2023-11-27 07:07:32 +00:00 |
|
zyna
|
46a8755c93
|
联系人review修改
|
2023-11-26 21:54:50 +08:00 |
|
liuhongfeng
|
7df7719be3
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-25 17:45:32 +08:00 |
|
owen
|
d4dc105b4f
|
营销：适配商城装修组件【营销文章】
|
2023-11-25 15:53:07 +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 |
|
liuhongfeng
|
764e1715be
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-24 22:56:39 +08:00 |
|
YunaiV
|
1744c6ec6f
|
websocket 重新封装
|
2023-11-24 00:33:05 +08:00 |
|
owen
|
253401ace3
|
营销：适配商城装修组件【优惠券】
|
2023-11-22 16:58:00 +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 |
|
liuhongfeng
|
4440ec866c
|
【新增】ureport2 集成
|
2023-11-20 23:32:54 +08:00 |
|
芋道源码
|
b0b669129b
|
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
|
2023-11-18 16:32:02 +00: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 |
|
芋道源码
|
c06223decd
|
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
|
2023-11-18 13:45:48 +00:00 |
|
芋道源码
|
538783ce2d
|
!317 crm联系人前端
Merge pull request !317 from zyna/master
|
2023-11-18 12:35:34 +00:00 |
|
YunaiV
|
a42d0695fe
|
代码生成：增加主子表 erp 模式的示例
|
2023-11-17 13:21:17 +08:00 |
|
YunaiV
|
6c405ba420
|
代码生成：增加主子表 inner 模式的示例
|
2023-11-16 23:48:20 +08:00 |
|
YunaiV
|
9aca49c1ff
|
代码生成：增加主子表 normal 模式的示例
|
2023-11-16 23:24:03 +08:00 |
|
YunaiV
|
bbc37613b6
|
代码生成：增加 tree 树形的示例
|
2023-11-16 20:39:12 +08:00 |
|
YunaiV
|
40b1522ed0
|
代码生成：增加 crud 单表示例
|
2023-11-15 23:48:00 +08:00 |
|
puhui999
|
8e0cf5c1e5
|
crm-团队成员：新增获得权限级别名称函数 getLevelName
|
2023-11-14 12:06:42 +08:00 |
|
puhui999
|
015a1640c1
|
crm-团队成员：完善团队成员通用组件封装
|
2023-11-14 11:26:07 +08:00 |
|
YunaiV
|
45656562a8
|
代码生成：支持设置主子表的信息
|
2023-11-14 09:50:54 +08:00 |
|
puhui999
|
27c9a0f32d
|
crm-团队成员： 先提交一波
|
2023-11-13 17:49:27 +08:00 |
|
YunaiV
|
999d8de9e9
|
代码生成：增加主子表（内嵌）的示例
|
2023-11-13 13:57:15 +08:00 |
|
YunaiV
|
f0f7886025
|
代码生成：增加主子表（普通）的示例
|
2023-11-12 22:33:38 +08:00 |
|
YunaiV
|
72c5eaae31
|
代码生成：增加 one 情况下的示例代码
|
2023-11-12 19:50:38 +08:00 |
|
zyna
|
ed26142bb0
|
crm联系人init
|
2023-11-11 23:35:18 +08:00 |
|
Wanwan
|
6369b334e3
|
feat: CRM 客户限制
|
2023-11-11 20:50:33 +08:00 |
|
YunaiV
|
4e413a10e6
|
主子表：暂时存储，准备重构
|
2023-11-09 23:10:54 +08:00 |
|
Wanwan
|
288aa72cdd
|
feat: CRM 客户公海配置
|
2023-11-09 00:05:10 +08:00 |
|
niou233
|
084009f7f2
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-08 17:30:04 +08:00 |
|
niou233
|
f2c71d5836
|
refactor: 会员商品收藏
|
2023-11-08 17:29:57 +08:00 |
|
YunaiV
|
eb9f8c9f6f
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-06 21:43:55 +08:00 |
|
YunaiV
|
85ee558bef
|
多租户：登录界面，根据 host 域名获取对应的租户编号
|
2023-11-06 19:42:28 +08:00 |
|
VicoHu
|
3f803767c4
|
fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
|
2023-11-05 13:59:28 +00:00 |
|
YunaiV
|
47bb88d892
|
code review：产品分类
|
2023-11-05 20:50:13 +08:00 |
|
YunaiV
|
e1cff74f41
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-11-05 20:48:12 +08:00 |
|
芋道源码
|
596ad888e1
|
!308 【增加CRM：产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
|
2023-11-05 12:28:31 +00:00 |
|
YunaiV
|
65d85e30ca
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-11-05 20:23:56 +08:00 |
|
芋道源码
|
f0c45103e1
|
!309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
|
2023-11-05 12:20:46 +00:00 |
|
ZanGe丶
|
ff6f05df84
|
【crm:产品及产品分类】
|
2023-11-04 18:28:59 +08:00 |
|
YunaiV
|
a9b91e7436
|
优化：社交登录、用户的管理
|
2023-11-04 14:37:23 +08:00 |
|
YunaiV
|
ac7f1e29fb
|
Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-04 10:50:04 +08:00 |
|
Wanwan
|
23f483ac45
|
feat: 客户详情 + review 修改
|
2023-11-04 03:21:01 +08:00 |
|
jason
|
fcc748dc63
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-03 08:47:57 +08:00 |
|
jason
|
753f5de81e
|
转账 - 新增转账订单查询
|
2023-11-03 08:46:53 +08:00 |
|
dongshanshan
|
9a3253ad20
|
feat: 会员商品收藏
|
2023-10-31 16:53:44 +08:00 |
|
owen
|
881c4f3a29
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2023-10-31 16:01:22 +08:00 |
|
liuhongfeng
|
2b84de7e09
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2023-10-30 21:32:50 +08:00 |
|
jason
|
c1534bf168
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-29 23:48:20 +08:00 |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
2023-10-29 23:48:10 +08:00 |
|
owen
|
e9ff8d3237
|
商城装修
|
2023-10-29 22:03:24 +08:00 |
|
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
2023-10-29 00:03:11 +08:00 |
|
Wanwan
|
4cdab6fb3e
|
feat: 调整客户表的字段
|
2023-10-28 19:50:42 +08:00 |
|
puhui999
|
a624db04e9
|
三方应用新增授权方的网页应用 agentId 属性
|
2023-10-26 17:00:13 +08:00 |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
2023-10-25 17:02:11 +08:00 |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
2023-10-25 16:07:58 +08:00 |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
2023-10-25 00:24:20 +08:00 |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
2023-10-24 16:57:20 +08:00 |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
2023-10-24 16:10:55 +08:00 |
|
YunaiV
|
6c6c2cb058
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-10-21 21:56:41 +08:00 |
|
芋道源码
|
af79d4a653
|
!285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
|
2023-10-21 13:56:12 +00:00 |
|
芋道源码
|
73578ce8b2
|
!290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
|
2023-10-21 13:06:19 +00:00 |
|
芋道源码
|
4709c18a6e
|
!284 完善 SPU，订单列表：完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
|
2023-10-21 11:08:44 +00:00 |
|
芋道源码
|
929fa9a208
|
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
|
2023-10-21 11:05:51 +00:00 |
|
kehaiyou
|
5cfb67d047
|
fix: 【工作流】--加签减签review修改接口地址
|
2023-10-21 18:16:39 +08:00 |
|
jason
|
bb5945958b
|
钱包 - 优化
支付应用 - 证书模式增加应用私钥
|
2023-10-21 15:33:31 +08:00 |
|
芋道源码
|
e187c55408
|
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
|
2023-10-21 06:23:04 +00:00 |
|
puhui999
|
491b3a5018
|
新增 banner 管理
|
2023-10-21 02:40:20 +08:00 |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
2023-10-20 23:48:39 +08:00 |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
2023-10-20 22:17:05 +08:00 |
|
zhangshuai
|
9f77514c17
|
限时折扣
|
2023-10-20 20:51:18 +08:00 |
|
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
2023-10-20 16:40:19 +08:00 |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2023-10-20 15:35:01 +08:00 |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2023-10-20 11:48:59 +08:00 |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2023-10-19 17:33:42 +08:00 |
|
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
2023-10-18 20:02:59 +08:00 |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
2023-10-18 17:20:13 +08:00 |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 23:26:08 +08:00 |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
2023-10-17 23:18:07 +08:00 |
|
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
2023-10-17 12:52:28 +00:00 |
|
芋道源码
|
0089d59d36
|
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
|
2023-10-17 12:01:51 +00:00 |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 19:03:02 +08:00 |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
2023-10-17 19:02:37 +08:00 |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
2023-10-17 11:01:18 +00:00 |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 16:09:55 +08:00 |
|
owen
|
6fc232b758
|
交易：订单核销
|
2023-10-17 16:09:36 +08:00 |
|
dhb52
|
dced551698
|
feat: CRM/合同 crud
|
2023-10-16 23:56:34 +08:00 |
|
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
2023-10-16 22:32:10 +08:00 |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 22:27:39 +08:00 |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2023-10-16 22:09:20 +08:00 |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
2023-10-16 22:03:36 +08:00 |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 13:01:02 +08:00 |
|
owen
|
e1a72779d4
|
统计：Review修改
|
2023-10-16 13:00:13 +08:00 |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
2023-10-16 09:57:46 +08:00 |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 09:52:35 +08:00 |
|
owen
|
3802fee661
|
商城：增加商城首页
|
2023-10-16 09:51:19 +08:00 |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
2023-10-15 17:47:36 +08:00 |
|
puhui999
|
50e43e4028
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-15 16:14:32 +08:00 |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
2023-10-15 16:14:09 +08:00 |
|
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
2023-10-15 14:26:20 +08:00 |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2023-10-15 00:54:28 +08:00 |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
2023-10-14 11:32:54 +08:00 |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
2023-10-11 04:34:07 +00:00 |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2023-10-10 16:53:22 +08:00 |
|
youkehai
|
62a953815d
|
fix: 减签按钮显示和api地址修改
|
2023-10-10 10:40:30 +08:00 |
|
owen
|
6b7040404e
|
统计：会员统计
|
2023-10-09 23:27:32 +08:00 |
|
owen
|
d4a521eff1
|
统计：交易统计Review修改
|
2023-10-09 23:27:32 +08:00 |
|
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
2023-10-08 22:35:50 +08:00 |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
2023-10-08 07:30:14 +08:00 |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-06 22:21:10 +08:00 |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
2023-10-06 22:20:40 +08:00 |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
2023-10-06 10:58:31 +08:00 |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-05 21:50:33 +08:00 |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
2023-10-05 12:42:00 +08:00 |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
2023-10-05 12:06:57 +08:00 |
|
owen
|
58b6b1ba57
|
交易：核销
|
2023-10-04 10:51:35 +08:00 |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
2023-10-03 18:41:57 +08:00 |
|
YunaiV
|
a9bbbc7b0a
|
trade：优化运费模版的实现
|
2023-10-02 18:30:22 +08:00 |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
2023-10-02 10:34:37 +08:00 |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
2023-10-01 23:44:38 +08:00 |
|
owen
|
3a96812d47
|
会员：会员配置的积分相关字段加上point前缀
|
2023-10-01 10:41:20 +08:00 |
|
owen
|
3ab1ed707f
|
会员：积分配置改为会员配置
|
2023-10-01 10:25:18 +08:00 |
|
owen
|
0066d79876
|
签到：签到后增加用户积分、经验
|
2023-10-01 09:53:52 +08:00 |
|
owen
|
4b7e57e67d
|
会员详情，修改会员积分
|
2023-09-30 15:50:12 +08:00 |
|
owen
|
675f3df5cb
|
会员详情，查询钱包信息
|
2023-09-30 12:40:21 +08:00 |
|
owen
|
6475f81534
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-29 21:08:48 +08:00 |
|
owen
|
c322fb3d0d
|
统计：交易统计
|
2023-09-29 21:08:14 +08:00 |
|
kehaiyou
|
b1469669e2
|
Merge branch 'feature/bpm-delegate'
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
2023-09-29 12:37:32 +08:00 |
|
YunaiV
|
2f82eff526
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-27 23:30:48 +08:00 |
|
youkehai
|
2aeba127b6
|
Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
2023-09-25 09:37:22 +08:00 |
|
owen
|
a5dd7f4a81
|
分销：修正分享海报
|
2023-09-24 23:18:50 +08:00 |
|
YunaiV
|
245147223f
|
code review：驳回逻辑
|
2023-09-24 23:05:33 +08:00 |
|
芋道源码
|
ada93a160b
|
!251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
|
2023-09-24 14:45:54 +00:00 |
|
owen
|
2c22ef8ef1
|
分销：重命名提现类型字段
|
2023-09-24 22:32:10 +08:00 |
|
kehaiyou
|
f40d1de62a
|
fix: 【工作流】--回退的高亮和api地址更换
|
2023-09-24 19:42:53 +08:00 |
|
kehaiyou
|
20fe343646
|
feat: 【工作流】--委派
|
2023-09-24 15:44:02 +08:00 |
|
芋道源码
|
0ffd07447b
|
!248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
|
2023-09-24 07:18:26 +00:00 |
|
kehaiyou
|
de79e79d91
|
feat: 支持回退按钮
|
2023-09-23 14:52:40 +08:00 |
|