Commit Graph

460 Commits (5325c2bc30f57d211f83eee2981f191528ce456c)

Author SHA1 Message Date
安浩浩 1c034ca575 新增:CRM 商业智能,其他排名接口
(cherry picked from commit 3cdcd67a6a)
2024-03-11 13:03:19 +08:00
owen 818dc4d8e3 基础设施:前端直连上传,优先使用自定义域名
(cherry picked from commit 89fdb5ced9)
2024-03-11 13:02:19 +08:00
YunaiV e2a9835a5f ERP:初始化 product 信息、分类、单位的实现
(cherry picked from commit ce9317e3d0)
2024-03-11 13:01:29 +08:00
owen c26eb543e0 基础设施:增加前端直连上传文件到S3服务的功能
(cherry picked from commit 490bb901e1)
2024-03-11 12:53:14 +08:00
YunaiV 0cda4612a9 CRM:优化合同列的新增/修改界面
(cherry picked from commit cac39ae126)
2024-03-11 12:51:42 +08:00
puhui999 d4eb24798b CRM:transfer
(cherry picked from commit fe91c5ec5c)
2024-03-11 12:50:02 +08:00
puhui999 1cbc8a29da CRM-合同:完善 TODO
(cherry picked from commit 6d0e242387)
2024-03-11 12:49:57 +08:00
YunaiV ad987e9ef1 CRM:优化合同金额排行、回款金额排行
(cherry picked from commit 4549f8ed3c)
2024-03-11 12:49:33 +08:00
YunaiV ff84ef64a5 CRM:合同的 code review
(cherry picked from commit 956f19d9d0)
2024-03-11 12:49:03 +08:00
安浩浩 82fbaa16a3 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改
(cherry picked from commit 34a796de89)
2024-03-11 12:48:04 +08:00
anhaohao 450c4ae6d4 新增:商业智能-排行榜,合同金额排行和回款金额排行
(cherry picked from commit 770e551900)
2024-03-11 12:46:58 +08:00
puhui999 4714a1b086 CRM-合同:新增合同预览审批流程和提交审核
(cherry picked from commit 41195d5b4a)
2024-03-11 12:46:52 +08:00
puhui999 8d1c746113 CRM-合同:新增合同详情
(cherry picked from commit 668da2fa86)
2024-03-11 12:45:53 +08:00
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
YunaiV a1635da641 CRM:code review 跟进记录,
(cherry picked from commit 66ff10d00c)
2024-03-08 21:44:51 +08:00
puhui999 ba4a848fa8 fix: 修复 CRM 的一些 bug
(cherry picked from commit d735f782fc)
2024-03-08 21:43:26 +08:00
puhui999 3fec9de1cf 多图上传组件优化
(cherry picked from commit f88b26e3c3)
2024-03-08 21:43:09 +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 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 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 ddcf1f672b 📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本
(cherry picked from commit 2c76d3aeee)
2024-03-08 21:13:46 +08:00
YunaiV ac0efcd9b5 📖 MALL:商品编辑的简化
(cherry picked from commit f1c858b9af)
2024-03-08 21:13:18 +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
zyna dd0a9781a1 crm联系人新增操作日志
(cherry picked from commit 3af6811c72)
2024-03-08 21:11:30 +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
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 08a6ecefb1 📖 CRM:code review 商机模块
(cherry picked from commit 0a4023ef00)
2024-03-08 21:03:55 +08:00
YunaiV 6fe6e51b2f 📖 操作日志的界面实现
(cherry picked from commit 1eefa02c4c)
2024-03-08 21:03:11 +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
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
水人 96fae4f3ea update src/api/bpm/task/index.ts.
后台接口地址是return-list,前台写成了get-return-list

Signed-off-by: 水人 <417693680@qq.com>
(cherry picked from commit 346863a8a9)
2024-03-08 20:51:45 +08:00
puhui999 5ab56e3fff crm-客户:集成操作日志详情组件
(cherry picked from commit 455688eaa8)
2024-03-08 20:50:56 +08:00
puhui999 f9c272ad0d feat:新增公共操作日志详情组件
(cherry picked from commit 59c6670775)
2024-03-08 20:50:45 +08:00
YunaiV 70a8fb7d66 📈 CRM:code review 联系人商机功能
(cherry picked from commit ce79dd68a3)
2024-03-07 13:04:08 +08:00
YunaiV 2be6f196e6 🔨 CRM:优化产品代码的实现
(cherry picked from commit b3d66cd0aa)
2024-03-07 13:03:54 +08:00
shizhong 72b82625b9 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2024-03-07 13:03:42 +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
shizhong 021edf5662 🐛 修复 job 在 IDEA 报错的问题 2024-03-07 12:57:05 +08:00
liuhongfeng 91bf155409 【修改】ureport2 集成
(cherry picked from commit 0b9cf35b17)
2024-03-07 12:56:23 +08:00
shizhong 963a902eb0 🐛 修复 file 在 IDEA 报错的问题 2024-03-07 12:56:03 +08:00
shizhong f372fc0cdc 🐛 修复 user 在 IDEA 报错的问题 2024-03-07 12:51:49 +08:00
shizhong 4721455926 🐛 修复 tenant 在 IDEA 报错的问题 2024-03-07 12:49:11 +08:00
shizhong 94a9876204 🐛 修复 sms 在 IDEA 报错的问题 2024-03-07 12:47:29 +08:00
shizhong 2f5d1d0083 🐛 修复 sensitiveWord 在 IDEA 报错的问题 2024-03-07 12:40:54 +08:00
shizhong d4ad7e9013 🐛 修复 notify 在 IDEA 报错的问题 2024-03-07 12:39:20 +08:00
shizhong cd14499226 🐛 修复 notice 在 IDEA 报错的问题 2024-03-07 12:37:53 +08:00
shizhong d4dc61f34f 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2024-03-07 12:35:03 +08:00
shizhong 73f6f15c54 BUG 2024-03-06 22:44:40 +08:00
shizhong 7319d24cbc 🐛 修复 dictType 和 dictData 在 IDEA 报错的问题 2024-03-06 21:44:22 +08:00
YunaiV 9a49a8ea40 🐛 修复 post 和 dept 在 IDEA 报错的问题
(cherry picked from commit a77173f2ae)
2024-03-06 21:37:36 +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
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 eb84424f87 crm:code review 联系人详情
(cherry picked from commit 1ba450103e)
2024-03-06 21:15:53 +08:00
Evol郑天 9f33432926 同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
(cherry picked from commit 633965b07d)
2024-03-06 21:14:01 +08:00
zyna 2a70d4717b 联系人review修改
(cherry picked from commit 46a8755c93)
2024-03-06 21:13:55 +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
owen 687ec00343 营销:适配商城装修组件【营销文章】
(cherry picked from commit d4dc105b4f)
2024-03-06 21:03:53 +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
owen a494d2723b 营销:适配商城装修组件【优惠券】
(cherry picked from commit 253401ace3)
2024-03-06 20:55:51 +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
liuhongfeng 2988989b1a 【新增】ureport2 集成
(cherry picked from commit 4440ec866c)
2024-03-06 20:49:58 +08:00
YunaiV 7f50592069 crm:code review 权限列表
(cherry picked from commit b1f5ad55b8)
2024-03-06 20:49:39 +08:00
YunaiV 646f73b923 代码生成:增加主子表 erp 模式的示例
(cherry picked from commit a42d0695fe)
2024-03-06 20:44:51 +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 4cf6b9000a 代码生成:增加 crud 单表示例
(cherry picked from commit 40b1522ed0)
2024-03-06 20:43:40 +08:00