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

1199 Commits

Author SHA1 Message Date
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
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 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
a959935cf8 Review代码修改 
(cherry picked from commit 2b8eb49f71)
 2024-03-08 21:14:40 +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
puhui999
4ddf19a601 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题 
(cherry picked from commit 7fd564307d)
 2024-03-08 21:04:38 +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
YunaiV
6fe6e51b2f 📖 操作日志的界面实现 
(cherry picked from commit 1eefa02c4c)
 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 ccb997ac2a)
 2024-03-08 20:54:22 +08:00
puhui999
c124ca4879 fix: 修复文件上传数据回显错误 
(cherry picked from commit aadad39a69)
 2024-03-08 20:54:03 +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
水人
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
owen
f07b7dbbb0 营销：优化商城装修组件 
(cherry picked from commit 80355f3acd)
 2024-03-08 20:51:29 +08:00
owen
6a7c04db5e 营销：适配商城装修组件【标题栏】 
(cherry picked from commit 33162a12c0)
 2024-03-08 20:51:24 +08:00
owen
67b24d61b6 营销：适配商城装修组件【热区】 
(cherry picked from commit 41a404a52c)
 2024-03-08 20:51:14 +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
owen
156e7ccb53 营销：适配商城装修组件【悬浮按钮】 
(cherry picked from commit edfdee8cc1)
 2024-03-08 20:48:47 +08:00
owen
5d527672a1 营销：适配商城装修组件【弹窗广告】 
(cherry picked from commit 76025b6821)
 2024-03-08 20:48:35 +08:00
owen
91db4949d5 封装拖拽组件，提供移动、新增、删除功能 
(cherry picked from commit 59ff6b13fb)
 2024-03-08 20:48:27 +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
2438f65d9e 商城装修：修复同一类型的组件切换时，右侧属性面板不更新的问题 
(cherry picked from commit 9ff4f1f7a9)
 2024-03-07 13:10:11 +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
shizhong
72b82625b9 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2024-03-07 13:03:42 +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
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
255708beec 🐛 修复 IDEA 在 v-for="dict in getIntDictOptions(...)" 时，el-option 的 key 会告警的问题 2024-03-07 12:55:25 +08:00
shizhong
f372fc0cdc 🐛 修复 user 在 IDEA 报错的问题 2024-03-07 12:51:49 +08:00
puhui999
b062da358a fix:修改 UploadImg 组件预览图片的方式为 createImageViewer，解决商城列表预览图片层级出现错误 
(cherry picked from commit f3e89c0c55)
 2024-03-07 12:49:35 +08:00
shizhong
4721455926 🐛 修复 tenant 在 IDEA 报错的问题 2024-03-07 12:49:11 +08:00
YunaiV
cb7543ef3d 🐛 修复 social 在 IDEA 报错的问题 
(cherry picked from commit a6deb69ddc)
 2024-03-07 12:47:51 +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
owen
e39918d794 营销：适配商城装修组件【用户卡券】 
(cherry picked from commit 3c8ffc8c21)
 2024-03-06 21:33:19 +08:00
owen
6c96749d18 营销：适配商城装修组件【用户资产】 
(cherry picked from commit c058048fac)
 2024-03-06 21:33:15 +08:00
owen
848091ea6f 营销：适配商城装修组件【用户订单】 
(cherry picked from commit 2c1edfa781)
 2024-03-06 21:33:02 +08:00
owen
adfb2469de 营销：适配商城装修组件【用户卡片】 
(cherry picked from commit af67db577d)
 2024-03-06 21:32:58 +08:00
YunaiV
ef2a70e3f8 crm: 增加基于客户查询回款计划分页 
(cherry picked from commit b0c1e55c6a)
 2024-03-06 21:32:52 +08:00
owen
1fa79f9d9e 营销：适配商城装修组件【拼团】（待重写） 
(cherry picked from commit d5f9d31d32)
 2024-03-06 21:32:47 +08:00
owen
b0300865f3 营销：适配商城装修组件【秒杀】（待重写） 
(cherry picked from commit 7e44b621a5)
 2024-03-06 21:32:40 +08:00