Commit Graph

1078 Commits

Author SHA1 Message Date
puhui999
49b7bb1821 CRM-合同:完善合同表单
(cherry picked from commit 90e0baf5bc)
2024-03-11 12:45:47 +08:00
dhb52
b6fbecd32b feat: CRM-backlog-待进入公海的客户
(cherry picked from commit 4a2349ecf5)
2024-03-11 12:45:41 +08:00
puhui999
e04bb9e03e CRM-合同:完善合同表单
(cherry picked from commit 331b6c5611)
2024-03-11 12:45:23 +08:00
puhui999
0ada34de16 CRM-合同:完善合同表单
(cherry picked from commit ed94205fa7)
2024-03-11 12:45:19 +08:00
puhui999
227f69c95d CRM-联系人:完善联系人转移、数据权限
(cherry picked from commit a64d4240a3)
2024-03-11 12:45:14 +08:00
puhui999
d3f8d40e40 CRM:统一日志获取接口
(cherry picked from commit 5adf75d15b)
2024-03-11 12:45:01 +08:00
puhui999
9f599fb790 CRM-客户:完善客户导入
(cherry picked from commit 26daa3a1ff)
2024-03-11 12:44:37 +08:00
dhb52
1cc6adc49b fix: warning UnoCSS utilities are not ordered
(cherry picked from commit acc3a6bcfd)
2024-03-11 12:42:18 +08:00
shizhong
88d3a47b18 BUG 2024-03-08 22:00:26 +08:00
YunaiV
a1635da641 CRM:code review 跟进记录,
(cherry picked from commit 66ff10d00c)
2024-03-08 21:44:51 +08:00
min
90743cdb85 CRM:线索创建时增加负责人选择框
(cherry picked from commit e0bc3ea6dc)
2024-03-08 21:44:35 +08:00
min
d7209882b8 CRM:线索表单去掉客户字段
(cherry picked from commit 3471b5c5b2)
2024-03-08 21:44:24 +08:00
dhb52
a3d7efa669 refactor: 提取公共选项定义
(cherry picked from commit c38bbb99a1)
2024-03-08 21:44:13 +08:00
dhb52
f8e13a5ccd feat: backlog 分配给我的线索、客户
(cherry picked from commit 7c0c651592)
2024-03-08 21:43:34 +08:00
puhui999
ba4a848fa8 fix: 修复 CRM 的一些 bug
(cherry picked from commit d735f782fc)
2024-03-08 21:43:26 +08:00
puhui999
c8e8ebf025 CRM: 跟进组件完善
(cherry picked from commit 9628517b8b)
2024-03-08 21:43:16 +08:00
puhui999
3fec9de1cf 多图上传组件优化
(cherry picked from commit f88b26e3c3)
2024-03-08 21:43:09 +08:00
YunaiV
cfd454b989 PAY:增加钱包、微信条码支付的渠道配置界面
(cherry picked from commit 948ef08533)
2024-03-08 21:42:58 +08:00
YunaiV
45f96650f0 BPM:抄送任务的 code review
(cherry picked from commit bf3e051d74)
2024-03-08 21:42:46 +08:00
YunaiV
d8c15b3aa7 调整启动命令,恢复 npm run dev;如果要连接远程服务
(cherry picked from commit 2dcd131097)
2024-03-08 21:41:51 +08:00
kyle
dccd2d7d4a feat: 新增流程抄送
(cherry picked from commit 2c9393702d)
2024-03-08 21:40:23 +08:00
dhb52
743ac20538 wip: CRM-代办消息-添加其他页面草稿
(cherry picked from commit 040b80b35f)
2024-03-08 21:36:26 +08:00
dhb52
65ee931335 wip: CRM-代办消息-修改模块为backlog
(cherry picked from commit 48693b50f2)
2024-03-08 21:36:23 +08:00
YunaiV
748eb2b576 📖 CRM:跟进记录的 code review
(cherry picked from commit 9fa769b16a)
2024-03-08 21:36:13 +08:00
YunaiV
d9c8135bd8 📖 CRM:待办事项的 code review
(cherry picked from commit 1e70a1d57e)
2024-03-08 21:35:46 +08:00
dhb52
811be75681 wip: 待办事项
(cherry picked from commit 24849335a8)
2024-03-08 21:35:27 +08:00
puhui999
d5be5f35a8 crm-客户:完善转移和按钮权限
(cherry picked from commit 9cbb3aa84a)
2024-03-08 21:30:50 +08:00
puhui999
7a8f9b3742 crm-客户:公海抽离,完善跟进
(cherry picked from commit 5151824110)
2024-03-08 21:30:24 +08:00
puhui999
bb694349f1 新增客户跟进
(cherry picked from commit d29dfef7c7)
2024-03-08 21:27:10 +08:00
YunaiV
68aed119dd MALL:简化商品分类的 VO 转化
(cherry picked from commit 26bb847383)
2024-03-08 21:26:43 +08:00
shizhong
231ba51650 📖 CRM:产品模块的 review 2024-03-08 21:24:00 +08:00
YunaiV
f2fcaf0eb3 MALL:简化 SPU 属性的维护逻辑
(cherry picked from commit a9400c5171)
2024-03-08 21:15:22 +08:00
YunaiV
92d3564cae 📖 MALL:商品编辑 => 优化 DescriptionForm 表单
(cherry picked from commit 10afbe8e2f)
2024-03-08 21:15:17 +08:00
YunaiV
890d31ff5f 📖 MALL:商品编辑 => 优化 DeliveryForm 表单
(cherry picked from commit a38ddb699a)
2024-03-08 21:15:13 +08:00
YunaiV
48fe4332bc 📖 MALL:商品编辑 => 优化 SKU 表单
(cherry picked from commit 20b4a7fd66)
2024-03-08 21:14:52 +08:00
anhaohao
d352e022b6 新增:产品详情页面
(cherry picked from commit 4f89eb6ba9)
2024-03-08 21:14:46 +08:00
owen
ae2209a53e 营销:统一装修预览图片字段名称
(cherry picked from commit a9c231bed6)
2024-03-08 21:14:10 +08:00
YunaiV
d1c9f702d9 📖 MALL:商品编辑 => 简化 InfoForm 基础设置
(cherry picked from commit efe702d383)
2024-03-08 21:13:52 +08:00
YunaiV
ddcf1f672b 📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本
(cherry picked from commit 2c76d3aeee)
2024-03-08 21:13:46 +08:00
YunaiV
135f4803b1 📖 MALL:商品编辑的简化
(cherry picked from commit c0905fdc8e)
2024-03-08 21:13:38 +08:00
YunaiV
ac0efcd9b5 📖 MALL:商品编辑的简化
(cherry picked from commit f1c858b9af)
2024-03-08 21:13:18 +08:00
YunaiV
bb45bfd4c6 📖 MALL:优化商品列表的样式
(cherry picked from commit a5d6d18b6a)
2024-03-08 21:12:45 +08:00
YunaiV
642ba23160 📖 MALL:code review 满减送活动
(cherry picked from commit ab64a1d1df)
2024-03-08 21:12:20 +08:00
YunaiV
f8b0250def 📖 CRM:code review crm 客户列表
(cherry picked from commit ec87c1b61d)
2024-03-08 21:12:10 +08:00
YunaiV
65e6465a7a 📖 CRM:code review crm 联系人新增操作日志
(cherry picked from commit a0f7775321)
2024-03-08 21:11:58 +08:00
YunaiV
f4792d9b08 📖 MALL:code review 商品统计的代码
(cherry picked from commit 29e7161eba)
2024-03-08 21:11:52 +08:00
zyna
dd0a9781a1 crm联系人新增操作日志
(cherry picked from commit 3af6811c72)
2024-03-08 21:11:30 +08:00
answer-huang
187368bcc8 fix: remove bg color with xl size
(cherry picked from commit 8801c82e15)
2024-03-08 21:11:19 +08:00
puhui999
b211e245db 客户详情完善
(cherry picked from commit 17be1abb65)
2024-03-08 21:11:08 +08:00
YunaiV
9286010e77 MALL:去除分销提现的银行配置
(cherry picked from commit d36c4ab36c)
2024-03-08 21:11:01 +08:00
shizhong
9e0e307d74 update src/views/bpm/model/ModelForm.vue. 创建的是用路由地址,但那个表单查看的是VUE源码的组件地址,不是路由。给我造成了很大的困扰~ 2024-03-08 21:09:06 +08:00
YunaiV
712a7df176 CRM:【联系人】统一字段
(cherry picked from commit 5e265a9094)
2024-03-08 21:04:15 +08:00
YunaiV
d991d92cfc 📖 CRM:【客户配置】调整目录结构
(cherry picked from commit d71097ac31)
2024-03-08 21:04:11 +08:00
YunaiV
26faf5bdfd 📖 CRM:【客户】微调客户列表界面
(cherry picked from commit 4fbb3b88e6)
2024-03-08 21:04:08 +08:00
YunaiV
6de158bb54 📖 CRM:【客户】微调客户列表界面
(cherry picked from commit 7448f6e08c)
2024-03-08 21:04:05 +08:00
YunaiV
08a6ecefb1 📖 CRM:code review 商机模块
(cherry picked from commit 0a4023ef00)
2024-03-08 21:03:55 +08:00
shizhong
e2359633dd fix: 修复请假申请提交后页面不返回的bug 2024-03-08 21:00:35 +08:00
puhui999
2b1c12eb4b crm-客户:集成操作日志详情组件
(cherry picked from commit 261d8b2aa4)
2024-03-08 20:53:54 +08:00
落日晚风
62b9002cf6 满减送数据对接
(cherry picked from commit 21e8dbf985)
2024-03-08 20:53:30 +08:00
YunaiV
b890915539 📖 code review:店铺装修逻辑
(cherry picked from commit 9591ed7084)
2024-03-08 20:53:04 +08:00
YunaiV
c57db2bf09 📖 code review:店铺装修逻辑
(cherry picked from commit b86f082306)
2024-03-08 20:52:59 +08:00
zyna
b22e361eaa crm联系人商机修改
(cherry picked from commit 2cfe006def)
2024-03-08 20:52:56 +08:00
zyna
d6c56f8588 crm联系人商机修改
(cherry picked from commit dd4482fad2)
2024-03-08 20:52:53 +08:00
zyna
d6a4795ca4 crm联系人商机修改
(cherry picked from commit a1fd3afc32)
2024-03-08 20:52:47 +08:00
owen
cae1d7cb1a 统计:增加商品统计
(cherry picked from commit ca35e1a4af)
2024-03-08 20:52:15 +08:00
puhui999
5ab56e3fff crm-客户:集成操作日志详情组件
(cherry picked from commit 455688eaa8)
2024-03-08 20:50:56 +08:00
shizhong
f0f75fac0c BUG 2024-03-08 20:45:43 +08:00
shizhong
d1cfe78283 BUG 2024-03-07 14:09:08 +08:00
owen
9ce5e4a178 修复商城首页,快捷入口的图标宽高不一致的问题
(cherry picked from commit a7512ba2c7)
2024-03-07 13:10:06 +08:00
owen
57fcddd6c7 营销:完善装修编辑器预览功能
(cherry picked from commit cd89f75b07)
2024-03-07 13:05:29 +08:00
owen
59ebc1ea8f 营销:完善装修编辑器预览功能
(cherry picked from commit 784623724d)
2024-03-07 13:05:23 +08:00
owen
898faf0999 营销:完善装修编辑器重置功能
(cherry picked from commit eec3a21852)
2024-03-07 13:05:16 +08:00
owen
9f64a1093d 修复首页头像不显示
(cherry picked from commit 9128fa98f5)
2024-03-07 13:05:12 +08:00
YunaiV
70a8fb7d66 📈 CRM:code review 联系人商机功能
(cherry picked from commit ce79dd68a3)
2024-03-07 13:04:08 +08:00
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