puhui999
|
6754fe06c2
|
Merge remote-tracking branch 'yudao/dev' into dev-crm
|
2024-03-08 21:35:05 +08:00 |
|
puhui999
|
d5be5f35a8
|
crm-客户：完善转移和按钮权限
(cherry picked from commit 9cbb3aa84a6adee46bde55208d2ee42f3babdc90)
|
2024-03-08 21:30:50 +08:00 |
|
puhui999
|
7a8f9b3742
|
crm-客户：公海抽离，完善跟进
(cherry picked from commit 5151824110335e970188d72a7139378fd04c07af)
|
2024-03-08 21:30:24 +08:00 |
|
puhui999
|
bb694349f1
|
新增客户跟进
(cherry picked from commit d29dfef7c70c6f13b988586f00a4c8ec9168f856)
|
2024-03-08 21:27:10 +08:00 |
|
YunaiV
|
68aed119dd
|
✨ MALL：简化商品分类的 VO 转化
(cherry picked from commit 26bb847383515f09c74ee2369cdf07c3014a3f14)
|
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 a9400c5171f4a8b630fe377c8ef3ba5df4ee2b60)
|
2024-03-08 21:15:22 +08:00 |
|
YunaiV
|
92d3564cae
|
📖 MALL：商品编辑 => 优化 DescriptionForm 表单
(cherry picked from commit 10afbe8e2fab308bfe02dff92c06153df78061ad)
|
2024-03-08 21:15:17 +08:00 |
|
YunaiV
|
890d31ff5f
|
📖 MALL：商品编辑 => 优化 DeliveryForm 表单
(cherry picked from commit a38ddb699a489dab882b58fbd822ad99c236edbb)
|
2024-03-08 21:15:13 +08:00 |
|
YunaiV
|
48fe4332bc
|
📖 MALL：商品编辑 => 优化 SKU 表单
(cherry picked from commit 20b4a7fd66185da0e4d6e510bc455e88710c876a)
|
2024-03-08 21:14:52 +08:00 |
|
anhaohao
|
d352e022b6
|
新增：产品详情页面
(cherry picked from commit 4f89eb6ba9d832ad616c98c36b74c982f1a31787)
|
2024-03-08 21:14:46 +08:00 |
|
owen
|
a959935cf8
|
Review代码修改
(cherry picked from commit 2b8eb49f7115d04f14a09c860f02b309969df8e5)
|
2024-03-08 21:14:40 +08:00 |
|
owen
|
ae2209a53e
|
营销：统一装修预览图片字段名称
(cherry picked from commit a9c231bed609366c516c1e4460c1914349f0d61f)
|
2024-03-08 21:14:10 +08:00 |
|
YunaiV
|
d1c9f702d9
|
📖 MALL：商品编辑 => 简化 InfoForm 基础设置
(cherry picked from commit efe702d383b4b805614d90879bc7c2389ff9a414)
|
2024-03-08 21:13:52 +08:00 |
|
YunaiV
|
ddcf1f672b
|
📖 MALL：商品编辑 => 将 detail 还是使用 form 复用，减少维护成本
(cherry picked from commit 2c76d3aeee85d509ffe079bd1e271a50928fdef3)
|
2024-03-08 21:13:46 +08:00 |
|
YunaiV
|
135f4803b1
|
📖 MALL：商品编辑的简化
(cherry picked from commit c0905fdc8ecd3c5f07c82f8fc9b94351d11ac157)
|
2024-03-08 21:13:38 +08:00 |
|
YunaiV
|
ac0efcd9b5
|
📖 MALL：商品编辑的简化
(cherry picked from commit f1c858b9af7c098db70172eb5272c4ae0a864543)
|
2024-03-08 21:13:18 +08:00 |
|
YunaiV
|
bb45bfd4c6
|
📖 MALL：优化商品列表的样式
(cherry picked from commit a5d6d18b6a31aa8739c49d1b50586e4c12d5a0b8)
|
2024-03-08 21:12:45 +08:00 |
|
YunaiV
|
642ba23160
|
📖 MALL：code review 满减送活动
(cherry picked from commit ab64a1d1df9e03948dc238d15c6b30a95b42315f)
|
2024-03-08 21:12:20 +08:00 |
|
YunaiV
|
f8b0250def
|
📖 CRM：code review crm 客户列表
(cherry picked from commit ec87c1b61d8cb77e62142cf2c7607a8732433163)
|
2024-03-08 21:12:10 +08:00 |
|
YunaiV
|
65e6465a7a
|
📖 CRM：code review crm 联系人新增操作日志
(cherry picked from commit a0f77753210ef5cf02e24cd3125a970345a80852)
|
2024-03-08 21:11:58 +08:00 |
|
YunaiV
|
f4792d9b08
|
📖 MALL：code review 商品统计的代码
(cherry picked from commit 29e7161eba79398736e7aadd4850a48e3a138071)
|
2024-03-08 21:11:52 +08:00 |
|
zyna
|
dd0a9781a1
|
crm联系人新增操作日志
(cherry picked from commit 3af6811c72f6d465428e10d1bd5a9401a470ab09)
|
2024-03-08 21:11:30 +08:00 |
|
answer-huang
|
187368bcc8
|
fix: remove bg color with xl size
(cherry picked from commit 8801c82e15aeccdfed5680e9712cd16d56d8f14a)
|
2024-03-08 21:11:19 +08:00 |
|
puhui999
|
b211e245db
|
客户详情完善
(cherry picked from commit 17be1abb65cfaf5166bb62e8335d86b1a86a6674)
|
2024-03-08 21:11:08 +08:00 |
|
YunaiV
|
9286010e77
|
✨ MALL：去除分销提现的银行配置
(cherry picked from commit d36c4ab36cebed14100d8eb72c4bb5cf2726ed01)
|
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 |
|
puhui999
|
4ddf19a601
|
fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
(cherry picked from commit 7fd564307d3bef974f2a0c99632e5020f38fda98)
|
2024-03-08 21:04:38 +08:00 |
|
YunaiV
|
712a7df176
|
✨ CRM：【联系人】统一字段
(cherry picked from commit 5e265a9094f1013c37890747fb70513a480902f4)
|
2024-03-08 21:04:15 +08:00 |
|
YunaiV
|
d991d92cfc
|
📖 CRM：【客户配置】调整目录结构
(cherry picked from commit d71097ac313e267f426d1e81d14f0ffc55304b84)
|
2024-03-08 21:04:11 +08:00 |
|
YunaiV
|
26faf5bdfd
|
📖 CRM：【客户】微调客户列表界面
(cherry picked from commit 4fbb3b88e6f091040f83c55062032073b3187a9b)
|
2024-03-08 21:04:08 +08:00 |
|
YunaiV
|
6de158bb54
|
📖 CRM：【客户】微调客户列表界面
(cherry picked from commit 7448f6e08c7f811451872e84ff60a5967c3ada84)
|
2024-03-08 21:04:05 +08:00 |
|
YunaiV
|
08a6ecefb1
|
📖 CRM：code review 商机模块
(cherry picked from commit 0a4023ef004fb184c4bd333332fbac574af98d4e)
|
2024-03-08 21:03:55 +08:00 |
|
YunaiV
|
6fe6e51b2f
|
📖 操作日志的界面实现
(cherry picked from commit 1eefa02c4c54749e0f93d563349c35d913f6a5f5)
|
2024-03-08 21:03:11 +08:00 |
|
shizhong
|
e2359633dd
|
fix: 修复请假申请提交后页面不返回的bug
|
2024-03-08 21:00:35 +08:00 |
|
YunaiV
|
ce62ded6b6
|
🐛 修复 Excel 导出失败时，依然下载的问题
(cherry picked from commit ccb997ac2a643db597e9496c8c6c9f9c8079fb7b)
|
2024-03-08 20:54:22 +08:00 |
|
puhui999
|
c124ca4879
|
fix: 修复文件上传数据回显错误
(cherry picked from commit aadad39a69b49d1f7f94373dd41082933e92bb2e)
|
2024-03-08 20:54:03 +08:00 |
|
puhui999
|
2b1c12eb4b
|
crm-客户：集成操作日志详情组件
(cherry picked from commit 261d8b2aa4775b8453dc2368eb1ecb78e8ee4cbf)
|
2024-03-08 20:53:54 +08:00 |
|
落日晚风
|
62b9002cf6
|
满减送数据对接
(cherry picked from commit 21e8dbf985ece78b84a0172af419bbfcd60a4f71)
|
2024-03-08 20:53:30 +08:00 |
|
YunaiV
|
b890915539
|
📖 code review：店铺装修逻辑
(cherry picked from commit 9591ed70849c59ae6d8c2bd57cbc63cf9b012191)
|
2024-03-08 20:53:04 +08:00 |
|
YunaiV
|
c57db2bf09
|
📖 code review：店铺装修逻辑
(cherry picked from commit b86f08230687d85a0ea379efe38d22568e80ba23)
|
2024-03-08 20:52:59 +08:00 |
|
zyna
|
b22e361eaa
|
crm联系人商机修改
(cherry picked from commit 2cfe006defc276aa79c1ef013169cba31483386f)
|
2024-03-08 20:52:56 +08:00 |
|
zyna
|
d6c56f8588
|
crm联系人商机修改
(cherry picked from commit dd4482fad23664897d7155cc15e6e046ec6ef19f)
|
2024-03-08 20:52:53 +08:00 |
|
zyna
|
d6a4795ca4
|
crm联系人商机修改
(cherry picked from commit a1fd3afc3226889617b48591dde42927bd9f502b)
|
2024-03-08 20:52:47 +08:00 |
|
owen
|
cae1d7cb1a
|
统计：增加商品统计
(cherry picked from commit ca35e1a4afa82b5a4be63d1c0c2e71f9743d7cab)
|
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 346863a8a9808284c7c0c0001398e0e44a2c9b59)
|
2024-03-08 20:51:45 +08:00 |
|
owen
|
f07b7dbbb0
|
营销：优化商城装修组件
(cherry picked from commit 80355f3acd7d00f9bba752756f80e7555ae9f940)
|
2024-03-08 20:51:29 +08:00 |
|
owen
|
6a7c04db5e
|
营销：适配商城装修组件【标题栏】
(cherry picked from commit 33162a12c0569056730bd7d06d3c5ea2b1bcb650)
|
2024-03-08 20:51:24 +08:00 |
|
owen
|
67b24d61b6
|
营销：适配商城装修组件【热区】
(cherry picked from commit 41a404a52c64e2a1d47ab7fc4269e1fb56181a4a)
|
2024-03-08 20:51:14 +08:00 |
|
puhui999
|
5ab56e3fff
|
crm-客户：集成操作日志详情组件
(cherry picked from commit 455688eaa88ba8f3754a26cd6d28217758f81eeb)
|
2024-03-08 20:50:56 +08:00 |
|