YunaiV
|
3d4feeff6b
|
✨ ERP：采购入库 50%
|
2 years ago |
|
YunaiV
|
600892b112
|
✨ ERP：初始化采购订单 50%
|
2 years ago |
|
YunaiV
|
949096f776
|
✨ ERP：初始化销售退货逻辑 50%
|
2 years ago |
|
YunaiV
|
00a386dd7c
|
✨ ERP：增加 ERP 销售出库的编辑界面
|
2 years ago |
|
YunaiV
|
e535384f45
|
✨ ERP：增加 ERP 销售出库的实现 30%（列表）
|
2 years ago |
|
YunaiV
|
f7c5266015
|
✨ ERP：增加 ERP 销售订单的实现 90%
|
2 years ago |
|
YunaiV
|
b25d9c0f09
|
✨ ERP：增加结算账户 100%
|
2 years ago |
|
YunaiV
|
ab63660bf8
|
✨ ERP：增加 ERP 销售订单的实现 50%（详情）
新年快乐~
|
2 years ago |
|
YunaiV
|
2615054fb2
|
✨ ERP：增加 ERP 销售订单的实现 40%（列表）
|
2 years ago |
|
YunaiV
|
b55c8417fb
|
✨ ERP：增加 ERP 销售订单的实现 30%
|
2 years ago |
|
YunaiV
|
0319056e4b
|
✨ ERP：增加 ERP 盘点单的实现 50%
|
2 years ago |
dhb52
|
ae3d44d8bd
|
feat: 待回款提醒,即将到期的合同,待审核回款
|
2 years ago |
|
YunaiV
|
3c4932bc77
|
✨ ERP：增加 ERP 调拨单的实现 100%
|
2 years ago |
|
YunaiV
|
896f9758ed
|
✨ ERP：增加 ERP 客户的实现
|
2 years ago |
|
YunaiV
|
616fd3f7ba
|
✨ ERP：初始化其它出库的实现
|
2 years ago |
|
YunaiV
|
115c30ea40
|
✨ ERP：增加入库单的审批功能
|
2 years ago |
|
YunaiV
|
5bdf0fc0ff
|
✨ ERP：增加供应商的实现
|
2 years ago |
|
YunaiV
|
9cbdfe0ecb
|
✨ ERP：初始化其它入库的表单 50%
|
2 years ago |
|
YunaiV
|
53c94af027
|
✨ ERP：初始化其它入库的表单 40%
|
2 years ago |
|
YunaiV
|
d92404f351
|
✨ ERP：初始化其它入库的表单 20%
|
2 years ago |
|
YunaiV
|
26343635e4
|
✨ ERP：完成 stock 产品库存、库存明细的实现
|
2 years ago |
|
YunaiV
|
6d9ca290b3
|
✨ ERP：完成 stock 仓库信息的实现
|
2 years ago |
|
YunaiV
|
36a0330277
|
✨ ERP：完成 product 信息、分类、单位的实现
|
2 years ago |
安浩浩
|
3cdcd67a6a
|
新增：CRM 商业智能，其他排名接口
|
2 years ago |
owen
|
89fdb5ced9
|
基础设施：前端直连上传，优先使用自定义域名
|
2 years ago |
|
YunaiV
|
ce9317e3d0
|
✨ ERP：初始化 product 信息、分类、单位的实现
|
2 years ago |
|
owen
|
dd08fbcb46
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
490bb901e1
|
基础设施：增加前端直连上传文件到S3服务的功能
|
2 years ago |
|
YunaiV
|
cac39ae126
|
CRM：优化合同列的新增/修改界面
|
2 years ago |
puhui999
|
fe91c5ec5c
|
CRM：transfer
|
2 years ago |
|
puhui999
|
6d0e242387
|
CRM-合同：完善 TODO
|
2 years ago |
|
YunaiV
|
4549f8ed3c
|
CRM：优化合同金额排行、回款金额排行
|
2 years ago |
|
芋道源码
|
d6438943b8
|
!380 修改：商业智能-排行榜，合同金额排行和回款金额排行时间条件和接口修改
Merge pull request !380 from 安浩浩/dev
|
2 years ago |
|
YunaiV
|
956f19d9d0
|
CRM：合同的 code review
|
2 years ago |
|
安浩浩
|
34a796de89
|
修改：商业智能-排行榜，合同金额排行和回款金额排行时间条件和接口修改
|
2 years ago |
|
芋道源码
|
a5f8c3d79c
|
!376 完善客户导入，统一日志获取接口
Merge pull request !376 from puhui999/dev-crm
|
2 years ago |
|
芋道源码
|
4271788a83
|
!377 feat: CRM-backlog-待进入公海的客户
Merge pull request !377 from dhb52/crm-msg
|
2 years ago |
|
anhaohao
|
770e551900
|
新增：商业智能-排行榜，合同金额排行和回款金额排行
|
2 years ago |
|
puhui999
|
41195d5b4a
|
CRM-合同：新增合同预览审批流程和提交审核
|
2 years ago |
|
puhui999
|
668da2fa86
|
CRM-合同：新增合同详情
|
2 years ago |
|
puhui999
|
90e0baf5bc
|
CRM-合同：完善合同表单
|
2 years ago |
|
dhb52
|
4a2349ecf5
|
feat: CRM-backlog-待进入公海的客户
|
2 years ago |
|
puhui999
|
331b6c5611
|
CRM-合同：完善合同表单
|
2 years ago |
|
puhui999
|
ed94205fa7
|
CRM-合同：完善合同表单
|
2 years ago |
|
puhui999
|
a64d4240a3
|
CRM-联系人：完善联系人转移、数据权限
|
2 years ago |
|
puhui999
|
5adf75d15b
|
CRM：统一日志获取接口
|
2 years ago |
|
puhui999
|
26daa3a1ff
|
CRM-客户：完善客户导入
|
2 years ago |
|
YunaiV
|
64cfcbf6e0
|
Merge branch 'crm-msg' of https://gitee.com/dhb52/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/crm/backlog/tables/TodayCustomer.vue
|
2 years ago |
|
YunaiV
|
66ff10d00c
|
CRM：code review 跟进记录，
|
2 years ago |
|
puhui999
|
d735f782fc
|
fix: 修复 CRM 的一些 bug
|
2 years ago |
|
dhb52
|
24e8bd4c47
|
Merge remote-tracking branch 'yudao/dev' into crm-msg
|
2 years ago |
|
puhui999
|
f88b26e3c3
|
多图上传组件优化
|
2 years ago |
|
YunaiV
|
49a806a6f9
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
YunaiV
|
2dcd131097
|
✨ 调整启动命令，恢复 npm run dev；如果要连接远程服务
|
2 years ago |
kyle
|
2c9393702d
|
feat: 新增流程抄送
|
2 years ago |
|
dhb52
|
48693b50f2
|
wip: CRM-代办消息-修改模块为backlog
|
2 years ago |
|
YunaiV
|
9fa769b16a
|
📖 CRM：跟进记录的 code review
|
2 years ago |
|
芋道源码
|
163613e90c
|
!363 crm：新增跟进组件、转移表单组件封装，完善按钮数据权限控制、客户公海抽离
Merge pull request !363 from puhui999/dev-crm
|
2 years ago |
|
YunaiV
|
1e70a1d57e
|
📖 CRM：待办事项的 code review
|
2 years ago |
|
dhb52
|
24849335a8
|
wip: 待办事项
|
2 years ago |
|
puhui999
|
2a55d88a44
|
Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
# src/router/modules/remaining.ts
|
2 years ago |
|
puhui999
|
9cbb3aa84a
|
crm-客户：完善转移和按钮权限
|
2 years ago |
|
puhui999
|
5151824110
|
crm-客户：公海抽离，完善跟进
|
2 years ago |
|
puhui999
|
d29dfef7c7
|
新增客户跟进
|
2 years ago |
|
YunaiV
|
26bb847383
|
✨ MALL：简化商品分类的 VO 转化
|
2 years ago |
|
芋道源码
|
fdfb028dd9
|
!360 Review代码修改
Merge pull request !360 from 疯狂的世界/dev
|
2 years ago |
|
芋道源码
|
66c48a913c
|
📖 CRM：产品模块的 review
|
2 years ago |
|
YunaiV
|
a9400c5171
|
✨ MALL：简化 SPU 属性的维护逻辑
|
2 years ago |
|
YunaiV
|
a38ddb699a
|
📖 MALL：商品编辑 => 优化 DeliveryForm 表单
|
2 years ago |
|
YunaiV
|
20b4a7fd66
|
📖 MALL：商品编辑 => 优化 SKU 表单
|
2 years ago |
|
anhaohao
|
4f89eb6ba9
|
新增：产品详情页面
|
2 years ago |
|
owen
|
bdf95dc0f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
a9c231bed6
|
营销：统一装修预览图片字段名称
|
2 years ago |
|
YunaiV
|
2c76d3aeee
|
📖 MALL：商品编辑 => 将 detail 还是使用 form 复用，减少维护成本
|
2 years ago |
|
YunaiV
|
f1c858b9af
|
📖 MALL：商品编辑的简化
|
2 years ago |
|
YunaiV
|
ab64a1d1df
|
📖 MALL：code review 满减送活动
|
2 years ago |
|
芋道源码
|
1e68cd53a0
|
!352 满减送模块
Merge pull request !352 from Bluemark/dev
|
2 years ago |
|
YunaiV
|
ec87c1b61d
|
📖 CRM：code review crm 客户列表
|
2 years ago |
|
芋道源码
|
4eb3c8a2f9
|
!358 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
Merge pull request !358 from puhui999/dev-crm
|
2 years ago |
|
芋道源码
|
09fa30b0d6
|
!359 crm联系人新增操作日志
Merge pull request !359 from zyna/dev
|
2 years ago |
|
芋道源码
|
9bdba0f67e
|
!351 商品统计
Merge pull request !351 from 疯狂的世界/dev
|
2 years ago |
zyna
|
3af6811c72
|
crm联系人新增操作日志
|
2 years ago |
|
puhui999
|
17be1abb65
|
客户详情完善
|
2 years ago |
|
YunaiV
|
d36c4ab36c
|
✨ MALL：去除分销提现的银行配置
|
2 years ago |
|
owen
|
1fb7701e6e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
YunaiV
|
5e265a9094
|
✨ CRM：【联系人】统一字段
|
2 years ago |
|
YunaiV
|
d71097ac31
|
📖 CRM：【客户配置】调整目录结构
|
2 years ago |
|
YunaiV
|
4fbb3b88e6
|
📖 CRM：【客户】微调客户列表界面
|
2 years ago |
|
YunaiV
|
0a4023ef00
|
📖 CRM：code review 商机模块
|
2 years ago |
|
芋道源码
|
45521c139c
|
!350 crm联系人商机review修改
Merge pull request !350 from zyna/dev
|
2 years ago |
|
YunaiV
|
1eefa02c4c
|
📖 操作日志的界面实现
|
2 years ago |
|
芋道源码
|
631c105f94
|
!346 feat：新增公共操作日志详情组件
Merge pull request !346 from puhui999/dev-crm
|
2 years ago |
|
puhui999
|
261d8b2aa4
|
crm-客户：集成操作日志详情组件
|
2 years ago |
AhJindeg
|
2223f7f197
|
fix(task): 🐞 Update return list API endpoint
- 修改获取回退节点列表接口地址
|
2 years ago |
落日晚风
|
21e8dbf985
|
满减送数据对接
|
2 years ago |
|
zyna
|
a1fd3afc32
|
crm联系人商机修改
|
2 years ago |
|
owen
|
ca35e1a4af
|
统计：增加商品统计
|
2 years ago |
|
YunaiV
|
be4750a174
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
水人
|
346863a8a9
|
update src/api/bpm/task/index.ts.
后台接口地址是return-list，前台写成了get-return-list
Signed-off-by: 水人 <417693680@qq.com>
|
2 years ago |
|
puhui999
|
455688eaa8
|
crm-客户：集成操作日志详情组件
|
2 years ago |
|
puhui999
|
59c6670775
|
feat：新增公共操作日志详情组件
|
2 years ago |
|
芋道源码
|
b4aa09aa6c
|
!327 【新增】ureport2 集成
Merge pull request !327 from souvc/master
|
2 years ago |
|
YunaiV
|
ce79dd68a3
|
📈 CRM：code review 联系人商机功能
|
2 years ago |
|
芋道源码
|
d6291382e8
|
!341 crm联系人商机功能
Merge pull request !341 from zyna/dev
|
2 years ago |
|
YunaiV
|
b3d66cd0aa
|
🔨 CRM：优化产品代码的实现
|
2 years ago |
|
芋道源码
|
ee9667504f
|
!342 【CRM：优化产品以及产品分类】
Merge pull request !342 from ZanGe丶/master
|
2 years ago |
|
YunaiV
|
0c613e94a8
|
🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确
|
2 years ago |
liuhongfeng
|
d9ed3d1a6b
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
ZanGe丶
|
dde61c29a0
|
【crm:优化产品及产品分类】
|
2 years ago |
|
zyna
|
ba49b2851c
|
联系人商机功能
|
2 years ago |
|
YunaiV
|
5eb30c7e85
|
🐛 修复 job 在 IDEA 报错的问题
|
2 years ago |
|
liuhongfeng
|
0b9cf35b17
|
【修改】ureport2 集成
|
2 years ago |
|
YunaiV
|
85fe4ad8d6
|
🐛 修复 file 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
3d2d48b601
|
🐛 修复 user 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
fa421d0895
|
🐛 修复 tenant 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
3407cc66a9
|
🐛 修复 sms 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
dd4a77ff22
|
🐛 修复 sensitiveWord 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
5766dc81d1
|
🐛 修复 notify 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
b103c40874
|
🐛 修复 notice 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
1066551fd1
|
🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题
|
2 years ago |
|
YunaiV
|
757fbddef2
|
🐛 修复 dictType 和 dictData 在 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 |
|
YunaiV
|
bdc80ea55b
|
crm: 增加基于客户查询回款分页
|
2 years ago |
|
owen
|
b4ba1043d6
|
eslint
|
2 years ago |
|
owen
|
08be359578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
YunaiV
|
88e5e67a89
|
crm: 增加基于客户查询商机分页
|
2 years ago |
|
YunaiV
|
31a42fc3f7
|
crm：增加合同 List 组件
|
2 years ago |
|
YunaiV
|
5f26c4afe9
|
crm：完善数据权限的界面
|
2 years ago |
|
YunaiV
|
7de0e93d5a
|
crm：联系人增加 ContactList 组件，提供给其它模块内嵌
|
2 years ago |
|
YunaiV
|
ddfceddf4a
|
crm：code review 联系人详情
|
2 years ago |
wanwan
|
85810c0786
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2 years ago |
ljlleo
|
50430bb9cd
|
商机、商机状态类型
|
2 years ago |
|
芋道源码
|
57b20f1810
|
!336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
|
2 years ago |
Evol郑天
|
633965b07d
|
同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
|
2 years ago |
|
zyna
|
46a8755c93
|
联系人review修改
|
2 years ago |
|
liuhongfeng
|
7df7719be3
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
owen
|
d4dc105b4f
|
营销：适配商城装修组件【营销文章】
|
2 years ago |
|
芋道源码
|
54897b6d1b
|
!332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
|
2 years ago |
|
芋道源码
|
c6192a1918
|
!329 完善团队成员公共组件,crm-客户：集成团队成员
Merge pull request !329 from puhui999/dev-crm
|
2 years ago |
|
liuhongfeng
|
764e1715be
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
YunaiV
|
1744c6ec6f
|
websocket 重新封装
|
2 years ago |
|
owen
|
253401ace3
|
营销：适配商城装修组件【优惠券】
|
2 years ago |
|
puhui999
|
19a0a83054
|
crm-数据权限：完善团队成员公共组件
|
2 years ago |
|
YunaiV
|
f74ddf46ae
|
sms：移除 sendCode、sendMsg 字段
|
2 years ago |
|
liuhongfeng
|
4440ec866c
|
【新增】ureport2 集成
|
2 years ago |
|
芋道源码
|
b0b669129b
|
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
|
2 years ago |
|
YunaiV
|
b1f5ad55b8
|
crm：code review 权限列表
|
2 years ago |
|
芋道源码
|
2e01944df9
|
!322 crm-团队成员：完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
|
2 years ago |
|
芋道源码
|
c06223decd
|
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
|
2 years ago |
|
芋道源码
|
538783ce2d
|
!317 crm联系人前端
Merge pull request !317 from zyna/master
|
2 years ago |
|
YunaiV
|
a42d0695fe
|
代码生成：增加主子表 erp 模式的示例
|
2 years ago |
|
YunaiV
|
6c405ba420
|
代码生成：增加主子表 inner 模式的示例
|
2 years ago |
|
YunaiV
|
9aca49c1ff
|
代码生成：增加主子表 normal 模式的示例
|
2 years ago |
|
YunaiV
|
bbc37613b6
|
代码生成：增加 tree 树形的示例
|
2 years ago |
|
YunaiV
|
40b1522ed0
|
代码生成：增加 crud 单表示例
|
2 years ago |
|
puhui999
|
8e0cf5c1e5
|
crm-团队成员：新增获得权限级别名称函数 getLevelName
|
2 years ago |
|
puhui999
|
015a1640c1
|
crm-团队成员：完善团队成员通用组件封装
|
2 years ago |
|
YunaiV
|
45656562a8
|
代码生成：支持设置主子表的信息
|
2 years ago |
|
puhui999
|
27c9a0f32d
|
crm-团队成员： 先提交一波
|
2 years ago |
|
YunaiV
|
999d8de9e9
|
代码生成：增加主子表（内嵌）的示例
|
2 years ago |
|
YunaiV
|
f0f7886025
|
代码生成：增加主子表（普通）的示例
|
2 years ago |
|
YunaiV
|
72c5eaae31
|
代码生成：增加 one 情况下的示例代码
|
2 years ago |
|
zyna
|
ed26142bb0
|
crm联系人init
|
2 years ago |
|
Wanwan
|
6369b334e3
|
feat: CRM 客户限制
|
2 years ago |
|
YunaiV
|
4e413a10e6
|
主子表：暂时存储，准备重构
|
2 years ago |
|
Wanwan
|
288aa72cdd
|
feat: CRM 客户公海配置
|
2 years ago |
niou233
|
084009f7f2
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
niou233
|
f2c71d5836
|
refactor: 会员商品收藏
|
2 years ago |
|
YunaiV
|
eb9f8c9f6f
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
YunaiV
|
85ee558bef
|
多租户：登录界面，根据 host 域名获取对应的租户编号
|
2 years ago |
VicoHu
|
3f803767c4
|
fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
|
2 years ago |
|
YunaiV
|
47bb88d892
|
code review：产品分类
|
2 years ago |
|
YunaiV
|
e1cff74f41
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
芋道源码
|
596ad888e1
|
!308 【增加CRM：产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
|
2 years ago |
|
YunaiV
|
65d85e30ca
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
芋道源码
|
f0c45103e1
|
!309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
|
2 years ago |
|
ZanGe丶
|
ff6f05df84
|
【crm:产品及产品分类】
|
2 years ago |
|
YunaiV
|
a9b91e7436
|
优化：社交登录、用户的管理
|
2 years ago |
|
YunaiV
|
ac7f1e29fb
|
Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2 years ago |
|
Wanwan
|
23f483ac45
|
feat: 客户详情 + review 修改
|
2 years ago |
jason
|
fcc748dc63
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
jason
|
753f5de81e
|
转账 - 新增转账订单查询
|
2 years ago |
dongshanshan
|
9a3253ad20
|
feat: 会员商品收藏
|
2 years ago |
|
owen
|
881c4f3a29
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
2 years ago |
|
liuhongfeng
|
2b84de7e09
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2 years ago |
|
jason
|
c1534bf168
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
2 years ago |
|
owen
|
e9ff8d3237
|
商城装修
|
2 years ago |
|
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
2 years ago |
|
Wanwan
|
4cdab6fb3e
|
feat: 调整客户表的字段
|
2 years ago |
|
puhui999
|
a624db04e9
|
三方应用新增授权方的网页应用 agentId 属性
|
2 years ago |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
2 years ago |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
2 years ago |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
2 years ago |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
2 years ago |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
2 years ago |
|
YunaiV
|
6c6c2cb058
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2 years ago |
|
芋道源码
|
af79d4a653
|
!285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
|
2 years ago |
|
芋道源码
|
73578ce8b2
|
!290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
|
2 years ago |
|
芋道源码
|
4709c18a6e
|
!284 完善 SPU，订单列表：完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
|
2 years ago |
|
芋道源码
|
929fa9a208
|
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
|
2 years ago |
kehaiyou
|
5cfb67d047
|
fix: 【工作流】--加签减签review修改接口地址
|
2 years ago |
|
jason
|
bb5945958b
|
钱包 - 优化
支付应用 - 证书模式增加应用私钥
|
2 years ago |
|
芋道源码
|
e187c55408
|
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
|
2 years ago |
|
puhui999
|
491b3a5018
|
新增 banner 管理
|
2 years ago |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
2 years ago |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
2 years ago |
zhangshuai
|
9f77514c17
|
限时折扣
|
2 years ago |
|
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
2 years ago |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2 years ago |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2 years ago |
|
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
2 years ago |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
2 years ago |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
2 years ago |
|
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
2 years ago |
|
芋道源码
|
0089d59d36
|
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
|
2 years ago |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 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
|
2 years ago |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
2 years ago |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
6fc232b758
|
交易：订单核销
|
2 years ago |
|
dhb52
|
dced551698
|
feat: CRM/合同 crud
|
2 years ago |
|
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
2 years ago |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2 years ago |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
2 years ago |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
e1a72779d4
|
统计：Review修改
|
2 years ago |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
2 years ago |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
3802fee661
|
商城：增加商城首页
|
2 years ago |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
2 years ago |
|
puhui999
|
50e43e4028
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
2 years ago |
|
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
2 years ago |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2 years ago |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
2 years ago |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
3 years ago |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
3 years ago |
youkehai
|
62a953815d
|
fix: 减签按钮显示和api地址修改
|
3 years ago |
|
owen
|
6b7040404e
|
统计：会员统计
|
3 years ago |
|
owen
|
d4a521eff1
|
统计：交易统计Review修改
|
3 years ago |
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
3 years ago |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
3 years ago |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
3 years ago |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
3 years ago |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
3 years ago |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
3 years ago |
|
owen
|
58b6b1ba57
|
交易：核销
|
3 years ago |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
3 years ago |
|
YunaiV
|
a9bbbc7b0a
|
trade：优化运费模版的实现
|
3 years ago |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
3 years ago |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
3 years ago |
|
owen
|
3a96812d47
|
会员：会员配置的积分相关字段加上point前缀
|
3 years ago |
|
owen
|
3ab1ed707f
|
会员：积分配置改为会员配置
|
3 years ago |
|
owen
|
0066d79876
|
签到：签到后增加用户积分、经验
|
3 years ago |
|
owen
|
4b7e57e67d
|
会员详情，修改会员积分
|
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 |
|
kehaiyou
|
b1469669e2
|
Merge branch 'feature/bpm-delegate'
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
3 years ago |
|
YunaiV
|
2f82eff526
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
youkehai
|
2aeba127b6
|
Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
3 years ago |
|
owen
|
a5dd7f4a81
|
分销：修正分享海报
|
3 years ago |
|
YunaiV
|
245147223f
|
code review：驳回逻辑
|
3 years ago |
|
芋道源码
|
ada93a160b
|
!251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
|
3 years ago |
|
owen
|
2c22ef8ef1
|
分销：重命名提现类型字段
|
3 years ago |
|
kehaiyou
|
f40d1de62a
|
fix: 【工作流】--回退的高亮和api地址更换
|
3 years ago |
|
kehaiyou
|
20fe343646
|
feat: 【工作流】--委派
|
3 years ago |
|
芋道源码
|
0ffd07447b
|
!248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
|
3 years ago |
|
kehaiyou
|
de79e79d91
|
feat: 支持回退按钮
|
3 years ago |
|
puhui999
|
dd5a1f2d43
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
owen
|
854acf6e70
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
puhui999
|
8778f5746f
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
芋道源码
|
de615c2387
|
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
|
3 years ago |
|
puhui999
|
5dc0c6e3da
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
puhui999
|
7e511d1e4f
|
mall-order：修复 todo 提到的问题
|
3 years ago |
|
owen
|
5ed909263a
|
trade: 分销业务后台功能：修改上级推广人
|
3 years ago |
|
owen
|
7ea3571356
|
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 |
|
YunaiV
|
3c315cf287
|
code review：完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
|
芋道源码
|
dbfabcbbb5
|
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
|
3 years ago |
|
owen
|
e9d5027e72
|
trade: 优化分销用户佣金字段名称
|
3 years ago |
|
owen
|
7263315412
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
3 years ago |
|
owen
|
34ce7f7ec5
|
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 |
|
owen
|
1e2120806d
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
2ed5d12be8
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
35664d1f32
|
trade: 增加交易中心配置表
|
3 years ago |
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
3 years ago |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
3 years ago |
|
owen
|
5a9764c08c
|
member: 分销配置
|
3 years ago |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
3 years ago |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
3 years ago |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
3 years ago |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
3 years ago |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
3 years ago |
|
YunaiV
|
29b8d06ff2
|
code review：售后详情
|
3 years ago |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
3 years ago |
|
puhui999
|
ed739aec55
|
订单售后列表：完善售后详情及相关操作
|
3 years ago |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
3 years ago |
|
puhui999
|
4f81468695
|
订单售后列表：重构列表
|
3 years ago |
|
owen
|
beef6a0a94
|
mall: 完善后台发送优惠券
|
3 years ago |
|
YunaiV
|
2d8d323767
|
code review：会员中心
|
3 years ago |
|
绮梦
|
76e37a3ee7
|
Merge remote-tracking branch 'origin/dev' into dev-gitee
|
3 years ago |
|
绮梦
|
45a6b3bcc7
|
账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
|
3 years ago |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
343b6bbf18
|
!220 商品：完善商品评论功能
Merge pull request !220 from 疯狂的世界/owen_dev
|
3 years ago |
|
YunaiV
|
1b6c9b2e29
|
code review：用户详情
|
3 years ago |
|
YunaiV
|
415309469c
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/index.vue
|
3 years ago |
|
owen
|
814b4631c9
|
商品：完善后台商品评论功能
|
3 years ago |
|
绮梦
|
28951fb31d
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
|
3 years ago |
|
puhui999
|
6b487c7e68
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
3 years ago |
|
owen
|
2e68a5239d
|
Merge remote-tracking branch 'origin/dev' into member_dev
# Conflicts:
# src/views/member/user/UserForm.vue
|
3 years ago |
|
owen
|
e9120f06cf
|
会员: 会员等级取消分页功能
|
3 years ago |
|
YunaiV
|
55772cbba0
|
code review：用户详情
|
3 years ago |
|
YunaiV
|
746bf864d9
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/mall/promotion/combination/record/index.vue
|
3 years ago |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
3 years ago |
|
芋道源码
|
69a66b2a06
|
!210 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
Merge pull request !210 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
bb0c1cb536
|
code review：会员等级
|
3 years ago |
|
puhui999
|
5dceda614a
|
订单列表：列表重构 添加门店、物流检索条件
|
3 years ago |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
绮梦
|
10d9f11fba
|
增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。
|
3 years ago |
|
芋道源码
|
40711c0eb8
|
!209 会员：增加用户等级功能
Merge pull request !209 from 疯狂的世界/member_dev
|
3 years ago |
|
owen
|
51738f8f6e
|
会员: 修改会员等级，使用单独的表单、接口
|
3 years ago |
|
puhui999
|
71f9337d82
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
0d202a7a85
|
订单列表：列表重构 ③ 添加备注表单和发货表单
|
3 years ago |
|
owen
|
78917cd2be
|
会员：增加用户分组
|
3 years ago |
|
puhui999
|
345c09ee6c
|
订单列表：列表重构 ② and 完善订单详情
|
3 years ago |
|
owen
|
884bb055b0
|
会员：用户标签增加下拉框使用的 精简信息列表查询接口
|
3 years ago |
|
owen
|
7bef240926
|
会员：后台调整会员等级
|
3 years ago |
|
YunaiV
|
be485cc4ab
|
code review：签到记录
|
3 years ago |
|
YunaiV
|
82628ce780
|
code review：签到配置
|
3 years ago |
|
owen
|
f1735a4010
|
会员：增加会员等级增删改查
|
3 years ago |
|
YunaiV
|
76a63e01c9
|
code review：会员签到配置
|
3 years ago |
|
芋道源码
|
cbd3d6c9a2
|
!204 会员积分和会员签到模块todo修改
Merge pull request !204 from QingX/dev
|
3 years ago |
|
puhui999
|
161feab244
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
2eb740765e
|
订单列表：列表重构 ①
|
3 years ago |
|
owen
|
334962fe09
|
会员：
1.增加会员标签功能
|
3 years ago |
xiaqing
|
f96882c841
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
4fd9dfd1f8
|
会员中心：会员管理 50%
|
3 years ago |