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
|
3 years ago |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
3 years ago |
|
owen
|
e9ff8d3237
|
商城装修
|
3 years ago |
|
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
3 years ago |
|
Wanwan
|
4cdab6fb3e
|
feat: 调整客户表的字段
|
3 years ago |
|
puhui999
|
a624db04e9
|
三方应用新增授权方的网页应用 agentId 属性
|
3 years ago |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
3 years ago |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
3 years ago |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
3 years ago |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
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 |
|
芋道源码
|
73578ce8b2
|
!290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
|
3 years ago |
|
芋道源码
|
4709c18a6e
|
!284 完善 SPU，订单列表：完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
929fa9a208
|
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
|
3 years ago |
kehaiyou
|
5cfb67d047
|
fix: 【工作流】--加签减签review修改接口地址
|
3 years ago |
|
jason
|
bb5945958b
|
钱包 - 优化
支付应用 - 证书模式增加应用私钥
|
3 years ago |
|
芋道源码
|
e187c55408
|
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
|
3 years ago |
|
puhui999
|
491b3a5018
|
新增 banner 管理
|
3 years ago |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
3 years ago |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
3 years ago |
zhangshuai
|
9f77514c17
|
限时折扣
|
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
|
01d78429cc
|
SPU: 完善优惠卷选择
|
3 years ago |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
3 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
3 years ago |
|
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
3 years ago |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
3 years ago |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
3 years ago |
|
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
3 years ago |
|
芋道源码
|
0089d59d36
|
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
|
3 years ago |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
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 |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
6fc232b758
|
交易：订单核销
|
3 years ago |
dhb52
|
dced551698
|
feat: CRM/合同 crud
|
3 years ago |
|
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
3 years ago |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
3 years ago |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
3 years ago |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
e1a72779d4
|
统计：Review修改
|
3 years ago |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
3 years ago |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
3802fee661
|
商城：增加商城首页
|
3 years ago |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
3 years ago |
|
puhui999
|
50e43e4028
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
3 years ago |
|
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
3 years ago |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
3 years ago |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
3 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 |