owen
|
3198688eb5
|
营销：适配商城装修组件【商品栏】
|
3 years ago |
芋道源码
|
b0b669129b
|
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
|
3 years ago |
|
YunaiV
|
ebb19cfe8c
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
YunaiV
|
b1f5ad55b8
|
crm：code review 权限列表
|
3 years ago |
|
芋道源码
|
2e01944df9
|
!322 crm-团队成员：完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
5f0b0bd21d
|
!324 商城装修
Merge pull request !324 from 疯狂的世界/dev
|
3 years ago |
|
芋道源码
|
9d7c578d48
|
!323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
|
3 years ago |
|
YunaiV
|
526172af60
|
crm：code review 客户配置管理
|
3 years ago |
|
芋道源码
|
c06223decd
|
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
|
3 years ago |
|
YunaiV
|
85e953b920
|
crm：code review 联系人管理
|
3 years ago |
|
YunaiV
|
7c5ae17d04
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/components/DiyEditor/components/ComponentContainer.vue
|
3 years ago |
|
芋道源码
|
538783ce2d
|
!317 crm联系人前端
Merge pull request !317 from zyna/master
|
3 years ago |
|
YunaiV
|
f1e3eccc8a
|
Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
YunaiV
|
652698b871
|
代码生成：增加说明文档
|
3 years ago |
|
芋道源码
|
26dba8b457
|
!325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
|
3 years ago |
|
YunaiV
|
a42d0695fe
|
代码生成：增加主子表 erp 模式的示例
|
3 years ago |
口口口
|
68f6683e52
|
update src/views/Profile/components/UserSocial.vue.
在这里绑定，绑定成功后，列表重复
Signed-off-by: 口口口 <17975121@qq.com>
|
3 years ago |
|
owen
|
b4a1772584
|
营销：适配商城装修组件【商品卡片】
|
3 years ago |
|
YunaiV
|
6c405ba420
|
代码生成：增加主子表 inner 模式的示例
|
3 years ago |
|
YunaiV
|
9aca49c1ff
|
代码生成：增加主子表 normal 模式的示例
|
3 years ago |
|
YunaiV
|
bbc37613b6
|
代码生成：增加 tree 树形的示例
|
3 years ago |
|
YunaiV
|
3d0c4f4422
|
代码生成：支持树形表结构的配置
|
3 years ago |
|
YunaiV
|
40b1522ed0
|
代码生成：增加 crud 单表示例
|
3 years ago |
Wanwan
|
22206b25e1
|
feat: CRM 客户限制
|
3 years ago |
xingyu
|
821c804189
|
fix: stylelint
|
3 years ago |
|
xingyu
|
249e0d21a3
|
fix: eslint
|
3 years ago |
puhui999
|
8e0cf5c1e5
|
crm-团队成员：新增获得权限级别名称函数 getLevelName
|
3 years ago |
|
puhui999
|
ba702d03bc
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
015a1640c1
|
crm-团队成员：完善团队成员通用组件封装
|
3 years ago |
|
YunaiV
|
45656562a8
|
代码生成：支持设置主子表的信息
|
3 years ago |
|
puhui999
|
27c9a0f32d
|
crm-团队成员： 先提交一波
|
3 years ago |
|
YunaiV
|
999d8de9e9
|
代码生成：增加主子表（内嵌）的示例
|
3 years ago |
|
YunaiV
|
f0f7886025
|
代码生成：增加主子表（普通）的示例
|
3 years ago |
|
YunaiV
|
72c5eaae31
|
代码生成：增加 one 情况下的示例代码
|
3 years ago |
|
owen
|
49ebadd748
|
营销：适配商城装修组件【广告魔方】
|
3 years ago |
|
Wanwan
|
702f23e672
|
feat: CRM 客户限制
|
3 years ago |
zyna
|
ed26142bb0
|
crm联系人init
|
3 years ago |
|
Wanwan
|
a7f86dfd8b
|
feat: CRM 客户限制
|
3 years ago |
|
Wanwan
|
6369b334e3
|
feat: CRM 客户限制
|
3 years ago |
|
YunaiV
|
55f6e4ca25
|
主子表：确认列表编辑的支持组件情况
|
3 years ago |
|
YunaiV
|
9f9e0f8bda
|
主子表：同步三种模式的代码
|
3 years ago |
|
YunaiV
|
86d9a97ccb
|
主子表：暂时存储，参数校验-表单数据跑通
|
3 years ago |
|
YunaiV
|
d45ebd4fcf
|
主子表：暂时存储，样式跑通
|
3 years ago |
|
YunaiV
|
4e413a10e6
|
主子表：暂时存储，准备重构
|
3 years ago |
|
Wanwan
|
59b2d89a18
|
feat: CRM 客户公海配置
|
3 years ago |
|
Wanwan
|
288aa72cdd
|
feat: CRM 客户公海配置
|
3 years ago |
niou233
|
084009f7f2
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
niou233
|
f2c71d5836
|
refactor: 会员商品收藏
|
3 years ago |
|
Wanwan
|
57474c0644
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
Wanwan
|
7146fdc9b9
|
style: 客户 review 修改
|
3 years ago |
|
YunaiV
|
85ee558bef
|
多租户：登录界面，根据 host 域名获取对应的租户编号
|
3 years ago |
|
YunaiV
|
c0d5c76a06
|
多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突
|
3 years ago |
|
owen
|
6e9e1d0888
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
47bb88d892
|
code review：产品分类
|
3 years ago |
|
YunaiV
|
e1cff74f41
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
owen
|
fa710b560d
|
营销：增加商城装修组件【图片展示】
|
3 years ago |
|
芋道源码
|
596ad888e1
|
!308 【增加CRM：产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
|
3 years ago |
|
YunaiV
|
17742988c9
|
code review：回款
|
3 years ago |
|
YunaiV
|
65d85e30ca
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
芋道源码
|
f0c45103e1
|
!309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
|
3 years ago |
|
YunaiV
|
4f2f4f72b5
|
优化：社交登录、用户的管理
|
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 |
|
YunaiV
|
f79d31a64a
|
code review：满减送活动
|
3 years ago |
|
芋道源码
|
27defa7268
|
!291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
|
3 years ago |
|
YunaiV
|
a9faeb1bdb
|
code review：客户管理
|
3 years ago |
|
Wanwan
|
23f483ac45
|
feat: 客户详情 + review 修改
|
3 years ago |
liuhongfeng
|
8ef5227f88
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
jason
|
fcc748dc63
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jason
|
753f5de81e
|
转账 - 新增转账订单查询
|
3 years ago |
风狗
|
bf418653e4
|
update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改
Signed-off-by: 风狗 <909275705@qq.com>
|
3 years ago |
|
liuhongfeng
|
3d54ad3a6a
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
3 years ago |
dongshanshan
|
18e2c33cef
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
dongshanshan
|
9a3253ad20
|
feat: 会员商品收藏
|
3 years ago |
|
owen
|
881c4f3a29
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
|
3 years ago |
|
xingyu
|
4365ca6177
|
fix: title name
|
3 years ago |
|
xingyu
|
af7c6f3b2c
|
fix: url error
|
3 years ago |
|
liuhongfeng
|
2b84de7e09
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
3 years ago |
|
jason
|
c1534bf168
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jason
|
55a961e862
|
转账 - 管理后台新增转账示例
|
3 years ago |
|
YunaiV
|
0c81a0d96a
|
code review：客户表的实现
|
3 years ago |
|
owen
|
e9ff8d3237
|
商城装修
|
3 years ago |
|
YunaiV
|
dc5cf9f24c
|
code review：客户表的实现
|
3 years ago |
|
YunaiV
|
690b208a4e
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
3 years ago |
|
Wanwan
|
60d53126c4
|
feat: 调整客户表的字段
|
3 years ago |
|
Wanwan
|
59cf0c29f0
|
feat: 调整客户表的字段
|
3 years ago |
|
Wanwan
|
4cdab6fb3e
|
feat: 调整客户表的字段
|
3 years ago |
|
芋道源码
|
cca34e0acb
|
!295 订单：解决列数据中的 table#header 数据不刷新的问题
Merge pull request !295 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
b9ab22dad1
|
code review：客户表的实现
|
3 years ago |
|
芋道源码
|
32b3c874f5
|
!294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
|
3 years ago |
|
puhui999
|
a624db04e9
|
三方应用新增授权方的网页应用 agentId 属性
|
3 years ago |
|
puhui999
|
88a22d90e5
|
解决钉钉绑定失败的问题
|
3 years ago |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
3 years ago |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
3 years ago |
|
puhui999
|
d060d27ab2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
ca385bc08e
|
解决列数据中的 table#header 数据不刷新的问题
|
3 years ago |
|
xingyu
|
238537df83
|
fix: ElLoading need import
|
3 years ago |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
3 years ago |
|
YunaiV
|
539352f598
|
修复 banner 返回字段不对
|
3 years ago |