1323 Commits

Author SHA1 Message Date
wanwan
7eff0e1891 !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit e1f9e16a77d68591013cac573ded5b3c7347e407)
2024-03-06 21:15:31 +08:00
YunaiV
1d8a41d0f8 crm:code review 商机类型
(cherry picked from commit 3c19cb1a85b8bec70ce07da17eed2829c632c500)
2024-03-06 21:14:58 +08:00
ljlleo
acedf99903 商机、商机状态类型
(cherry picked from commit b3515b2db54bdcae8d43fe89e2acaf72716595b4)
2024-03-06 21:14:51 +08:00
Evol郑天
9f33432926 同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
(cherry picked from commit 633965b07dbbf51cdfc8cb57ce54de2a8f3aa56d)
2024-03-06 21:14:01 +08:00
zyna
2a70d4717b 联系人review修改
(cherry picked from commit 46a8755c936bdaf1e43d339c878ce033a792fe86)
2024-03-06 21:13:55 +08:00
YunaiV
1cf493dedc crm:code review 客户详情
(cherry picked from commit cec8582a90e1c6fd3e0ae22aca60093c70768a9b)
2024-03-06 21:13:43 +08:00
wanwan
3853b763a0 !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit 324d1e859ec66415b469cfdcc2da65c9c96af6a1)
2024-03-06 21:13:27 +08:00
owen
687ec00343 营销:适配商城装修组件【营销文章】
(cherry picked from commit d4dc105b4f4341cbfa0357a6c90bf30ff32aad50)
2024-03-06 21:03:53 +08:00
YunaiV
73f4521bc7 crm:code review 商机类型
(cherry picked from commit 36702f5f90b7ce27a02657caf1ee392c85d4d733)
2024-03-06 21:03:35 +08:00
YunaiV
98c046ecd7 crm:code review 成员
(cherry picked from commit eb97447bb764b49e2d88f83e8a6ebd0b9c37c127)
2024-03-06 21:03:22 +08:00
Marvin
0921704a4b feat: 菜单右上角加一个搜索图标
(cherry picked from commit b95b8008f7356aac7c57a0548e1e7d6c605bf987)
2024-03-06 21:02:10 +08:00
owen
42b78d1411 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题
(cherry picked from commit c3cad3f3ee4f23e5caabea83d08d42eaf955cc1d)
2024-03-06 21:01:57 +08:00
ljlleo
bafc4ca36c 商机、商机状态类型
(cherry picked from commit 2700b08c6978dc2f921b4b4f8088e315dc7e8084)
2024-03-06 21:01:24 +08:00
YunaiV
aee411607f websocket 重新封装
(cherry picked from commit 1744c6ec6fea5897ee202d42c5e6198285ba09e4)
2024-03-06 21:01:13 +08:00
puhui999
79319d3dc8 crm-客户:公海数据区分
(cherry picked from commit f8b56a8c46f6d00acb807c5a5d6a464abefeb3ad)
2024-03-06 20:56:15 +08:00
liuhongfeng
eddf5091a0 【修改】ureport2 集成
(cherry picked from commit aceac6daaea05cb9821e1d210e9e17e4a7e8df0f)
2024-03-06 20:56:01 +08:00
owen
a494d2723b 营销:适配商城装修组件【优惠券】
(cherry picked from commit 253401ace3578ed3118b912b039304e40ee95399)
2024-03-06 20:55:51 +08:00
puhui999
6b43ec9d3c crm-客户:集成团队成员
(cherry picked from commit 12b59200c1b98e5a5e9e9c6c7754ee42fe6730c5)
2024-03-06 20:53:49 +08:00
puhui999
6da65b76d0 crm-数据权限:完善团队成员公共组件
(cherry picked from commit 19a0a83054f73c84a2d5600ef6a1c22e1c68e134)
2024-03-06 20:53:41 +08:00
YunaiV
b78421a31e sms:移除 sendCode、sendMsg 字段
(cherry picked from commit f74ddf46ae518c02ebcb1900ca39e39f97b524af)
2024-03-06 20:52:19 +08:00
owen
e2fb9df663 商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题
(cherry picked from commit 1bb9df7b3c6b7fd8b91195664a36afe151141f4c)
2024-03-06 20:50:08 +08:00
liuhongfeng
2988989b1a 【新增】ureport2 集成
(cherry picked from commit 4440ec866c6ef5f9f68f9b6c4248ab3d2c6f3bb9)
2024-03-06 20:49:58 +08:00
owen
f0991ddedb 商品评论、优惠券模板复用组件【商品橱窗】
(cherry picked from commit e0a731dd86f76292a4b6a7aef3cad1f188c1ff0c)
2024-03-06 20:49:53 +08:00
owen
a616b019b8 营销:适配商城装修组件【商品栏】
(cherry picked from commit 3198688eb53ae39f76472643c8ee80db903e7ab2)
2024-03-06 20:49:48 +08:00
YunaiV
7f50592069 crm:code review 权限列表
(cherry picked from commit b1f5ad55b8f894560ea27c7ffdbe84a45fb35b5c)
2024-03-06 20:49:39 +08:00
YunaiV
b1892674f6 crm:code review 客户配置管理
(cherry picked from commit 526172af605e97453066c6d5b970010707b72430)
2024-03-06 20:49:30 +08:00
YunaiV
c631fa7915 crm:code review 联系人管理
(cherry picked from commit 85e953b920891cd25c1dc886586bd6bcae47af7e)
2024-03-06 20:49:20 +08:00
YunaiV
1a6a68be5a 代码生成:增加说明文档
(cherry picked from commit 652698b871304ae9673f4573cf00654043d6ee16)
2024-03-06 20:45:38 +08:00
YunaiV
646f73b923 代码生成:增加主子表 erp 模式的示例
(cherry picked from commit a42d0695fec0e2831c5b3b09593c93059ce67703)
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 68f6683e52f586f3e0ba166025c47ae68de83f7c)
2024-03-06 20:44:48 +08:00
owen
d492186d3e 营销:适配商城装修组件【商品卡片】
(cherry picked from commit b4a177258467e3a08c33524e50c80b46eaca5215)
2024-03-06 20:44:34 +08:00
YunaiV
262ef0f651 代码生成:增加主子表 inner 模式的示例
(cherry picked from commit 6c405ba42039fd849a387e53df0799419d7a6000)
2024-03-06 20:44:23 +08:00
YunaiV
8d2d1a26b5 代码生成:增加主子表 normal 模式的示例
(cherry picked from commit 9aca49c1ffb1344f5416d793e6c9edc56179ffab)
2024-03-06 20:43:58 +08:00
YunaiV
59e98a6679 代码生成:增加 tree 树形的示例
(cherry picked from commit bbc37613b6c1aa236752926d09c997b046f117e8)
2024-03-06 20:43:52 +08:00
YunaiV
eeaa608995 代码生成:支持树形表结构的配置
(cherry picked from commit 3d0c4f442210e89062f0cf407a31f27e47984e06)
2024-03-06 20:43:44 +08:00
YunaiV
4cf6b9000a 代码生成:增加 crud 单表示例
(cherry picked from commit 40b1522ed0da116f361a17f9ba5d6ee5df021b16)
2024-03-06 20:43:40 +08:00
Wanwan
13d1b3a084 feat: CRM 客户限制
(cherry picked from commit 22206b25e1357e6f69a4d027d130544affcc3b04)
2024-03-06 20:43:21 +08:00
xingyu
9d52790910 fix: stylelint
(cherry picked from commit 821c804189ffc81b8d8f8444076ab8948dcd3615)
2024-03-06 20:41:49 +08:00
xingyu
18251290f9 fix: eslint
(cherry picked from commit 249e0d21a3a96cec9e437544b27b1d60664cd12f)
2024-03-06 20:41:08 +08:00
xingyu
62a6d5490f docs: update deps
(cherry picked from commit 8a74b954d09b47d02d5a92a152c17de6c93ca3b1)
2024-03-06 20:39:33 +08:00
xingyu
4248cd1541 chore: update deps
(cherry picked from commit e56afbf80f892f382ae1b61ddfa62d79307ef247)
2024-03-06 20:39:19 +08:00
puhui999
76c05964fa crm-团队成员:新增获得权限级别名称函数 getLevelName
(cherry picked from commit 8e0cf5c1e54afd114a41fd40f838614a68bbb4d0)
2024-03-06 20:36:44 +08:00
puhui999
8e08665344 crm-团队成员:完善团队成员通用组件封装
(cherry picked from commit 015a1640c1a1c66d6975788158eaeaa4c4200130)
2024-03-06 20:36:29 +08:00
YunaiV
3524e3525b 代码生成:支持设置主子表的信息
(cherry picked from commit 45656562a82353927da0aa614a1ce0689e7bd6b0)
2024-03-06 20:36:07 +08:00
柯杨
9449829fd3 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
(cherry picked from commit 8bb9dec32867881f0555a81268b8f096b2251863)
2024-03-06 20:33:44 +08:00
puhui999
fa1d2f25e7 crm-团队成员: 先提交一波
(cherry picked from commit 27c9a0f32deee6e69b81348aae08ba114a5a0797)
2024-03-06 20:33:39 +08:00
puhui999
c58275cd41 fix:如果已经到重新登录页面则不进行弹窗提示
(cherry picked from commit 2385cd9b9a88f7b1f0de303a1c7b473ec203f544)
2024-03-06 20:33:26 +08:00
YunaiV
8823f11109 代码生成:增加主子表(内嵌)的示例
(cherry picked from commit 999d8de9e972d62ae4bf2a23bcb05d7559c8c101)
2024-03-06 20:33:21 +08:00
YunaiV
05592577ff 代码生成:增加主子表(普通)的示例
(cherry picked from commit f0f78860255d1b3190556cd4dbd500c69d8a4b1f)
2024-03-06 20:33:18 +08:00
YunaiV
26e6d287f5 代码生成:增加 one 情况下的示例代码
(cherry picked from commit 72c5eaae31fd37dcfcd016224351237a9e2004d7)
2024-03-06 20:33:14 +08:00