Commit Graph

1258 Commits

Author SHA1 Message Date
liuhongfeng
eddf5091a0 【修改】ureport2 集成
(cherry picked from commit aceac6daae)
2024-03-06 20:56:01 +08:00
owen
a494d2723b 营销:适配商城装修组件【优惠券】
(cherry picked from commit 253401ace3)
2024-03-06 20:55:51 +08:00
puhui999
6b43ec9d3c crm-客户:集成团队成员
(cherry picked from commit 12b59200c1)
2024-03-06 20:53:49 +08:00
puhui999
6da65b76d0 crm-数据权限:完善团队成员公共组件
(cherry picked from commit 19a0a83054)
2024-03-06 20:53:41 +08:00
YunaiV
b78421a31e sms:移除 sendCode、sendMsg 字段
(cherry picked from commit f74ddf46ae)
2024-03-06 20:52:19 +08:00
owen
e2fb9df663 商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题
(cherry picked from commit 1bb9df7b3c)
2024-03-06 20:50:08 +08:00
liuhongfeng
2988989b1a 【新增】ureport2 集成
(cherry picked from commit 4440ec866c)
2024-03-06 20:49:58 +08:00
owen
f0991ddedb 商品评论、优惠券模板复用组件【商品橱窗】
(cherry picked from commit e0a731dd86)
2024-03-06 20:49:53 +08:00
owen
a616b019b8 营销:适配商城装修组件【商品栏】
(cherry picked from commit 3198688eb5)
2024-03-06 20:49:48 +08:00
YunaiV
7f50592069 crm:code review 权限列表
(cherry picked from commit b1f5ad55b8)
2024-03-06 20:49:39 +08:00
YunaiV
b1892674f6 crm:code review 客户配置管理
(cherry picked from commit 526172af60)
2024-03-06 20:49:30 +08:00
YunaiV
c631fa7915 crm:code review 联系人管理
(cherry picked from commit 85e953b920)
2024-03-06 20:49:20 +08:00
YunaiV
1a6a68be5a 代码生成:增加说明文档
(cherry picked from commit 652698b871)
2024-03-06 20:45:38 +08:00
YunaiV
646f73b923 代码生成:增加主子表 erp 模式的示例
(cherry picked from commit a42d0695fe)
2024-03-06 20:44:51 +08:00
口口口
ebfc1b1375 update src/views/Profile/components/UserSocial.vue.
在这里绑定,绑定成功后,列表重复

Signed-off-by: 口口口 <17975121@qq.com>
(cherry picked from commit 68f6683e52)
2024-03-06 20:44:48 +08:00
owen
d492186d3e 营销:适配商城装修组件【商品卡片】
(cherry picked from commit b4a1772584)
2024-03-06 20:44:34 +08:00
YunaiV
262ef0f651 代码生成:增加主子表 inner 模式的示例
(cherry picked from commit 6c405ba420)
2024-03-06 20:44:23 +08:00
YunaiV
8d2d1a26b5 代码生成:增加主子表 normal 模式的示例
(cherry picked from commit 9aca49c1ff)
2024-03-06 20:43:58 +08:00
YunaiV
59e98a6679 代码生成:增加 tree 树形的示例
(cherry picked from commit bbc37613b6)
2024-03-06 20:43:52 +08:00
YunaiV
eeaa608995 代码生成:支持树形表结构的配置
(cherry picked from commit 3d0c4f4422)
2024-03-06 20:43:44 +08:00
YunaiV
4cf6b9000a 代码生成:增加 crud 单表示例
(cherry picked from commit 40b1522ed0)
2024-03-06 20:43:40 +08:00
Wanwan
13d1b3a084 feat: CRM 客户限制
(cherry picked from commit 22206b25e1)
2024-03-06 20:43:21 +08:00
xingyu
9d52790910 fix: stylelint
(cherry picked from commit 821c804189)
2024-03-06 20:41:49 +08:00
xingyu
18251290f9 fix: eslint
(cherry picked from commit 249e0d21a3)
2024-03-06 20:41:08 +08:00
xingyu
62a6d5490f docs: update deps
(cherry picked from commit 8a74b954d0)
2024-03-06 20:39:33 +08:00
xingyu
4248cd1541 chore: update deps
(cherry picked from commit e56afbf80f)
2024-03-06 20:39:19 +08:00
puhui999
76c05964fa crm-团队成员:新增获得权限级别名称函数 getLevelName
(cherry picked from commit 8e0cf5c1e5)
2024-03-06 20:36:44 +08:00
puhui999
8e08665344 crm-团队成员:完善团队成员通用组件封装
(cherry picked from commit 015a1640c1)
2024-03-06 20:36:29 +08:00
YunaiV
3524e3525b 代码生成:支持设置主子表的信息
(cherry picked from commit 45656562a8)
2024-03-06 20:36:07 +08:00
柯杨
9449829fd3 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
(cherry picked from commit 8bb9dec328)
2024-03-06 20:33:44 +08:00
puhui999
fa1d2f25e7 crm-团队成员: 先提交一波
(cherry picked from commit 27c9a0f32d)
2024-03-06 20:33:39 +08:00
puhui999
c58275cd41 fix:如果已经到重新登录页面则不进行弹窗提示
(cherry picked from commit 2385cd9b9a)
2024-03-06 20:33:26 +08:00
YunaiV
8823f11109 代码生成:增加主子表(内嵌)的示例
(cherry picked from commit 999d8de9e9)
2024-03-06 20:33:21 +08:00
YunaiV
05592577ff 代码生成:增加主子表(普通)的示例
(cherry picked from commit f0f7886025)
2024-03-06 20:33:18 +08:00
YunaiV
26e6d287f5 代码生成:增加 one 情况下的示例代码
(cherry picked from commit 72c5eaae31)
2024-03-06 20:33:14 +08:00
owen
d176271313 营销:适配商城装修组件【广告魔方】
(cherry picked from commit 49ebadd748)
2024-03-06 20:33:03 +08:00
Wanwan
291c34f45a feat: CRM 客户限制
(cherry picked from commit 702f23e672)
2024-03-06 20:32:59 +08:00
zyna
1f22d9ad0b crm联系人init
(cherry picked from commit ed26142bb0)
2024-03-06 20:32:54 +08:00
Wanwan
5a3fcb3b88 feat: CRM 客户限制
(cherry picked from commit a7f86dfd8b)
2024-03-06 20:32:47 +08:00
Wanwan
f356bf8076 feat: CRM 客户限制
(cherry picked from commit 6369b334e3)
2024-03-06 20:32:43 +08:00
YunaiV
e7886a1224 主子表:确认列表编辑的支持组件情况
(cherry picked from commit 55f6e4ca25)
2024-03-06 20:32:39 +08:00
YunaiV
7613a3b454 主子表:同步三种模式的代码
(cherry picked from commit 9f9e0f8bda)
2024-03-06 20:32:30 +08:00
niou233
95f6dd4bbf update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit af5d1cf25e)
2024-03-06 20:32:26 +08:00
niou233
06d62672e9 update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 1ab5b44254)
2024-03-06 20:32:22 +08:00
niou233
c0b6729620 update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 2ff97758fd)
2024-03-06 20:32:19 +08:00
YunaiV
c1d82098f9 主子表:暂时存储,参数校验-表单数据跑通
(cherry picked from commit 86d9a97ccb)
2024-03-06 20:32:11 +08:00
YunaiV
980d546b06 主子表:暂时存储,样式跑通
(cherry picked from commit d45ebd4fcf)
2024-03-06 20:32:07 +08:00
YunaiV
c8a3c5a3ad 主子表:暂时存储,准备重构
(cherry picked from commit 4e413a10e6)
2024-03-06 20:31:57 +08:00
owen
914ceff305 unplugin-auto-import:排除自动导入店铺装修组件
(cherry picked from commit 55b477acdb)
2024-03-06 20:31:54 +08:00
owen
e8ec61a280 营销:适配商城装修组件【菜单导航】
(cherry picked from commit 82aed175ab)
2024-03-06 20:30:40 +08:00