root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,287 Commits 8 Branches 11 Tags 16 MiB
d9c8135bd8
Commit Graph

954 Commits

Author SHA1 Message Date
YunaiV
4150ffba48 🔨 CRM：优化产品分类代码的实现 
(cherry picked from commit f8c4700c2e)
 2024-03-07 13:04:01 +08:00
YunaiV
2be6f196e6 🔨 CRM：优化产品代码的实现 
(cherry picked from commit b3d66cd0aa)
 2024-03-07 13:03:54 +08:00
ZENGlei11350
7b0ff72a2b 优化：添加商品时0库存商品无法保存改为可以保存 
(cherry picked from commit dee8215da2)
 2024-03-07 13:02:26 +08:00
ZanGe丶
776fed6a5d 【crm:优化产品及产品分类】 
(cherry picked from commit dde61c29a0)
 2024-03-07 13:02:07 +08:00
zyna
7c9cf67fb0 联系人商机功能 
(cherry picked from commit ba49b2851c)
 2024-03-07 13:02:00 +08:00
liuhongfeng
91bf155409 【修改】ureport2 集成 
(cherry picked from commit 0b9cf35b17)
 2024-03-07 12:56:23 +08:00
shizhong
f372fc0cdc 🐛 修复 user 在 IDEA 报错的问题 2024-03-07 12:51:49 +08:00
YunaiV
cb7543ef3d 🐛 修复 social 在 IDEA 报错的问题 
(cherry picked from commit a6deb69ddc)
 2024-03-07 12:47:51 +08:00
shizhong
73f6f15c54 BUG 2024-03-06 22:44:40 +08:00
YunaiV
ef2a70e3f8 crm: 增加基于客户查询回款计划分页 
(cherry picked from commit b0c1e55c6a)
 2024-03-06 21:32:52 +08:00
YunaiV
10b057cc3e crm: 增加基于客户查询回款分页 
(cherry picked from commit bdc80ea55b)
 2024-03-06 21:32:36 +08:00
owen
20382bdb8e eslint 
(cherry picked from commit b4ba1043d6)
 2024-03-06 21:32:28 +08:00
owen
a8f9fa152a 营销：商城装修增加控件【APP 链接选择】 
(cherry picked from commit 23a6bf5ef5)
 2024-03-06 21:24:11 +08:00
YunaiV
99a1587113 crm: 增加基于客户查询商机分页 
(cherry picked from commit 88e5e67a89)
 2024-03-06 21:21:34 +08:00
YunaiV
affd0c52f2 crm：增加合同 List 组件 
(cherry picked from commit 31a42fc3f7)
 2024-03-06 21:21:29 +08:00
YunaiV
993cb4f216 crm：完善数据权限的界面 
(cherry picked from commit 5f26c4afe9)
 2024-03-06 21:21:11 +08:00
YunaiV
008c125abc crm：联系人增加 ContactList 组件，提供给其它模块内嵌 
(cherry picked from commit 7de0e93d5a)
 2024-03-06 21:21:05 +08:00
YunaiV
fff915ce60 crm：code review 客户详情 
(cherry picked from commit 8b787176b6)
 2024-03-06 21:20:49 +08:00
wanwan
5d6457c3ff !334 feat: 客户配置 review 修改 
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit 443f65b5dc)
 2024-03-06 21:20:40 +08:00
YunaiV
81142acf51 crm：code review 联系人详情 
(cherry picked from commit ddfceddf4a)
 2024-03-06 21:20:31 +08:00
YunaiV
5520d43d73 crm：code review 客户详情 
(cherry picked from commit ae8cb9218c)
 2024-03-06 21:20:25 +08:00
wanwan
a6b9ce704d !334 feat: 客户配置 review 修改 
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit 85810c0786)
 2024-03-06 21:20:18 +08:00
YunaiV
f741523e16 crm：code review 商机类型 
(cherry picked from commit c5b2fdecd5)
 2024-03-06 21:17:08 +08:00
ljlleo
85bd10a1fc 商机、商机状态类型 
(cherry picked from commit 50430bb9cd)
 2024-03-06 21:17:01 +08:00
Evol郑天
2dc6c8ba93 修复公众号-素材管理 上传时缺少accountId参数 
Signed-off-by: Evol郑天 <jpevol@163.com>
(cherry picked from commit fd266516fe)
 2024-03-06 21:16:25 +08:00
zyna
57b3b0499e crm联系人review修改 
(cherry picked from commit ed22e02b5b)
 2024-03-06 21:16:14 +08:00
YunaiV
eb84424f87 crm：code review 联系人详情 
(cherry picked from commit 1ba450103e)
 2024-03-06 21:15:53 +08:00
YunaiV
e45dd09464 crm：code review 客户详情 
(cherry picked from commit 24773a6eaa)
 2024-03-06 21:15:47 +08:00
wanwan
7eff0e1891 !334 feat: 客户配置 review 修改 
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改

(cherry picked from commit e1f9e16a77)
 2024-03-06 21:15:31 +08:00
YunaiV
1d8a41d0f8 crm：code review 商机类型 
(cherry picked from commit 3c19cb1a85)
 2024-03-06 21:14:58 +08:00
ljlleo
acedf99903 商机、商机状态类型 
(cherry picked from commit b3515b2db5)
 2024-03-06 21:14:51 +08:00
zyna
2a70d4717b 联系人review修改 
(cherry picked from commit 46a8755c93)
 2024-03-06 21:13:55 +08:00
YunaiV
1cf493dedc crm：code review 客户详情 
(cherry picked from commit cec8582a90)
 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 324d1e859e)
 2024-03-06 21:13:27 +08:00
YunaiV
73f4521bc7 crm：code review 商机类型 
(cherry picked from commit 36702f5f90)
 2024-03-06 21:03:35 +08:00
YunaiV
98c046ecd7 crm：code review 成员 
(cherry picked from commit eb97447bb7)
 2024-03-06 21:03:22 +08:00
owen
42b78d1411 商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题 
(cherry picked from commit c3cad3f3ee)
 2024-03-06 21:01:57 +08:00
ljlleo
bafc4ca36c 商机、商机状态类型 
(cherry picked from commit 2700b08c69)
 2024-03-06 21:01:24 +08:00
YunaiV
aee411607f websocket 重新封装 
(cherry picked from commit 1744c6ec6f)
 2024-03-06 21:01:13 +08:00
puhui999
79319d3dc8 crm-客户：公海数据区分 
(cherry picked from commit f8b56a8c46)
 2024-03-06 20:56:15 +08:00
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
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
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
puhui999
fa1d2f25e7 crm-团队成员： 先提交一波 
(cherry picked from commit 27c9a0f32d)
 2024-03-06 20:33:39 +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
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
Wanwan
2ed3c2a51c feat: CRM 客户公海配置 
(cherry picked from commit 59b2d89a18)
 2024-03-06 20:30:33 +08:00
Wanwan
c3dc0836c2 feat: CRM 客户公海配置 
(cherry picked from commit 288aa72cdd)
 2024-03-06 20:30:20 +08:00
niou233
4d02972b86 refactor: 会员商品收藏 
(cherry picked from commit f2c71d5836)
 2024-03-06 20:30:03 +08:00
Wanwan
cc577dfc6f style: 客户 review 修改 
(cherry picked from commit 7146fdc9b9)
 2024-03-06 20:29:35 +08:00
shizhong
800c6c83d9 BUG 2024-03-05 20:40:16 +08:00
YunaiV
adba0142f1 多租户：登录界面，根据 host 域名获取对应的租户编号 
(cherry picked from commit 85ee558bef)
 2024-03-05 17:57:53 +08:00
shizhong
e2047eb6e9 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2024-03-05 17:54:50 +08:00
dhb52
fa174ba54e perf: 优化.env配置 
(cherry picked from commit 89dbb8c9e8)
 2024-03-05 17:52:24 +08:00
YunaiV
e354a6f22e code review：产品分类 
(cherry picked from commit 47bb88d892)
 2024-03-05 17:51:53 +08:00
owen
11a28eb196 营销：增加商城装修组件【图片展示】 
(cherry picked from commit fa710b560d)
 2024-03-05 17:51:08 +08:00
YunaiV
e3ef2c7e4c code review：回款 
(cherry picked from commit 17742988c9)
 2024-03-05 17:50:42 +08:00
YunaiV
b2e9e9273d 优化：社交登录、用户的管理 
(cherry picked from commit 4f2f4f72b5)
 2024-03-05 17:49:22 +08:00
ZanGe丶
618cf7459a 【crm:产品及产品分类】 
(cherry picked from commit ff6f05df84)
 2024-03-05 17:49:15 +08:00
shizhong
18e7aea217 优化：社交登录、用户的管理 2024-03-05 17:47:17 +08:00
YunaiV
98fc2fe327 优化：社交登录、用户的管理 
(cherry picked from commit a9b91e7436)
 2024-03-05 17:44:12 +08:00
YunaiV
f575ddacea code review：满减送活动 
(cherry picked from commit f79d31a64a)
 2024-03-05 17:43:11 +08:00
YunaiV
85df91ddab code review：客户管理 
(cherry picked from commit a9faeb1bdb)
 2024-03-05 17:42:57 +08:00
Wanwan
f780cf0c7b feat: 客户详情 + review 修改 
(cherry picked from commit 23f483ac45)
 2024-03-05 17:42:31 +08:00
jason
6949c196d0 转账 - 新增转账订单查询 
(cherry picked from commit 753f5de81e)
 2024-03-05 17:41:57 +08:00
风狗
d47a60b18d update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue. 
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit bf418653e4)
 2024-03-05 17:41:43 +08:00