YunaiV
|
49a806a6f9
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2024-01-18 12:47:44 +08:00 |
|
YunaiV
|
2dcd131097
|
✨ 调整启动命令,恢复 npm run dev;如果要连接远程服务
|
2024-01-18 12:47:23 +08:00 |
|
kyle
|
2c9393702d
|
feat: 新增流程抄送
|
2024-01-17 09:40:05 +08:00 |
|
dhb52
|
040b80b35f
|
wip: CRM-代办消息-添加其他页面草稿
|
2024-01-15 22:45:42 +08:00 |
|
dhb52
|
48693b50f2
|
wip: CRM-代办消息-修改模块为backlog
|
2024-01-15 22:45:12 +08:00 |
|
YunaiV
|
9fa769b16a
|
📖 CRM:跟进记录的 code review
|
2024-01-15 21:30:25 +08:00 |
|
芋道源码
|
163613e90c
|
!363 crm:新增跟进组件、转移表单组件封装,完善按钮数据权限控制、客户公海抽离
Merge pull request !363 from puhui999/dev-crm
|
2024-01-15 04:36:13 +00:00 |
|
YunaiV
|
1e70a1d57e
|
📖 CRM:待办事项的 code review
|
2024-01-15 12:15:59 +08:00 |
|
dhb52
|
24849335a8
|
wip: 待办事项
|
2024-01-14 22:44:25 +08:00 |
|
puhui999
|
2a55d88a44
|
Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
# src/router/modules/remaining.ts
|
2024-01-14 21:53:31 +08:00 |
|
puhui999
|
9cbb3aa84a
|
crm-客户:完善转移和按钮权限
|
2024-01-14 21:48:20 +08:00 |
|
puhui999
|
5151824110
|
crm-客户:公海抽离,完善跟进
|
2024-01-14 20:57:06 +08:00 |
|
puhui999
|
d29dfef7c7
|
新增客户跟进
|
2024-01-14 00:00:50 +08:00 |
|
YunaiV
|
26bb847383
|
✨ MALL:简化商品分类的 VO 转化
|
2024-01-13 22:58:32 +08:00 |
|
芋道源码
|
fdfb028dd9
|
!360 Review代码修改
Merge pull request !360 from 疯狂的世界/dev
|
2024-01-13 03:16:16 +00:00 |
|
芋道源码
|
66c48a913c
|
📖 CRM:产品模块的 review
|
2024-01-13 10:24:48 +08:00 |
|
YunaiV
|
a9400c5171
|
✨ MALL:简化 SPU 属性的维护逻辑
|
2024-01-12 23:17:48 +08:00 |
|
YunaiV
|
10afbe8e2f
|
📖 MALL:商品编辑 => 优化 DescriptionForm 表单
|
2024-01-12 21:01:10 +08:00 |
|
YunaiV
|
a38ddb699a
|
📖 MALL:商品编辑 => 优化 DeliveryForm 表单
|
2024-01-12 20:53:17 +08:00 |
|
YunaiV
|
20b4a7fd66
|
📖 MALL:商品编辑 => 优化 SKU 表单
|
2024-01-11 22:22:07 +08:00 |
|
anhaohao
|
4f89eb6ba9
|
新增:产品详情页面
|
2024-01-11 17:51:45 +08:00 |
|
owen
|
2b8eb49f71
|
Review代码修改
|
2024-01-11 12:25:34 +08:00 |
|
owen
|
bdf95dc0f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-11 11:35:08 +08:00 |
|
owen
|
a9c231bed6
|
营销:统一装修预览图片字段名称
|
2024-01-11 11:21:23 +08:00 |
|
YunaiV
|
efe702d383
|
📖 MALL:商品编辑 => 简化 InfoForm 基础设置
|
2024-01-11 09:42:23 +08:00 |
|
YunaiV
|
2c76d3aeee
|
📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本
|
2024-01-11 00:25:39 +08:00 |
|
YunaiV
|
c0905fdc8e
|
📖 MALL:商品编辑的简化
|
2024-01-11 00:00:43 +08:00 |
|
YunaiV
|
f1c858b9af
|
📖 MALL:商品编辑的简化
|
2024-01-10 23:50:19 +08:00 |
|
YunaiV
|
a5d6d18b6a
|
📖 MALL:优化商品列表的样式
|
2024-01-10 13:51:00 +08:00 |
|
YunaiV
|
ab64a1d1df
|
📖 MALL:code review 满减送活动
|
2024-01-07 22:41:17 +08:00 |
|
芋道源码
|
1e68cd53a0
|
!352 满减送模块
Merge pull request !352 from Bluemark/dev
|
2024-01-07 14:16:02 +00:00 |
|
YunaiV
|
ec87c1b61d
|
📖 CRM:code review crm 客户列表
|
2024-01-07 21:20:00 +08:00 |
|
芋道源码
|
4eb3c8a2f9
|
!358 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
Merge pull request !358 from puhui999/dev-crm
|
2024-01-07 12:53:49 +00:00 |
|
YunaiV
|
a0f7775321
|
📖 CRM:code review crm 联系人新增操作日志
|
2024-01-07 18:19:15 +08:00 |
|
芋道源码
|
09fa30b0d6
|
!359 crm联系人新增操作日志
Merge pull request !359 from zyna/dev
|
2024-01-07 10:15:05 +00:00 |
|
YunaiV
|
29e7161eba
|
📖 MALL:code review 商品统计的代码
|
2024-01-07 16:23:24 +08:00 |
|
芋道源码
|
9bdba0f67e
|
!351 商品统计
Merge pull request !351 from 疯狂的世界/dev
|
2024-01-07 07:23:49 +00:00 |
|
zyna
|
3af6811c72
|
crm联系人新增操作日志
|
2024-01-06 21:04:58 +08:00 |
|
answer-huang
|
8801c82e15
|
fix: remove bg color with xl size
|
2024-01-06 21:00:02 +08:00 |
|
puhui999
|
17be1abb65
|
客户详情完善
|
2024-01-06 12:29:35 +08:00 |
|
YunaiV
|
d36c4ab36c
|
✨ MALL:去除分销提现的银行配置
|
2024-01-05 22:46:22 +08:00 |
|
owen
|
1fb7701e6e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-05 15:26:41 +08:00 |
|
水人
|
81d84877bc
|
update src/views/bpm/model/ModelForm.vue.
创建的是用路由地址,但那个表单查看的是VUE源码的组件地址,不是路由。给我造成了很大的困扰~
Signed-off-by: 水人 <417693680@qq.com>
|
2024-01-04 07:17:02 +00:00 |
|
puhui999
|
7fd564307d
|
fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
|
2024-01-04 12:10:01 +08:00 |
|
YunaiV
|
5e265a9094
|
✨ CRM:【联系人】统一字段
|
2024-01-03 23:30:29 +08:00 |
|
YunaiV
|
d71097ac31
|
📖 CRM:【客户配置】调整目录结构
|
2024-01-03 20:09:56 +08:00 |
|
YunaiV
|
4fbb3b88e6
|
📖 CRM:【客户】微调客户列表界面
|
2024-01-03 19:38:55 +08:00 |
|
YunaiV
|
7448f6e08c
|
📖 CRM:【客户】微调客户列表界面
|
2024-01-02 21:44:38 +08:00 |
|
YunaiV
|
0a4023ef00
|
📖 CRM:code review 商机模块
|
2024-01-02 18:48:47 +08:00 |
|
芋道源码
|
45521c139c
|
!350 crm联系人商机review修改
Merge pull request !350 from zyna/dev
|
2023-12-30 13:54:56 +00:00 |
|
芋道源码
|
0338caeef6
|
!355 修复一些 issues 提到的问题
Merge pull request !355 from puhui999/dev-crm
|
2023-12-30 13:26:46 +00:00 |
|
YunaiV
|
1eefa02c4c
|
📖 操作日志的界面实现
|
2023-12-30 21:25:08 +08:00 |
|
芋道源码
|
631c105f94
|
!346 feat:新增公共操作日志详情组件
Merge pull request !346 from puhui999/dev-crm
|
2023-12-30 12:54:53 +00:00 |
|
puhui999
|
d766b36e72
|
fix: 修复请假申请提交后页面不返回的bug
|
2023-12-30 20:53:44 +08:00 |
|
YunaiV
|
8aa49f2e1d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-30 19:12:35 +08:00 |
|
YunaiV
|
ccb997ac2a
|
🐛 修复 Excel 导出失败时,依然下载的问题
|
2023-12-30 19:11:29 +08:00 |
|
puhui999
|
aadad39a69
|
fix: 修复文件上传数据回显错误
|
2023-12-30 18:46:44 +08:00 |
|
puhui999
|
261d8b2aa4
|
crm-客户:集成操作日志详情组件
|
2023-12-30 17:06:09 +08:00 |
|
AhJindeg
|
2223f7f197
|
fix(task): 🐞 Update return list API endpoint
- 修改获取回退节点列表接口地址
|
2023-12-26 11:32:40 +08:00 |
|
落日晚风
|
21e8dbf985
|
满减送数据对接
|
2023-12-22 18:04:29 +08:00 |
|
YunaiV
|
9591ed7084
|
📖 code review:店铺装修逻辑
|
2023-12-20 23:01:09 +08:00 |
|
YunaiV
|
b86f082306
|
📖 code review:店铺装修逻辑
|
2023-12-19 23:10:58 +08:00 |
|
zyna
|
2cfe006def
|
crm联系人商机修改
|
2023-12-17 17:54:42 +08:00 |
|
zyna
|
dd4482fad2
|
crm联系人商机修改
|
2023-12-17 17:37:40 +08:00 |
|
zyna
|
a1fd3afc32
|
crm联系人商机修改
|
2023-12-17 17:34:32 +08:00 |
|
owen
|
ca35e1a4af
|
统计:增加商品统计
|
2023-12-16 23:48:09 +08:00 |
|
YunaiV
|
df1c565cd9
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-12-16 20:49:56 +08:00 |
|
YunaiV
|
be4750a174
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-12-16 20:49:47 +08:00 |
|
水人
|
346863a8a9
|
update src/api/bpm/task/index.ts.
后台接口地址是return-list,前台写成了get-return-list
Signed-off-by: 水人 <417693680@qq.com>
|
2023-12-16 00:00:14 +00:00 |
|
owen
|
80355f3acd
|
营销:优化商城装修组件
|
2023-12-15 17:12:02 +08:00 |
|
owen
|
33162a12c0
|
营销:适配商城装修组件【标题栏】
|
2023-12-15 13:26:28 +08:00 |
|
owen
|
41a404a52c
|
营销:适配商城装修组件【热区】
|
2023-12-14 20:22:52 +08:00 |
|
puhui999
|
455688eaa8
|
crm-客户:集成操作日志详情组件
|
2023-12-14 18:19:34 +08:00 |
|
puhui999
|
59c6670775
|
feat:新增公共操作日志详情组件
|
2023-12-14 18:18:55 +08:00 |
|
owen
|
edfdee8cc1
|
营销:适配商城装修组件【悬浮按钮】
|
2023-12-09 21:33:47 +08:00 |
|
owen
|
76025b6821
|
营销:适配商城装修组件【弹窗广告】
|
2023-12-09 16:45:54 +08:00 |
|
owen
|
59ff6b13fb
|
封装拖拽组件,提供移动、新增、删除功能
|
2023-12-08 21:54:11 +08:00 |
|
owen
|
9ff4f1f7a9
|
商城装修:修复同一类型的组件切换时,右侧属性面板不更新的问题
|
2023-12-07 21:18:51 +08:00 |
|
owen
|
a7512ba2c7
|
修复商城首页,快捷入口的图标宽高不一致的问题
|
2023-12-07 21:02:07 +08:00 |
|
owen
|
cd89f75b07
|
营销:完善装修编辑器预览功能
|
2023-12-07 19:59:32 +08:00 |
|
owen
|
784623724d
|
营销:完善装修编辑器预览功能
|
2023-12-07 19:58:52 +08:00 |
|
owen
|
eec3a21852
|
营销:完善装修编辑器重置功能
|
2023-12-07 16:25:15 +08:00 |
|
owen
|
9128fa98f5
|
修复首页头像不显示
|
2023-12-07 12:19:46 +08:00 |
|
芋道源码
|
b4aa09aa6c
|
!327 【新增】ureport2 集成
Merge pull request !327 from souvc/master
|
2023-12-06 12:57:44 +00:00 |
|
芋道源码
|
1e6ceabd3b
|
!343 ✨ 优化:商品库存为0时,商品列表商品封面显示已售罄,商品详情页用户无法下单
Merge pull request !343 from 奕泽云/master
|
2023-12-06 12:16:28 +00:00 |
|
YunaiV
|
ce79dd68a3
|
📈 CRM:code review 联系人商机功能
|
2023-12-06 19:26:39 +08:00 |
|
芋道源码
|
d6291382e8
|
!341 crm联系人商机功能
Merge pull request !341 from zyna/dev
|
2023-12-06 05:55:59 +00:00 |
|
YunaiV
|
f8c4700c2e
|
🔨 CRM:优化产品分类代码的实现
|
2023-12-06 12:56:55 +08:00 |
|
YunaiV
|
b3d66cd0aa
|
🔨 CRM:优化产品代码的实现
|
2023-12-06 12:32:51 +08:00 |
|
芋道源码
|
ee9667504f
|
!342 【CRM:优化产品以及产品分类】
Merge pull request !342 from ZanGe丶/master
|
2023-12-05 14:36:16 +00:00 |
|
YunaiV
|
0c613e94a8
|
🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确
|
2023-12-05 20:03:40 +08:00 |
|
ZENGlei11350
|
dee8215da2
|
优化:添加商品时0库存商品无法保存改为可以保存
|
2023-12-04 13:42:18 +08:00 |
|
liuhongfeng
|
d9ed3d1a6b
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-12-03 23:01:52 +08:00 |
|
ZanGe丶
|
dde61c29a0
|
【crm:优化产品及产品分类】
|
2023-12-03 21:24:38 +08:00 |
|
zyna
|
ba49b2851c
|
联系人商机功能
|
2023-12-03 19:56:46 +08:00 |
|
Marvin
|
aac60380bc
|
feat: 跳转到例外一个标签页预览
|
2023-12-03 19:26:22 +08:00 |
|
Marvin
|
2a0b329565
|
feat: 新增文件内容项,图片时展示,pdf时跳转到预览,其他文件下载
|
2023-12-03 19:26:22 +08:00 |
|
Marvin
|
19e3297667
|
feat: 文件列表增加图片的展示和预览
|
2023-12-03 19:26:22 +08:00 |
|
puhui999
|
55c64d9c1b
|
fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误
|
2023-12-03 19:26:22 +08:00 |
|
Evol郑天
|
3009c04d0a
|
修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
|
2023-12-03 19:26:22 +08:00 |
|
YunaiV
|
7748704639
|
🐛 修复 accessLog、errorLog 在 IDEA 报错的问题
|
2023-12-03 18:33:33 +08:00 |
|
YunaiV
|
5eb30c7e85
|
🐛 修复 job 在 IDEA 报错的问题
|
2023-12-03 18:11:54 +08:00 |
|
liuhongfeng
|
0b9cf35b17
|
【修改】ureport2 集成
|
2023-12-03 17:00:00 +08:00 |
|
YunaiV
|
85fe4ad8d6
|
🐛 修复 file 在 IDEA 报错的问题
|
2023-12-03 10:34:08 +08:00 |
|
YunaiV
|
aecc9bb8cb
|
🐛 修复 IDEA 在 v-for="dict in getIntDictOptions(...)" 时,el-option 的 key 会告警的问题
|
2023-12-03 09:52:13 +08:00 |
|
YunaiV
|
3d2d48b601
|
🐛 修复 user 在 IDEA 报错的问题
|
2023-12-03 01:03:41 +08:00 |
|
YunaiV
|
fa421d0895
|
🐛 修复 tenant 在 IDEA 报错的问题
|
2023-12-02 23:43:16 +08:00 |
|
YunaiV
|
a6deb69ddc
|
🐛 修复 social 在 IDEA 报错的问题
|
2023-12-02 23:01:31 +08:00 |
|
YunaiV
|
3407cc66a9
|
🐛 修复 sms 在 IDEA 报错的问题
|
2023-12-02 22:39:52 +08:00 |
|
YunaiV
|
dd4a77ff22
|
🐛 修复 sensitiveWord 在 IDEA 报错的问题
|
2023-12-02 22:02:20 +08:00 |
|
YunaiV
|
6593c603a2
|
🐛 修复 menu 在 IDEA 报错的问题
|
2023-12-02 21:47:20 +08:00 |
|
YunaiV
|
2ceb3b978c
|
🐛 修复 oauth2 在 IDEA 报错的问题
|
2023-12-02 20:49:08 +08:00 |
|
YunaiV
|
5766dc81d1
|
🐛 修复 notify 在 IDEA 报错的问题
|
2023-12-02 20:25:29 +08:00 |
|
YunaiV
|
b103c40874
|
🐛 修复 notice 在 IDEA 报错的问题
|
2023-12-02 20:08:05 +08:00 |
|
YunaiV
|
1066551fd1
|
🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题
|
2023-12-02 19:25:50 +08:00 |
|
YunaiV
|
757fbddef2
|
🐛 修复 dictType 和 dictData 在 IDEA 报错的问题
|
2023-12-02 18:22:02 +08:00 |
|
YunaiV
|
a77173f2ae
|
🐛 修复 post 和 dept 在 IDEA 报错的问题
|
2023-12-02 10:20:09 +08:00 |
|
owen
|
b982397449
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-02 00:00:50 +08:00 |
|
owen
|
3c8ffc8c21
|
营销:适配商城装修组件【用户卡券】
|
2023-12-01 23:58:57 +08:00 |
|
owen
|
c058048fac
|
营销:适配商城装修组件【用户资产】
|
2023-12-01 23:40:07 +08:00 |
|
owen
|
2c1edfa781
|
营销:适配商城装修组件【用户订单】
|
2023-12-01 23:34:19 +08:00 |
|
owen
|
af67db577d
|
营销:适配商城装修组件【用户卡片】
|
2023-12-01 23:12:44 +08:00 |
|
YunaiV
|
b0c1e55c6a
|
crm: 增加基于客户查询回款计划分页
|
2023-12-01 22:46:20 +08:00 |
|
owen
|
d5f9d31d32
|
营销:适配商城装修组件【拼团】(待重写)
|
2023-12-01 21:00:39 +08:00 |
|
owen
|
7e44b621a5
|
营销:适配商城装修组件【秒杀】(待重写)
|
2023-12-01 20:24:55 +08:00 |
|
YunaiV
|
bdc80ea55b
|
crm: 增加基于客户查询回款分页
|
2023-12-01 19:37:51 +08:00 |
|
owen
|
b4ba1043d6
|
eslint
|
2023-12-01 18:57:46 +08:00 |
|
owen
|
08be359578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-01 00:39:55 +08:00 |
|
owen
|
23a6bf5ef5
|
营销:商城装修增加控件【APP 链接选择】
|
2023-12-01 00:39:10 +08:00 |
|
YunaiV
|
88e5e67a89
|
crm: 增加基于客户查询商机分页
|
2023-11-30 20:21:45 +08:00 |
|
YunaiV
|
31a42fc3f7
|
crm:增加合同 List 组件
|
2023-11-30 19:12:57 +08:00 |
|
YunaiV
|
5f26c4afe9
|
crm:完善数据权限的界面
|
2023-11-30 13:42:49 +08:00 |
|
YunaiV
|
7de0e93d5a
|
crm:联系人增加 ContactList 组件,提供给其它模块内嵌
|
2023-11-29 21:42:10 +08:00 |
|
YunaiV
|
2cda0cdd9f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/crm/contact/ContactForm.vue
|
2023-11-29 14:01:20 +08:00 |
|
YunaiV
|
8b787176b6
|
crm:code review 客户详情
|
2023-11-29 13:59:53 +08:00 |
|
wanwan
|
443f65b5dc
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-29 13:59:52 +08:00 |
|
YunaiV
|
ddfceddf4a
|
crm:code review 联系人详情
|
2023-11-29 13:57:01 +08:00 |
|
YunaiV
|
ae8cb9218c
|
crm:code review 客户详情
|
2023-11-29 13:55:53 +08:00 |
|
wanwan
|
85810c0786
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-29 13:55:53 +08:00 |
|
YunaiV
|
c5b2fdecd5
|
crm:code review 商机类型
|
2023-11-29 13:55:53 +08:00 |
|
ljlleo
|
50430bb9cd
|
商机、商机状态类型
|
2023-11-29 13:55:53 +08:00 |
|
YunaiV
|
661dc2ff67
|
crm:code review 成员
|
2023-11-29 13:55:53 +08:00 |
|
dhb52
|
e106fb73b6
|
Merge remote-tracking branch 'yudao/master' into dhb52_master
|
2023-11-28 21:53:20 +08:00 |
|
zyna
|
ed22e02b5b
|
crm联系人review修改
|
2023-11-27 23:44:13 +08:00 |
|
芋道源码
|
57b20f1810
|
!336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
|
2023-11-27 12:35:25 +00:00 |
|
YunaiV
|
1ba450103e
|
crm:code review 联系人详情
|
2023-11-27 20:33:53 +08:00 |
|
YunaiV
|
24773a6eaa
|
crm:code review 客户详情
|
2023-11-27 20:31:23 +08:00 |
|
wanwan
|
e1f9e16a77
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-27 20:31:23 +08:00 |
|
YunaiV
|
3c19cb1a85
|
crm:code review 商机类型
|
2023-11-27 20:31:23 +08:00 |
|
ljlleo
|
b3515b2db5
|
商机、商机状态类型
|
2023-11-27 20:31:23 +08:00 |
|
YunaiV
|
4e1748caa3
|
crm:code review 成员
|
2023-11-27 20:31:23 +08:00 |
|
Evol郑天
|
633965b07d
|
同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
|
2023-11-27 07:07:32 +00:00 |
|
zyna
|
46a8755c93
|
联系人review修改
|
2023-11-26 21:54:50 +08:00 |
|
芋道源码
|
8aa17b673b
|
!331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
|
2023-11-25 10:50:20 +00:00 |
|
liuhongfeng
|
7df7719be3
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-25 17:45:32 +08:00 |
|
owen
|
d4dc105b4f
|
营销:适配商城装修组件【营销文章】
|
2023-11-25 15:53:07 +08:00 |
|
芋道源码
|
54897b6d1b
|
!332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
|
2023-11-25 02:27:11 +00:00 |
|
芋道源码
|
c6192a1918
|
!329 完善团队成员公共组件,crm-客户:集成团队成员
Merge pull request !329 from puhui999/dev-crm
|
2023-11-25 02:24:45 +00:00 |
|
Marvin
|
b95b8008f7
|
feat: 菜单右上角加一个搜索图标
|
2023-11-25 03:52:59 +08:00 |
|
liuhongfeng
|
764e1715be
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-24 22:56:39 +08:00 |
|
owen
|
c3cad3f3ee
|
商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题
|
2023-11-24 20:54:47 +08:00 |
|
YunaiV
|
1744c6ec6f
|
websocket 重新封装
|
2023-11-24 00:33:05 +08:00 |
|
puhui999
|
f8b56a8c46
|
crm-客户:公海数据区分
|
2023-11-23 09:35:59 +08:00 |
|
dhb52
|
c2038b95bf
|
Merge remote-tracking branch 'yudao/master'
|
2023-11-23 08:47:06 +08:00 |
|
liuhongfeng
|
aceac6daae
|
【修改】ureport2 集成
|
2023-11-22 22:09:48 +08:00 |
|
owen
|
253401ace3
|
营销:适配商城装修组件【优惠券】
|
2023-11-22 16:58:00 +08:00 |
|
puhui999
|
12b59200c1
|
crm-客户:集成团队成员
|
2023-11-22 15:45:10 +08:00 |
|
puhui999
|
19a0a83054
|
crm-数据权限:完善团队成员公共组件
|
2023-11-22 15:44:42 +08:00 |
|
YunaiV
|
f74ddf46ae
|
sms:移除 sendCode、sendMsg 字段
|
2023-11-21 22:53:49 +08:00 |
|
owen
|
1bb9df7b3c
|
商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题
|
2023-11-21 10:27:29 +08:00 |
|
liuhongfeng
|
4440ec866c
|
【新增】ureport2 集成
|
2023-11-20 23:32:54 +08:00 |
|
owen
|
e0a731dd86
|
商品评论、优惠券模板复用组件【商品橱窗】
|
2023-11-20 10:53:02 +08:00 |
|
owen
|
3198688eb5
|
营销:适配商城装修组件【商品栏】
|
2023-11-19 18:27:25 +08:00 |
|
芋道源码
|
b0b669129b
|
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
|
2023-11-18 16:32:02 +00:00 |
|
YunaiV
|
ebb19cfe8c
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-11-19 00:30:02 +08:00 |
|
YunaiV
|
b1f5ad55b8
|
crm:code review 权限列表
|
2023-11-19 00:28:22 +08:00 |
|
芋道源码
|
2e01944df9
|
!322 crm-团队成员:完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
|
2023-11-18 16:13:06 +00:00 |
|
芋道源码
|
5f0b0bd21d
|
!324 商城装修
Merge pull request !324 from 疯狂的世界/dev
|
2023-11-18 14:18:12 +00:00 |
|
芋道源码
|
9d7c578d48
|
!323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
|
2023-11-18 14:17:55 +00:00 |
|
YunaiV
|
526172af60
|
crm:code review 客户配置管理
|
2023-11-18 22:11:42 +08:00 |
|
芋道源码
|
c06223decd
|
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
|
2023-11-18 13:45:48 +00:00 |
|
芋道源码
|
f07d37438d
|
!321 修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Merge pull request !321 from 柯杨/master
|
2023-11-18 13:43:22 +00:00 |
|
YunaiV
|
85e953b920
|
crm:code review 联系人管理
|
2023-11-18 21:08:00 +08:00 |
|
YunaiV
|
7c5ae17d04
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/components/DiyEditor/components/ComponentContainer.vue
|
2023-11-18 20:39:31 +08:00 |
|
芋道源码
|
538783ce2d
|
!317 crm联系人前端
Merge pull request !317 from zyna/master
|
2023-11-18 12:35:34 +00:00 |
|
YunaiV
|
f1e3eccc8a
|
Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-18 18:00:41 +08:00 |
|
YunaiV
|
652698b871
|
代码生成:增加说明文档
|
2023-11-18 18:00:19 +08:00 |
|
芋道源码
|
26dba8b457
|
!325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
|
2023-11-18 09:57:33 +00:00 |
|
YunaiV
|
a42d0695fe
|
代码生成:增加主子表 erp 模式的示例
|
2023-11-17 13:21:17 +08:00 |
|
口口口
|
68f6683e52
|
update src/views/Profile/components/UserSocial.vue.
在这里绑定,绑定成功后,列表重复
Signed-off-by: 口口口 <17975121@qq.com>
|
2023-11-17 05:17:17 +00:00 |
|
owen
|
b4a1772584
|
营销:适配商城装修组件【商品卡片】
|
2023-11-17 10:14:26 +08:00 |
|
YunaiV
|
6c405ba420
|
代码生成:增加主子表 inner 模式的示例
|
2023-11-16 23:48:20 +08:00 |
|
YunaiV
|
9aca49c1ff
|
代码生成:增加主子表 normal 模式的示例
|
2023-11-16 23:24:03 +08:00 |
|
YunaiV
|
bbc37613b6
|
代码生成:增加 tree 树形的示例
|
2023-11-16 20:39:12 +08:00 |
|
YunaiV
|
3d0c4f4422
|
代码生成:支持树形表结构的配置
|
2023-11-16 00:11:23 +08:00 |
|
YunaiV
|
40b1522ed0
|
代码生成:增加 crud 单表示例
|
2023-11-15 23:48:00 +08:00 |
|
Wanwan
|
22206b25e1
|
feat: CRM 客户限制
|
2023-11-15 21:55:44 +08:00 |
|
xingyu
|
821c804189
|
fix: stylelint
|
2023-11-14 21:56:54 +08:00 |
|
xingyu
|
249e0d21a3
|
fix: eslint
|
2023-11-14 21:56:02 +08:00 |
|
puhui999
|
8e0cf5c1e5
|
crm-团队成员:新增获得权限级别名称函数 getLevelName
|
2023-11-14 12:06:42 +08:00 |
|