Commit Graph

157 Commits

Author SHA1 Message Date
YunaiV
1066551fd1 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2023-12-02 19:25:50 +08:00
YunaiV
a77173f2ae 🐛 修复 post 和 dept 在 IDEA 报错的问题 2023-12-02 10:20:09 +08:00
owen
b982397449 Merge remote-tracking branch 'origin/dev' into dev 2023-12-02 00:00:50 +08:00
YunaiV
b0c1e55c6a crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:20 +08:00
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
31a42fc3f7 crm:增加合同 List 组件 2023-11-30 19:12:57 +08:00
YunaiV
5f26c4afe9 crm:完善数据权限的界面 2023-11-30 13:42:49 +08:00
YunaiV
661dc2ff67 crm:code review 成员 2023-11-29 13:55:53 +08: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
puhui999
19a0a83054 crm-数据权限:完善团队成员公共组件 2023-11-22 15:44:42 +08:00
owen
82aed175ab 营销:适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +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
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
xingyu
10483577b7 fix: types 2023-10-31 14:26:17 +08:00
xingyu
80e72fd924 feat: coding 2023-10-31 10:13:22 +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
Wanwan
59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
puhui999
8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
YunaiV
e5d6a9dae1 code review:banner 逻辑 2023-10-24 20:07:48 +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
liuhongfeng
7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +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
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +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
xingyu
8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
xingyu
5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
owen
3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
芋道源码
889334bc37
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
2023-10-14 10:19:37 +00:00
芋道源码
6ed7b3a69e
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
2023-10-12 13:53:25 +00:00
puhui999
b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:55:53 +08:00
puhui999
3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
kehaiyou
683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
风狗
aa5f27bec7
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
2023-10-08 08:26:07 +00:00
puhui999
5b4983a3e9 拼团记录:优化页面布局,添加日期快捷选项 2023-10-07 11:10:26 +08:00
puhui999
eee3d0fef5 拼团记录: 完成 UI 部分 2023-10-06 18:40:21 +08:00
YunaiV
860872a890 promotion:新增砍价记录列表 2023-10-05 12:06:57 +08:00
owen
58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
YunaiV
4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
芋道源码
a5808c9e9c
!259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
2023-10-01 13:57:56 +00:00
YunaiV
3a9668d632 product:优化商品列表的样式、实现代码 2023-10-01 19:44:13 +08:00