YunaiV
|
f8580fdf2a
|
✨ 2023-05-10：feat: 新增锁屏功能
|
2 years ago |
dhb52
|
9e86e47c1c
|
!391 perf: utils/formatDate.ts更好的ts类型
* perf: utils/formatDate.ts更好的ts类型
|
2 years ago |
|
YunaiV
|
8a70b3fbba
|
✨ ERP：付款单 60%（接入）【可付款的采购入库单列表】
|
2 years ago |
|
YunaiV
|
3308a494c7
|
✨ ERP：增加金额计算的四舍五入
|
2 years ago |
|
YunaiV
|
5bdf0fc0ff
|
✨ ERP：增加供应商的实现
|
2 years ago |
|
YunaiV
|
26343635e4
|
✨ ERP：完成 stock 产品库存、库存明细的实现
|
2 years ago |
anhaohao
|
770e551900
|
新增：商业智能-排行榜，合同金额排行和回款金额排行
|
2 years ago |
|
YunaiV
|
948ef08533
|
✨ PAY：增加钱包、微信条码支付的渠道配置界面
|
2 years ago |
|
YunaiV
|
9fa769b16a
|
📖 CRM：跟进记录的 code review
|
2 years ago |
puhui999
|
2a55d88a44
|
Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
# src/router/modules/remaining.ts
|
2 years ago |
|
puhui999
|
d29dfef7c7
|
新增客户跟进
|
2 years ago |
|
YunaiV
|
a38ddb699a
|
📖 MALL：商品编辑 => 优化 DeliveryForm 表单
|
2 years ago |
|
YunaiV
|
efe702d383
|
📖 MALL：商品编辑 => 简化 InfoForm 基础设置
|
2 years ago |
|
YunaiV
|
a5d6d18b6a
|
📖 MALL：优化商品列表的样式
|
2 years ago |
|
芋道源码
|
1e68cd53a0
|
!352 满减送模块
Merge pull request !352 from Bluemark/dev
|
2 years ago |
落日晚风
|
21e8dbf985
|
满减送数据对接
|
2 years ago |
owen
|
ca35e1a4af
|
统计：增加商品统计
|
2 years ago |
|
YunaiV
|
b3d66cd0aa
|
🔨 CRM：优化产品代码的实现
|
2 years ago |
|
YunaiV
|
aecc9bb8cb
|
🐛 修复 IDEA 在 `v-for="dict in getIntDictOptions(...)"` 时，`el-option` 的 `key` 会告警的问题
|
2 years ago |
|
YunaiV
|
1066551fd1
|
🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
a77173f2ae
|
🐛 修复 post 和 dept 在 IDEA 报错的问题
|
2 years ago |
|
owen
|
b982397449
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
YunaiV
|
b0c1e55c6a
|
crm: 增加基于客户查询回款计划分页
|
2 years ago |
|
owen
|
08be359578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
23a6bf5ef5
|
营销：商城装修增加控件【APP 链接选择】
|
2 years ago |
|
YunaiV
|
31a42fc3f7
|
crm：增加合同 List 组件
|
2 years ago |
|
YunaiV
|
5f26c4afe9
|
crm：完善数据权限的界面
|
2 years ago |
|
YunaiV
|
661dc2ff67
|
crm：code review 成员
|
2 years ago |
|
芋道源码
|
c6192a1918
|
!329 完善团队成员公共组件,crm-客户：集成团队成员
Merge pull request !329 from puhui999/dev-crm
|
3 years ago |
|
owen
|
c3cad3f3ee
|
商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题
|
3 years ago |
|
puhui999
|
19a0a83054
|
crm-数据权限：完善团队成员公共组件
|
3 years ago |
|
owen
|
82aed175ab
|
营销：适配商城装修组件【菜单导航】
|
3 years ago |
|
YunaiV
|
e1cff74f41
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
芋道源码
|
596ad888e1
|
!308 【增加CRM：产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
|
3 years ago |
|
YunaiV
|
65d85e30ca
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
ZanGe丶
|
ff6f05df84
|
【crm:产品及产品分类】
|
3 years ago |
|
YunaiV
|
a9b91e7436
|
优化：社交登录、用户的管理
|
3 years ago |
|
YunaiV
|
ac7f1e29fb
|
Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
xingyu
|
10483577b7
|
fix: types
|
3 years ago |
|
xingyu
|
80e72fd924
|
feat: coding
|
3 years ago |
jason
|
c1534bf168
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
3 years ago |
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
3 years ago |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
3 years ago |
|
YunaiV
|
e5d6a9dae1
|
code review：banner 逻辑
|
3 years ago |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
3 years ago |
|
YunaiV
|
6c6c2cb058
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
芋道源码
|
af79d4a653
|
!285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
|
3 years ago |
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
3 years ago |
|
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
3 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
3 years ago |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
3 years ago |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
3 years ago |
|
xingyu
|
8c18ad941e
|
perf: is utils
|
3 years ago |
|
xingyu
|
5da9b660bd
|
perf: propTypes
|
3 years ago |
|
owen
|
3802fee661
|
商城：增加商城首页
|
3 years ago |
|
芋道源码
|
889334bc37
|
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
|
3 years ago |
|
芋道源码
|
6ed7b3a69e
|
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
|
3 years ago |
|
puhui999
|
b08e0e5ab2
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
3 years ago |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
3 years ago |
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
3 years ago |
风狗
|
aa5f27bec7
|
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
|
3 years ago |
|
puhui999
|
5b4983a3e9
|
拼团记录：优化页面布局，添加日期快捷选项
|
3 years ago |
|
puhui999
|
eee3d0fef5
|
拼团记录： 完成 UI 部分
|
3 years ago |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
3 years ago |
|
owen
|
58b6b1ba57
|
交易：核销
|
3 years ago |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
3 years ago |
|
芋道源码
|
a5808c9e9c
|
!259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
|
3 years ago |
|
YunaiV
|
3a9668d632
|
product：优化商品列表的样式、实现代码
|
3 years ago |
|
owen
|
675f3df5cb
|
会员详情，查询钱包信息
|
3 years ago |
|
owen
|
6475f81534
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
c322fb3d0d
|
统计：交易统计
|
3 years ago |
|
YunaiV
|
74de8e9687
|
trade：优化交易配置的参数校验
|
3 years ago |
shizhong
|
361e4fadda
|
解决处理顶级非目录路由的组件名称逻辑缺失的问题
|
3 years ago |
|
owen
|
21c67b1b75
|
Trade: 完善配置
|
3 years ago |
|
owen
|
854acf6e70
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
owen
|
18b6c70d1a
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
2e830d14d5
|
trade: 分销业务review代码修改
|
3 years ago |
|
owen
|
0582d41972
|
trade: 分销业务后台功能：推广订单列表
|
3 years ago |
|
owen
|
2aa372d8f4
|
trade: 分销业务后台功能：推广用户列表
|
3 years ago |
|
YunaiV
|
0e2ea39591
|
code review：会员详情
|
3 years ago |
|
YunaiV
|
30f0c1b351
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
3 years ago |
|
芋道源码
|
e3b9a15c26
|
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
|
3 years ago |
|
owen
|
dbb87e3850
|
trade: 分销员表格佣金字段格式化
|
3 years ago |
|
puhui999
|
f44688d61c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
73628d3930
|
完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
3 years ago |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
3 years ago |
|
owen
|
5a9764c08c
|
member: 分销配置
|
3 years ago |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
3 years ago |
|
YunaiV
|
d10530c9f5
|
code review：优惠劵逻辑
|
3 years ago |
|
芋道源码
|
9aa7ba3578
|
!230 mall：优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
|
3 years ago |
|
YunaiV
|
4f7d6793fd
|
code review：优惠劵逻辑
|
3 years ago |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
3 years ago |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
3 years ago |
|
YunaiV
|
b8ca5800c6
|
code review：订单列表
|
3 years ago |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
3 years ago |
|
绮梦
|
28951fb31d
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
|
3 years ago |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
3 years ago |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
3 years ago |