549 Commits

Author SHA1 Message Date
a0ce1f3a5b 🔥 2.0.0 版本发布! 2024-01-26 21:53:59 +08:00
10a5d4d265 !373 update src/permission.ts.
Merge pull request !373 from AKING/N/A
2024-01-26 13:45:59 +00:00
024d08555b update src/permission.ts.
解决了跳转不带参数的问题

Signed-off-by: AKING <2734339436@qq.com>
2024-01-24 02:44:33 +00:00
948ef08533 PAY:增加钱包、微信条码支付的渠道配置界面 2024-01-18 23:40:38 +08:00
bf3e051d74 BPM:抄送任务的 code review 2024-01-18 19:07:12 +08:00
49a806a6f9 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-01-18 12:47:44 +08:00
2dcd131097 调整启动命令,恢复 npm run dev;如果要连接远程服务 2024-01-18 12:47:23 +08:00
d852103929 !365 流程增加抄送功能
Merge pull request !365 from 云开/feature/BPM_CC
2024-01-18 04:46:09 +00:00
2c9393702d feat: 新增流程抄送 2024-01-17 09:40:05 +08:00
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
1e70a1d57e 📖 CRM:待办事项的 code review 2024-01-15 12:15:59 +08:00
68fc1760a5 !364 wip: CRM-待办事项
Merge pull request !364 from dhb52/crm-msg
2024-01-15 01:34:14 +00:00
24849335a8 wip: 待办事项 2024-01-14 22:44:25 +08:00
2a55d88a44 Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
#	src/router/modules/remaining.ts
2024-01-14 21:53:31 +08:00
9cbb3aa84a crm-客户:完善转移和按钮权限 2024-01-14 21:48:20 +08:00
5151824110 crm-客户:公海抽离,完善跟进 2024-01-14 20:57:06 +08:00
25347b3ea5 Merge remote-tracking branch 'yudao/dev' into dev 2024-01-14 11:50:26 +08:00
d29dfef7c7 新增客户跟进 2024-01-14 00:00:50 +08:00
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
a77658b336 Merge remote-tracking branch 'origin/dev' into dev 2024-01-13 10:24:54 +08:00
66c48a913c 📖 CRM:产品模块的 review 2024-01-13 10:24:48 +08:00
2be14817a0 !361 新增:产品详情页面
Merge pull request !361 from 安浩浩/dev
2024-01-13 02:04:20 +00:00
a9400c5171 MALL:简化 SPU 属性的维护逻辑 2024-01-12 23:17:48 +08:00
10afbe8e2f 📖 MALL:商品编辑 => 优化 DescriptionForm 表单 2024-01-12 21:01:10 +08:00
a38ddb699a 📖 MALL:商品编辑 => 优化 DeliveryForm 表单 2024-01-12 20:53:17 +08:00
20b4a7fd66 📖 MALL:商品编辑 => 优化 SKU 表单 2024-01-11 22:22:07 +08:00
4f89eb6ba9 新增:产品详情页面 2024-01-11 17:51:45 +08:00
2b8eb49f71 Review代码修改 2024-01-11 12:25:34 +08:00
bdf95dc0f8 Merge remote-tracking branch 'origin/dev' into dev 2024-01-11 11:35:08 +08:00
a9c231bed6 营销:统一装修预览图片字段名称 2024-01-11 11:21:23 +08:00
efe702d383 📖 MALL:商品编辑 => 简化 InfoForm 基础设置 2024-01-11 09:42:23 +08:00
2c76d3aeee 📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本 2024-01-11 00:25:39 +08:00
c0905fdc8e 📖 MALL:商品编辑的简化 2024-01-11 00:00:43 +08:00
f1c858b9af 📖 MALL:商品编辑的简化 2024-01-10 23:50:19 +08:00
a5d6d18b6a 📖 MALL:优化商品列表的样式 2024-01-10 13:51:00 +08:00
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
804859bbd8 !357 update src/views/bpm/model/ModelForm.vue.
Merge pull request !357 from 水人/N/A
2024-01-07 13:25:10 +00:00
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
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
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
3af6811c72 crm联系人新增操作日志 2024-01-06 21:04:58 +08:00
8801c82e15 fix: remove bg color with xl size 2024-01-06 21:00:02 +08:00
17be1abb65 客户详情完善 2024-01-06 12:29:35 +08:00
d36c4ab36c MALL:去除分销提现的银行配置 2024-01-05 22:46:22 +08:00
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
7fd564307d fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题 2024-01-04 12:10:01 +08:00
5e265a9094 CRM:【联系人】统一字段 2024-01-03 23:30:29 +08:00
d71097ac31 📖 CRM:【客户配置】调整目录结构 2024-01-03 20:09:56 +08:00
4fbb3b88e6 📖 CRM:【客户】微调客户列表界面 2024-01-03 19:38:55 +08:00
7448f6e08c 📖 CRM:【客户】微调客户列表界面 2024-01-02 21:44:38 +08:00
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
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
d766b36e72 fix: 修复请假申请提交后页面不返回的bug 2023-12-30 20:53:44 +08:00
8aa49f2e1d Merge remote-tracking branch 'origin/dev' into dev 2023-12-30 19:12:35 +08:00
ccb997ac2a 🐛 修复 Excel 导出失败时,依然下载的问题 2023-12-30 19:11:29 +08:00
aadad39a69 fix: 修复文件上传数据回显错误 2023-12-30 18:46:44 +08:00
261d8b2aa4 crm-客户:集成操作日志详情组件 2023-12-30 17:06:09 +08:00
67630e31b2 !353 Update return list API endpoint
Merge pull request !353 from AhJindeg/fix/return-list
2023-12-29 15:06:29 +00:00
32dab6bc08 !348 update src/api/bpm/task/index.ts.
Merge pull request !348 from 水人/N/A
2023-12-29 15:06:04 +00:00
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
9591ed7084 📖 code review:店铺装修逻辑 2023-12-20 23:01:09 +08:00
b86f082306 📖 code review:店铺装修逻辑 2023-12-19 23:10:58 +08:00
2cfe006def crm联系人商机修改 2023-12-17 17:54:42 +08:00
dd4482fad2 crm联系人商机修改 2023-12-17 17:37:40 +08:00
a1fd3afc32 crm联系人商机修改 2023-12-17 17:34:32 +08:00
ca35e1a4af 统计:增加商品统计 2023-12-16 23:48:09 +08:00
df1c565cd9 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-12-16 20:49:56 +08:00
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
1abff21e56 !347 商城装修
Merge pull request !347 from 疯狂的世界/dev
2023-12-15 15:37:01 +00:00
80355f3acd 营销:优化商城装修组件 2023-12-15 17:12:02 +08:00
33162a12c0 营销:适配商城装修组件【标题栏】 2023-12-15 13:26:28 +08:00
41a404a52c 营销:适配商城装修组件【热区】 2023-12-14 20:22:52 +08:00
455688eaa8 crm-客户:集成操作日志详情组件 2023-12-14 18:19:34 +08:00
59c6670775 feat:新增公共操作日志详情组件 2023-12-14 18:18:55 +08:00
26a082788d !345 商城装修
Merge pull request !345 from 疯狂的世界/dev
2023-12-10 01:33:19 +00:00
edfdee8cc1 营销:适配商城装修组件【悬浮按钮】 2023-12-09 21:33:47 +08:00
76025b6821 营销:适配商城装修组件【弹窗广告】 2023-12-09 16:45:54 +08:00
605f906056 !344 商城装修
Merge pull request !344 from 疯狂的世界/dev
2023-12-09 03:41:45 +00:00
59ff6b13fb 封装拖拽组件,提供移动、新增、删除功能 2023-12-08 21:54:11 +08:00
9ff4f1f7a9 商城装修:修复同一类型的组件切换时,右侧属性面板不更新的问题 2023-12-07 21:18:51 +08:00
a7512ba2c7 修复商城首页,快捷入口的图标宽高不一致的问题 2023-12-07 21:02:07 +08:00
5002fc5fcc local不能作为环境名,改为local-dev 2023-12-07 20:53:30 +08:00
16aac73858 整理运行环境配置文件 2023-12-07 20:43:58 +08:00
cd89f75b07 营销:完善装修编辑器预览功能 2023-12-07 19:59:32 +08:00
784623724d 营销:完善装修编辑器预览功能 2023-12-07 19:58:52 +08:00
eec3a21852 营销:完善装修编辑器重置功能 2023-12-07 16:25:15 +08:00
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
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
f8c4700c2e 🔨 CRM:优化产品分类代码的实现 2023-12-06 12:56:55 +08:00
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
0c613e94a8 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2023-12-05 20:03:40 +08:00
dee8215da2 优化:添加商品时0库存商品无法保存改为可以保存 2023-12-04 13:42:18 +08:00
d9ed3d1a6b Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-12-03 23:01:52 +08:00
dde61c29a0 【crm:优化产品及产品分类】 2023-12-03 21:24:38 +08:00
ba49b2851c 联系人商机功能 2023-12-03 19:56:46 +08:00
2f10f0ffc1 Merge remote-tracking branch 'origin/master' 2023-12-03 19:26:33 +08:00
aac60380bc feat: 跳转到例外一个标签页预览 2023-12-03 19:26:22 +08:00
2a0b329565 feat: 新增文件内容项,图片时展示,pdf时跳转到预览,其他文件下载 2023-12-03 19:26:22 +08:00
19e3297667 feat: 文件列表增加图片的展示和预览 2023-12-03 19:26:22 +08:00
55c64d9c1b fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误 2023-12-03 19:26:22 +08:00
3009c04d0a 修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-12-03 19:26:22 +08:00
c47aabe880 !333 文件列表增加图片的展示和预览
Merge pull request !333 from boide/file-preview
2023-12-03 11:02:48 +00:00
f9994c585c !340 fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决列表预览图片层级出现错误
Merge pull request !340 from puhui999/master
2023-12-03 11:01:11 +00:00
7748704639 🐛 修复 accessLog、errorLog 在 IDEA 报错的问题 2023-12-03 18:33:33 +08:00
5eb30c7e85 🐛 修复 job 在 IDEA 报错的问题 2023-12-03 18:11:54 +08:00
0b9cf35b17 【修改】ureport2 集成 2023-12-03 17:00:00 +08:00
85fe4ad8d6 🐛 修复 file 在 IDEA 报错的问题 2023-12-03 10:34:08 +08:00
aecc9bb8cb 🐛 修复 IDEA 在 v-for="dict in getIntDictOptions(...)" 时,el-optionkey 会告警的问题 2023-12-03 09:52:13 +08:00
3d2d48b601 🐛 修复 user 在 IDEA 报错的问题 2023-12-03 01:03:41 +08:00
f3e89c0c55 fix:修改 UploadImg 组件预览图片的方式为 createImageViewer,解决商城列表预览图片层级出现错误 2023-12-03 00:14:04 +08:00
fa421d0895 🐛 修复 tenant 在 IDEA 报错的问题 2023-12-02 23:43:16 +08:00
a6deb69ddc 🐛 修复 social 在 IDEA 报错的问题 2023-12-02 23:01:31 +08:00
3407cc66a9 🐛 修复 sms 在 IDEA 报错的问题 2023-12-02 22:39:52 +08:00
dd4a77ff22 🐛 修复 sensitiveWord 在 IDEA 报错的问题 2023-12-02 22:02:20 +08:00
6593c603a2 🐛 修复 menu 在 IDEA 报错的问题 2023-12-02 21:47:20 +08:00
2ceb3b978c 🐛 修复 oauth2 在 IDEA 报错的问题 2023-12-02 20:49:08 +08:00
5766dc81d1 🐛 修复 notify 在 IDEA 报错的问题 2023-12-02 20:25:29 +08:00
b103c40874 🐛 修复 notice 在 IDEA 报错的问题 2023-12-02 20:08:05 +08:00
1066551fd1 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2023-12-02 19:25:50 +08:00
757fbddef2 🐛 修复 dictType 和 dictData 在 IDEA 报错的问题 2023-12-02 18:22:02 +08:00
a77173f2ae 🐛 修复 post 和 dept 在 IDEA 报错的问题 2023-12-02 10:20:09 +08:00
d6ff66dc1d !339 商城装修
Merge pull request !339 from 疯狂的世界/dev
2023-12-02 01:01:14 +00:00
b982397449 Merge remote-tracking branch 'origin/dev' into dev 2023-12-02 00:00:50 +08:00
3c8ffc8c21 营销:适配商城装修组件【用户卡券】 2023-12-01 23:58:57 +08:00
c058048fac 营销:适配商城装修组件【用户资产】 2023-12-01 23:40:07 +08:00
2c1edfa781 营销:适配商城装修组件【用户订单】 2023-12-01 23:34:19 +08:00
af67db577d 营销:适配商城装修组件【用户卡片】 2023-12-01 23:12:44 +08:00
b0c1e55c6a crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:20 +08:00
d5f9d31d32 营销:适配商城装修组件【拼团】(待重写) 2023-12-01 21:00:39 +08:00
7e44b621a5 营销:适配商城装修组件【秒杀】(待重写) 2023-12-01 20:24:55 +08:00
bdc80ea55b crm: 增加基于客户查询回款分页 2023-12-01 19:37:51 +08:00
b4ba1043d6 eslint 2023-12-01 18:57:46 +08:00
a711e96b23 feat: 跳转到例外一个标签页预览 2023-12-01 09:53:41 +08:00
915702183d feat: 新增文件内容项,图片时展示,pdf时跳转到预览,其他文件下载 2023-12-01 09:50:39 +08:00
08be359578 Merge remote-tracking branch 'origin/dev' into dev 2023-12-01 00:39:55 +08:00
23a6bf5ef5 营销:商城装修增加控件【APP 链接选择】 2023-12-01 00:39:10 +08:00
fa6ec8f07f !338 修复公众号-素材管理 上传时缺少accountId参数
Merge pull request !338 from Evol郑天/N/A
2023-11-30 12:38:24 +00:00
88e5e67a89 crm: 增加基于客户查询商机分页 2023-11-30 20:21:45 +08:00
31a42fc3f7 crm:增加合同 List 组件 2023-11-30 19:12:57 +08:00
5f26c4afe9 crm:完善数据权限的界面 2023-11-30 13:42:49 +08:00
7de0e93d5a crm:联系人增加 ContactList 组件,提供给其它模块内嵌 2023-11-29 21:42:10 +08:00
2cda0cdd9f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/crm/contact/ContactForm.vue
2023-11-29 14:01:20 +08:00
8b787176b6 crm:code review 客户详情 2023-11-29 13:59:53 +08:00
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
ddfceddf4a crm:code review 联系人详情 2023-11-29 13:57:01 +08:00
ae8cb9218c crm:code review 客户详情 2023-11-29 13:55:53 +08:00
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
c5b2fdecd5 crm:code review 商机类型 2023-11-29 13:55:53 +08:00
50430bb9cd 商机、商机状态类型 2023-11-29 13:55:53 +08:00
661dc2ff67 crm:code review 成员 2023-11-29 13:55:53 +08:00
c322959c40 !337 crm联系人review修改
Merge pull request !337 from zyna/master
2023-11-29 05:54:39 +00:00
fd266516fe 修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-11-29 01:24:42 +00:00
ed22e02b5b crm联系人review修改 2023-11-27 23:44:13 +08:00
d69134adfa Merge remote-tracking branch 'origin/dev' into dev 2023-11-27 20:38:49 +08:00
57b20f1810 !336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
2023-11-27 12:35:25 +00:00
1ba450103e crm:code review 联系人详情 2023-11-27 20:33:53 +08:00
24773a6eaa crm:code review 客户详情 2023-11-27 20:31:23 +08:00
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
3c19cb1a85 crm:code review 商机类型 2023-11-27 20:31:23 +08:00
b3515b2db5 商机、商机状态类型 2023-11-27 20:31:23 +08:00
4e1748caa3 crm:code review 成员 2023-11-27 20:31:23 +08:00
038f3d6ab0 !335 crm联系人review修改
Merge pull request !335 from zyna/master
2023-11-27 12:30:20 +00:00
633965b07d 同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-11-27 07:07:32 +00:00
46a8755c93 联系人review修改 2023-11-26 21:54:50 +08:00
cec8582a90 crm:code review 客户详情 2023-11-26 20:18:33 +08:00
324d1e859e !334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
2023-11-26 12:02:08 +00:00
c2e8eaed60 feat: 文件列表增加图片的展示和预览 2023-11-25 22:56:31 +08:00
8aa17b673b !331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
2023-11-25 10:50:20 +00:00
7df7719be3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-25 17:45:32 +08:00
d4dc105b4f 营销:适配商城装修组件【营销文章】 2023-11-25 15:53:07 +08:00
36702f5f90 crm:code review 商机类型 2023-11-25 12:01:35 +08:00
937fc17150 !330 商机、商机状态类型页面
Merge pull request !330 from 刘先生/dev
2023-11-25 03:56:08 +00:00
eb97447bb7 crm:code review 成员 2023-11-25 10:42:44 +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
b95b8008f7 feat: 菜单右上角加一个搜索图标 2023-11-25 03:52:59 +08:00
764e1715be Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-24 22:56:39 +08:00
8f97155b43 !328 商城装修
Merge pull request !328 from 疯狂的世界/dev
2023-11-24 14:41:12 +00:00
c3cad3f3ee 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题 2023-11-24 20:54:47 +08:00
2700b08c69 商机、商机状态类型 2023-11-24 14:21:21 +08:00
1744c6ec6f websocket 重新封装 2023-11-24 00:33:05 +08:00
f8b56a8c46 crm-客户:公海数据区分 2023-11-23 09:35:59 +08:00
aceac6daae 【修改】ureport2 集成 2023-11-22 22:09:48 +08:00
253401ace3 营销:适配商城装修组件【优惠券】 2023-11-22 16:58:00 +08:00
12b59200c1 crm-客户:集成团队成员 2023-11-22 15:45:10 +08:00
19a0a83054 crm-数据权限:完善团队成员公共组件 2023-11-22 15:44:42 +08:00
f74ddf46ae sms:移除 sendCode、sendMsg 字段 2023-11-21 22:53:49 +08:00
1bb9df7b3c 商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题 2023-11-21 10:27:29 +08:00
4440ec866c 【新增】ureport2 集成 2023-11-20 23:32:54 +08:00
e0a731dd86 商品评论、优惠券模板复用组件【商品橱窗】 2023-11-20 10:53:02 +08:00
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
4423e9b804 !326 CRM 客户最新的代码
Merge pull request !326 from 芋道源码/dev
2023-11-18 16:30:42 +00:00
ebb19cfe8c Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-19 00:30:02 +08:00
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
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
85e953b920 crm:code review 联系人管理 2023-11-18 21:08:00 +08:00
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
f1e3eccc8a Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-18 18:00:41 +08:00
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
f5d611968f Merge remote-tracking branch 'origin/dev' into dev 2023-11-17 21:51:42 +08:00
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
b4a1772584 营销:适配商城装修组件【商品卡片】 2023-11-17 10:14:26 +08:00
6c405ba420 代码生成:增加主子表 inner 模式的示例 2023-11-16 23:48:20 +08:00
9aca49c1ff 代码生成:增加主子表 normal 模式的示例 2023-11-16 23:24:03 +08:00
bbc37613b6 代码生成:增加 tree 树形的示例 2023-11-16 20:39:12 +08:00
3d0c4f4422 代码生成:支持树形表结构的配置 2023-11-16 00:11:23 +08:00
40b1522ed0 代码生成:增加 crud 单表示例 2023-11-15 23:48:00 +08:00
22206b25e1 feat: CRM 客户限制 2023-11-15 21:55:44 +08:00
821c804189 fix: stylelint 2023-11-14 21:56:54 +08:00
249e0d21a3 fix: eslint 2023-11-14 21:56:02 +08:00
8a74b954d0 docs: update deps 2023-11-14 21:53:30 +08:00
e56afbf80f chore: update deps 2023-11-14 21:49:49 +08:00
8e0cf5c1e5 crm-团队成员:新增获得权限级别名称函数 getLevelName 2023-11-14 12:06:42 +08:00
ba702d03bc Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-11-14 11:26:41 +08:00
015a1640c1 crm-团队成员:完善团队成员通用组件封装 2023-11-14 11:26:07 +08:00
45656562a8 代码生成:支持设置主子表的信息 2023-11-14 09:50:54 +08:00
8bb9dec328 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
2023-11-14 01:43:59 +00:00
c1a92ba22a !319 商城装修
Merge pull request !319 from 疯狂的世界/dev
2023-11-14 00:31:55 +00:00
27c9a0f32d crm-团队成员: 先提交一波 2023-11-13 17:49:27 +08:00
2385cd9b9a fix:如果已经到重新登录页面则不进行弹窗提示 2023-11-13 15:48:21 +08:00
999d8de9e9 代码生成:增加主子表(内嵌)的示例 2023-11-13 13:57:15 +08:00
f0f7886025 代码生成:增加主子表(普通)的示例 2023-11-12 22:33:38 +08:00
72c5eaae31 代码生成:增加 one 情况下的示例代码 2023-11-12 19:50:38 +08:00
49ebadd748 营销:适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
702f23e672 feat: CRM 客户限制 2023-11-12 14:34:25 +08:00
ed26142bb0 crm联系人init 2023-11-11 23:35:18 +08:00
a7f86dfd8b feat: CRM 客户限制 2023-11-11 21:06:11 +08:00
6369b334e3 feat: CRM 客户限制 2023-11-11 20:50:33 +08:00
55f6e4ca25 主子表:确认列表编辑的支持组件情况 2023-11-10 23:01:36 +08:00
b63e2a9efb Merge remote-tracking branch 'origin/dev' into dev 2023-11-10 22:47:34 +08:00
9f9e0f8bda 主子表:同步三种模式的代码 2023-11-10 19:54:55 +08:00
af5d1cf25e update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:36:11 +00:00
1ab5b44254 update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:35:54 +00:00
2ff97758fd update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:34:32 +00:00
86d9a97ccb 主子表:暂时存储,参数校验-表单数据跑通 2023-11-10 08:51:01 +08:00
d45ebd4fcf 主子表:暂时存储,样式跑通 2023-11-10 00:20:00 +08:00
4e413a10e6 主子表:暂时存储,准备重构 2023-11-09 23:10:54 +08:00
55b477acdb unplugin-auto-import:排除自动导入店铺装修组件 2023-11-09 15:48:20 +08:00
6160c2fa8a !315 商城装修
Merge pull request !315 from 疯狂的世界/dev
2023-11-09 01:30:21 +00:00
e9299c6710 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-09 09:20:21 +08:00
a08e9bea7c 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-09 09:20:21 +08:00
82aed175ab 营销:适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +08:00
59b2d89a18 feat: CRM 客户公海配置 2023-11-09 00:08:09 +08:00
288aa72cdd feat: CRM 客户公海配置 2023-11-09 00:05:10 +08:00
ac42493659 营销:适配商城装修组件【宫格导航】 2023-11-08 22:22:35 +08:00
325e2e4ff2 营销:适配商城装修组件【列表导航】 2023-11-08 21:10:05 +08:00
084009f7f2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-08 17:30:04 +08:00
f2c71d5836 refactor: 会员商品收藏 2023-11-08 17:29:57 +08:00
57474c0644 Merge remote-tracking branch 'origin/dev' into dev 2023-11-07 22:54:50 +08:00
7146fdc9b9 style: 客户 review 修改 2023-11-06 22:00:40 +08:00
eb9f8c9f6f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-06 21:43:55 +08:00
85ee558bef 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-06 19:42:28 +08:00
c0d5c76a06 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-06 19:09:20 +08:00
821217501c !310 fix: 修复关闭拼团活动请求URL错误的问题
Merge pull request !310 from VicoHu/N/A
2023-11-06 07:03:30 +00:00
ead30e8cd9 !312 商城装修
Merge pull request !312 from 疯狂的世界/dev
2023-11-06 07:02:18 +00:00
4253173a2a 营销:适配商城装修组件【轮播图】 2023-11-06 09:31:42 +08:00
6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 08:33:16 +08:00
bb2b7ffd03 营销:增加商城装修组件【视频播放】 2023-11-05 22:53:30 +08:00
3f803767c4 fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
2023-11-05 13:59:28 +00:00
47bb88d892 code review:产品分类 2023-11-05 20:50:13 +08:00
e1cff74f41 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:48:12 +08:00
fa710b560d 营销:增加商城装修组件【图片展示】 2023-11-05 20:42:50 +08:00
596ad888e1 !308 【增加CRM:产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
2023-11-05 12:28:31 +00:00
17742988c9 code review:回款 2023-11-05 20:25:52 +08:00
65d85e30ca Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:23:56 +08:00
f0c45103e1 !309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
2023-11-05 12:20:46 +00:00
434aa864da 营销:优化装修编辑器 2023-11-05 12:40:32 +08:00
0b0ba1f313 营销:优化装修编辑器样式 2023-11-05 10:08:03 +08:00
984351fbf0 修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致 2023-11-05 09:47:54 +08:00
aedf014407 营销:装修页面适配搜索框 2023-11-04 22:06:40 +08:00
4f2f4f72b5 优化:社交登录、用户的管理 2023-11-04 20:43:36 +08:00
ff6f05df84 【crm:产品及产品分类】 2023-11-04 18:28:59 +08:00
a9b91e7436 优化:社交登录、用户的管理 2023-11-04 14:37:23 +08:00
ac7f1e29fb Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 10:50:04 +08:00
df646175dc !296 新增社交客户端 CRUD,新增社交用户 RUD
Merge pull request !296 from puhui999/dev_tmp
2023-11-04 02:49:27 +00:00
71e6d51c12 !299 update src/layout/components/Message/src/Message.vue.
Merge pull request !299 from lzy/N/A
2023-11-04 02:44:57 +00:00
f79d31a64a code review:满减送活动 2023-11-04 10:39:39 +08:00
27defa7268 !291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
2023-11-04 02:30:50 +00:00
a9faeb1bdb code review:客户管理 2023-11-04 10:12:40 +08:00
09c44cd4fe !306 feat: 客户详情 + review 修改
Merge pull request !306 from wanwan/dev
2023-11-04 01:50:33 +00:00
23f483ac45 feat: 客户详情 + review 修改 2023-11-04 03:21:01 +08:00
8ef5227f88 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 00:48:51 +08:00
188de1031b !302 update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
Merge pull request !302 from 风狗/N/A
2023-11-03 16:28:27 +00:00
f6adb4ebaf !303 商城装修
Merge pull request !303 from 疯狂的世界/dev
2023-11-03 15:07:04 +00:00
de62a7a5b7 bugfix:注释掉 uno 的 transformerVariantGroup,解决 vite 监控到 css 变化,导致 Login.vue 登录时的重加载问题 2023-11-03 18:44:56 +08:00
fcc748dc63 Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 08:47:57 +08:00
753f5de81e 转账 - 新增转账订单查询 2023-11-03 08:46:53 +08:00
3c0f3ceed5 营销:装修模板,底部导航适配APP 2023-11-03 06:47:46 +08:00
bf418653e4 update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
2023-11-02 02:08:26 +00:00
20c59b8122 !301 营销:完善商城装修
Merge pull request !301 from 疯狂的世界/dev
2023-11-01 00:48:16 +00:00
3d54ad3a6a 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-31 23:32:35 +08:00
9bd33355e2 营销:装修编辑器样式优化 2023-10-31 17:17:46 +08:00
18e2c33cef Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-31 16:53:48 +08:00
9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
10483577b7 fix: types 2023-10-31 14:26:17 +08:00
52755b38a9 fix: props 2023-10-31 14:25:49 +08:00
13f31c19f5 chore: words warn 2023-10-31 14:25:41 +08:00
4365ca6177 fix: title name 2023-10-31 14:10:05 +08:00
ce93c8d4e9 fix: name warn 2023-10-31 14:04:43 +08:00
7321ff2136 chore: wh-full 2023-10-31 10:20:39 +08:00
af7c6f3b2c fix: url error 2023-10-31 10:17:00 +08:00
80e72fd924 feat: coding 2023-10-31 10:13:22 +08:00
2a029ba35b feat: add useTagsView hooks 2023-10-31 10:12:04 +08:00
57e8256e9a feat: add useNow hooks 2023-10-31 10:11:55 +08:00
bdcef303ff perf: useValidator hooks 2023-10-31 10:11:43 +08:00
f8fdebffe6 feat: add useNetwork hooks 2023-10-31 10:11:34 +08:00
4ba264e00d perf: use driver.js 2023-10-31 10:07:21 +08:00
f26a4cae10 feat: unocss add shortcuts 2023-10-31 10:04:31 +08:00
899880bfe1 chore: update deps 2023-10-31 09:52:08 +08:00
2b84de7e09 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:32:50 +08:00
lzy
c269cab6b2 update src/layout/components/Message/src/Message.vue.
fix:  处理站内信内容过多回显问题

Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
2023-10-30 06:20:16 +00:00
c1534bf168 Merge remote-tracking branch 'origin/dev' into dev 2023-10-29 23:48:20 +08:00
55a961e862 转账 - 管理后台新增转账示例 2023-10-29 23:48:10 +08:00
0c81a0d96a code review:客户表的实现 2023-10-29 22:29:03 +08:00
4fba270f1c !298 商城装修
Merge pull request !298 from 疯狂的世界/feature/mall_diy
2023-10-29 14:16:58 +00:00
e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
dc5cf9f24c code review:客户表的实现 2023-10-29 17:55:39 +08:00
690b208a4e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-29 10:38:48 +08:00
5d760d5450 !297 feat: 调整 crm 客户表的字段
Merge pull request !297 from wanwan/master
2023-10-29 02:37:30 +00:00
60d53126c4 feat: 调整客户表的字段 2023-10-29 00:33:38 +08:00
59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
4cdab6fb3e feat: 调整客户表的字段 2023-10-28 19:50:42 +08:00
cca34e0acb !295 订单:解决列数据中的 table#header 数据不刷新的问题
Merge pull request !295 from puhui999/dev-to-dev
2023-10-27 15:03:42 +00:00
b9ab22dad1 code review:客户表的实现 2023-10-27 23:01:00 +08:00
32b3c874f5 !294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
2023-10-27 14:41:47 +00:00
a624db04e9 三方应用新增授权方的网页应用 agentId 属性 2023-10-26 17:00:13 +08:00
88a22d90e5 解决钉钉绑定失败的问题 2023-10-26 16:19:22 +08:00
6ee2492ff1 新增社交用户 RUD 2023-10-25 17:02:11 +08:00
8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
d060d27ab2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-25 11:14:26 +08:00
ca385bc08e 解决列数据中的 table#header 数据不刷新的问题 2023-10-25 11:14:00 +08:00
309c3f30d1 chore: remove vue-macros/volar 2023-10-25 10:43:03 +08:00
238537df83 fix: ElLoading need import 2023-10-25 10:36:06 +08:00
bf2c59c6e0 chore: stylelint config 2023-10-25 10:35:30 +08:00
50f1ae9524 chore: eslint config 2023-10-25 10:35:20 +08:00
96db6ab538 chore: vscode setting 2023-10-25 10:35:10 +08:00
b8403c1b90 chore: update vue v3.3.7 2023-10-25 10:34:54 +08:00
044754cdb4 feat: 客户表的 crud 2023-10-25 00:24:20 +08:00
ef334dfc66 1.8.3 版本发布 2023-10-24 21:07:51 +08:00
539352f598 修复 banner 返回字段不对 2023-10-24 20:29:23 +08:00
6644a4d4a6 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-24 20:12:39 +08:00
e5d6a9dae1 code review:banner 逻辑 2023-10-24 20:07:48 +08:00
ed0f3a3043 !293 完善 banner 管理。商品 spu 剔除优惠卷相关逻辑
Merge pull request !293 from puhui999/dev-to-dev
2023-10-24 12:00:48 +00:00
95d7d1eb42 优惠卷模版样式调整 2023-10-24 17:39:02 +08:00
75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
7c8f7d570f 满减页面布局 2023-10-23 10:37:39 +08:00
54cce467ab !286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
2023-10-21 13:58:13 +00:00
6c6c2cb058 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-21 21:56:41 +08:00
af79d4a653 !285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
2023-10-21 13:56:12 +00:00
73578ce8b2 !290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
2023-10-21 13:06:19 +00:00
2dbfa77bee code review:banner 逻辑 2023-10-21 19:59:41 +08:00
4709c18a6e !284 完善 SPU,订单列表:完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
2023-10-21 11:08:44 +00:00
bb73a6edfd !287 reward
Merge pull request !287 from Bluemark/dev
2023-10-21 11:08:16 +00:00
929fa9a208 !289 满减页面布局
Merge pull request !289 from 落日晚风/master
2023-10-21 11:05:51 +00:00
423ea319e0 code review:限时折扣 2023-10-21 18:18:40 +08:00
5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 2023-10-21 18:16:39 +08:00
bb5945958b 钱包 - 优化
支付应用 - 证书模式增加应用私钥
2023-10-21 15:33:31 +08:00
e187c55408 !283 mall模块
Merge pull request !283 from zxiaoxiu/discount
2023-10-21 06:23:04 +00:00
491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
fb90a85e43 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:32 +08:00
26780c3525 【新增】回款计划 功能 2023-10-20 23:48:39 +08:00
7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
0730e215d8 完善文章管理 review 提到的问题 2023-10-20 22:16:18 +08:00
2a150cf0c0 修复合并差异 2023-10-20 21:42:50 +08:00
9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
2457665b55 code review:门店自提 2023-10-20 09:46:15 +08:00
826199dc22 !281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
2023-10-19 16:25:00 +00:00
83501f9b09 !279 交易:核销订单
Merge pull request !279 from 疯狂的世界/dev
2023-10-19 16:06:33 +00:00
6dc7315e17 !280 feat: CRM 线索表 crud
Merge pull request !280 from wanwan/master
2023-10-19 15:16:34 +00:00
3074adb1df fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 2023-10-19 18:43:02 +08:00
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
70778fd9e6 UserOrderList 重构完善 2023-10-19 10:54:10 +08:00
5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00
7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
d1a3fe5d5a 营销文章:新增表单属性移除浏览量 2023-10-18 11:33:42 +08:00
ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
61b3bdfd4c 交易:核销订单 2023-10-17 23:18:07 +08:00
d6b0305d78 !277 修复前端支付渠道配置权限
Merge pull request !277 from 小玩家/master
2023-10-17 14:55:14 +00:00
8832eafaae code review:crm 合同流程 2023-10-17 22:52:24 +08:00
533b4e5006 支付渠道配置--修复权限 2023-10-17 21:27:13 +08:00
d5328918ab 支付渠道配置--修复权限 2023-10-17 20:58:28 +08:00
40ec1b08ae !275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
2023-10-17 12:52:28 +00:00
0089d59d36 !274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
2023-10-17 12:01:51 +00:00
c27685285a code review:修复工作流的审批界面报错问题 2023-10-17 19:50:09 +08:00
63fd52828c Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 19:03:02 +08:00
aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/statistics/member/index.vue
2023-10-17 19:02:37 +08:00
0242c84196 !267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
2023-10-17 11:01:18 +00:00
57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00
6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
dced551698 feat: CRM/合同 crud 2023-10-16 23:56:34 +08:00
c3f06f5fbe 钱包 - 钱包余额流水 2023-10-16 22:45:32 +08:00
8626bccc4c 钱包 - 钱包余额流水 2023-10-16 22:32:10 +08:00
ae2c3f2ad5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 22:27:39 +08:00
e3a0cfe5e9 统计:修复错误 2023-10-16 22:18:51 +08:00
6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
66ec610801 code review:文章管理 2023-10-16 21:55:11 +08:00
7b9ea62e6b !273 商城首页
Merge pull request !273 from 疯狂的世界/dev
2023-10-16 12:11:23 +00:00
8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
42c8db4f34 chore: update deps 2023-10-16 15:03:55 +08:00
edfd03903f 统计:会员终端统计,处理未知终端情况 2023-10-16 14:26:04 +08:00
2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
661e72bcfd 统计:修复错误 2023-10-16 13:15:17 +08:00
8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
a2ded16718 docs: element plus 2.4.0 2023-10-16 10:25:24 +08:00
de3fa7a765 chore: update deps 2023-10-16 10:24:35 +08:00
99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
cbb0cfefdb !272 营销活动:新增文章管理,文章分类管理
Merge pull request !272 from puhui999/dev-to-dev
2023-10-15 14:04:48 +00:00
e2a08ddbac 恢复 SSO 界面的路由 2023-10-15 21:58:19 +08:00
04e83e268a !271 添加社交登录页面,修复登录多次重定向问题
Merge pull request !271 from dhb52/master
2023-10-15 13:37:55 +00:00
90d6f4da9f 钱包- 钱包余额查询 2023-10-15 17:47:36 +08:00
50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-15 16:14:32 +08:00
befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
89417ac393 fix: 删除SSOLogin.vue组建,解决登录界面不停重定向问题 2023-10-15 14:58:13 +08:00
3587d1ef97 fix: 路由缺少name字段,ts不高兴 2023-10-15 14:29:16 +08:00
4d77d7e136 feat: 社交平台登录 2023-10-15 14:26:20 +08:00
36bb90fbb8 营销活动:新增文章分类管理 2023-10-15 00:54:28 +08:00
889334bc37 !266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
2023-10-14 10:19:37 +00:00
b57b45c96f !255 站内信测试增加 Member 用户类型支持
Merge pull request !255 from 风狗/dev
2023-10-14 10:18:54 +00:00
fa71f85221 !265 修复,刷新菜单缓存失效问题
Merge pull request !265 from 天痕/N/A
2023-10-14 10:15:13 +00:00
8b6ca3028a Merge remote-tracking branch 'origin/dev' into dev 2023-10-14 11:33:15 +08:00
f9d0c1aa1c 钱包-充值套餐 2023-10-14 11:32:54 +08:00
529a821cdb Merge remote-tracking branch 'origin/master' 2023-10-13 18:44:27 +08:00
470fb23ae1 同步最新 README.md 功能列表 2023-10-13 18:35:44 +08:00
9b09304c50 docs: update deps 2023-10-13 10:41:10 +08:00
e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00
73b2030c7f chore: update deps 2023-10-13 10:31:36 +08:00
6ed7b3a69e !270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
2023-10-12 13:53:25 +00:00
532b237712 !268 统计:会员统计
Merge pull request !268 from 疯狂的世界/dev
2023-10-11 04:34:07 +00:00
855b37c1ab code review:拼团记录列表 2023-10-11 11:04:03 +08:00
19c19d78dd !269 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
Merge pull request !269 from puhui999/dev-to-dev
2023-10-11 02:40:01 +00:00
b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:55:53 +08:00
3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
ad4607db09 Merge remote-tracking branch 'owen/dev' into dev 2023-10-09 23:29:36 +08:00
6b7040404e 统计:会员统计 2023-10-09 23:27:32 +08:00
d4a521eff1 统计:交易统计Review修改 2023-10-09 23:27:32 +08:00
22adab8590 统计:会员统计 2023-10-09 23:27:09 +08:00
683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
aa5f27bec7 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
2023-10-08 08:26:07 +00:00
86323f970b code review:拼团记录列表 2023-10-08 07:30:14 +08:00
523784ce41 !264 营销活动:添加拼团记录
Merge pull request !264 from puhui999/dev-to-dev
2023-10-07 23:06:18 +00:00
fff4cfd012 修复,刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
2023-10-07 10:51:56 +00:00
5b4983a3e9 拼团记录:优化页面布局,添加日期快捷选项 2023-10-07 11:10:26 +08:00
8c347e5990 拼团活动:表单添加虚拟成团控制按钮 2023-10-07 10:04:05 +08:00
e86dfa30fd Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-06 22:21:10 +08:00
c445173855 拼团记录:接口对接 2023-10-06 22:20:40 +08:00
24fc36e23a promotion:调整拼团活动的界面 2023-10-06 21:03:17 +08:00
eee3d0fef5 拼团记录: 完成 UI 部分 2023-10-06 18:40:21 +08:00
c8a476ac7c Merge remote-tracking branch 'origin/dev' into dev 2023-10-06 14:17:13 +08:00
2a58b04a98 统计:交易统计Review修改 2023-10-06 14:15:58 +08:00
78062dd474 promotion:调整拼团活动的界面 2023-10-06 10:58:31 +08:00
869bac2501 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-05 21:50:33 +08:00
cf7ac2cb10 promotion:新增记录记录列表 2023-10-05 12:42:00 +08:00
860872a890 promotion:新增砍价记录列表 2023-10-05 12:06:57 +08:00
42f0bf07f0 promotion:优化砍价活动的管理 2023-10-05 02:17:44 +08:00
4c2eb3d8b2 !262 核销
Merge pull request !262 from 疯狂的世界/dev
2023-10-04 09:34:20 +00:00
58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
7c491ff62a promotion:优化秒杀活动的界面 2023-10-03 18:41:57 +08:00
40f44fc78e promotion:优化优惠劵的界面 2023-10-03 13:01:31 +08:00
59ab6218ca trade:优化分销界面的 width 列宽度,和一些非空判断 2023-10-03 12:16:24 +08:00
04a94ad941 !254 解决处理顶级非目录路由的组件名称逻辑缺失的问题
Merge pull request !254 from clockdotnet/master_pr
2023-10-03 02:27:37 +00:00
e6ee0ab445 !261 对齐面包屑的图标和文字
Merge pull request !261 from 疯狂的世界/dev
2023-10-02 16:00:45 +00:00
6515e218e2 Merge branch 'dev' into dev_local 2023-10-02 23:58:41 +08:00
a06a63c1be Merge remote-tracking branch 'origin/dev' into dev 2023-10-02 23:52:23 +08:00
ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 2023-10-02 21:18:31 +08:00
a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
bb08f6f54f trade:完善退款详情 2023-10-02 15:44:26 +08:00
df8a3941c1 对齐面包屑的图标和文字 2023-10-02 11:11:07 +08:00
4c077711a1 对齐面包屑的图标和文字 2023-10-02 11:03:46 +08:00
4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
588ce1c9ae trade:微调 order 列表界面 2023-10-01 23:44:38 +08:00
a5808c9e9c !259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
2023-10-01 13:57:56 +00:00
17c31978f7 product:优化商品评论 2023-10-01 21:23:50 +08:00
8b7543acd5 product:优化属性列表 2023-10-01 21:11:47 +08:00
5f80d1611c product:优化分类列表 2023-10-01 20:55:51 +08:00
88677ee121 product:优化商品发布页 2023-10-01 20:16:02 +08:00
3a9668d632 product:优化商品列表的样式、实现代码 2023-10-01 19:44:13 +08:00
3a96812d47 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:20 +08:00
3ab1ed707f 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
0066d79876 签到:签到后增加用户积分、经验 2023-10-01 09:53:52 +08:00
6508d841f5 Merge remote-tracking branch 'origin/dev' into dev 2023-09-30 22:08:45 +08:00
4b7e57e67d 会员详情,修改会员积分 2023-09-30 15:50:12 +08:00
940a102546 会员:会员详情-推广用户列表 2023-09-30 14:10:15 +08:00
b48f19c646 会员:会员详情-优惠券列表 2023-09-30 13:55:42 +08:00
675f3df5cb 会员详情,查询钱包信息 2023-09-30 12:40:21 +08:00
654094b4fd !258 交易统计
Merge pull request !258 from 疯狂的世界/dev
2023-09-30 03:24:07 +00:00
6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
c322fb3d0d 统计:交易统计 2023-09-29 21:08:14 +08:00
150c77cff0 fix eslint problems 2023-09-29 16:25:38 +08:00
fb94ae9674 trade:退款理由的维护 2023-09-29 13:35:52 +08:00
a438353308 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:38:53 +08:00
b1469669e2 Merge branch 'feature/bpm-delegate'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:37:32 +08:00
04e02ffbd2 trade:分佣界面的微调 2023-09-28 16:38:51 +08:00
74de8e9687 trade:优化交易配置的参数校验 2023-09-28 15:29:15 +08:00
2f82eff526 Merge remote-tracking branch 'origin/dev' into dev 2023-09-27 23:30:48 +08:00
888c1371c6 Merge remote-tracking branch 'origin/master' 2023-09-27 23:30:16 +08:00
c6031ba2b2 增加 user detail 的 todo 2023-09-27 23:30:09 +08:00
65047b93a4 !250 【工作流】委派
Merge pull request !250 from Youkehai/feature/bpm-delegate
2023-09-25 12:10:52 +00:00
f832d26a0d 站内信测试增加 Member 用户类型支持 2023-09-25 16:04:32 +08:00
361e4fadda 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:25:33 +08:00
0fba0d9a6a feat: 对齐后端-工作流委派的参数 2023-09-25 11:31:13 +08:00
2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-25 09:37:22 +08:00
b9881f2941 !252 分销:Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
2023-09-25 00:37:31 +00:00
a5dd7f4a81 分销:修正分享海报 2023-09-24 23:18:50 +08:00
2c22ef8ef1 分销:重命名提现类型字段 2023-09-24 22:32:10 +08:00
20fe343646 feat: 【工作流】--委派 2023-09-24 15:44:02 +08:00
dd5a1f2d43 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-20 16:39:19 +08:00
8778f5746f spu:分佣属性和分佣保持一致 2023-09-13 10:17:14 +08:00
594 changed files with 36899 additions and 3573 deletions

View File

@ -1,19 +0,0 @@
# 本地开发环境
NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
# 接口地址
VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/

View File

@ -1,13 +1,14 @@
# 开发环境
# 开发环境本地只启动前端项目依赖开发环境后端、APP
NODE_ENV=development
VITE_DEV=false
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# VITE_BASE_URL='http://dofast.demo.huizhizao.vip:20001'
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
@ -15,17 +16,23 @@ VITE_API_BASEPATH=/dev-api
# 接口地址
VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/
# 是否删除debugger
VITE_DROP_DEBUGGER=true
VITE_DROP_DEBUGGER=false
# 是否删除console.log
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=false
VITE_SOURCEMAP=true
# 打包路径
VITE_BASE_PATH=/
# 输出路径
VITE_OUT_DIR=dist
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false

View File

@ -1,13 +1,13 @@
# 本地开发环境
# 本地开发环境本地启动所有项目前端、后端、APP时使用不依赖外部环境
NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
@ -15,12 +15,6 @@ VITE_API_BASEPATH=/dev-api
# 接口地址
VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/
# 项目本地运行端口号, 与.vscode/launch.json配合
VITE_PORT=80
# 是否删除debugger
VITE_DROP_DEBUGGER=false
@ -28,7 +22,13 @@ VITE_DROP_DEBUGGER=false
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=true
VITE_SOURCEMAP=false
# 打包路径
VITE_BASE_PATH=/
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://localhost:3000'
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false

View File

@ -1,4 +1,4 @@
# 生产环境
# 生产环境:只在打包时使用
NODE_ENV=production
VITE_DEV=false
@ -28,4 +28,7 @@ VITE_SOURCEMAP=false
VITE_BASE_PATH=/
# 输出路径
VITE_OUT_DIR=dist-pro
VITE_OUT_DIR=dist-prod
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'

View File

@ -1,4 +1,4 @@
# 生产环境
# 预发布环境:只在打包时使用
NODE_ENV=production
VITE_DEV=false
@ -29,3 +29,6 @@ VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'
# 输出路径
VITE_OUT_DIR=dist-stage
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'

View File

@ -1,4 +1,4 @@
# 开发环境
# 测试环境:只在打包时使用
NODE_ENV=production
VITE_DEV=false
@ -28,4 +28,7 @@ VITE_SOURCEMAP=false
VITE_BASE_PATH=/admin-ui-vue3/
# 输出路径
VITE_OUT_DIR=dist-dev
VITE_OUT_DIR=dist-test
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'

View File

@ -8,7 +8,6 @@ module.exports = defineConfig({
es6: true
},
parser: 'vue-eslint-parser',
plugins: ['vue'],
parserOptions: {
parser: '@typescript-eslint/parser',
ecmaVersion: 2020,
@ -22,13 +21,13 @@ module.exports = defineConfig({
'plugin:vue/vue3-recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
'plugin:prettier/recommended',
'plugin:prettier/recommended',
'@unocss'
],
rules: {
'vue/no-setup-props-destructure': 'off',
'vue/script-setup-uses-vars': 'error',
'vue/no-reserved-component-names': 'off',
'vue/no-setup-props-destructure': 'off',
'@typescript-eslint/ban-ts-ignore': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-explicit-any': 'off',
@ -54,6 +53,7 @@ module.exports = defineConfig({
'vue/attribute-hyphenation': 'off',
'vue/require-default-prop': 'off',
'vue/require-explicit-emits': 'off',
'vue/require-toggle-inside-transition': 'off',
'vue/html-self-closing': [
'error',
{
@ -67,6 +67,7 @@ module.exports = defineConfig({
}
],
'vue/multi-word-component-names': 'off',
'vue/no-v-html': 'off'
'vue/no-v-html': 'off',
'prettier/prettier': 'off' // 芋艿:默认关闭 prettier 的 ESLint 校验,因为我们使用的是 IDE 的 Prettier 插件
}
})

BIN
.image/Java监控.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
.image/MySQL.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

BIN
.image/OA请假-列表.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

BIN
.image/OA请假-发起.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

BIN
.image/OA请假-详情.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

BIN
.image/Redis.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

BIN
.image/admin-uniapp/01.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
.image/admin-uniapp/02.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
.image/admin-uniapp/03.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
.image/admin-uniapp/04.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
.image/admin-uniapp/05.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

BIN
.image/admin-uniapp/06.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
.image/admin-uniapp/07.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
.image/admin-uniapp/08.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
.image/admin-uniapp/09.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

BIN
.image/个人中心.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

BIN
.image/代码生成.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

BIN
.image/令牌管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

BIN
.image/任务日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

BIN
.image/商户信息.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

BIN
.image/在线用户.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

BIN
.image/字典数据.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

BIN
.image/字典类型.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

BIN
.image/定时任务.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

BIN
.image/岗位管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

BIN
.image/应用管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
.image/操作日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

BIN
.image/支付订单.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

BIN
.image/敏感词.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

BIN
.image/数据库文档.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

BIN
.image/文件管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

BIN
.image/文件管理2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

BIN
.image/文件配置.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

BIN
.image/日志中心.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

BIN
.image/流程表单.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

BIN
.image/生成效果.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

BIN
.image/用户分组.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

BIN
.image/用户管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
.image/登录.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

BIN
.image/登录日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

BIN
.image/短信日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
.image/短信模板.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

BIN
.image/短信渠道.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

BIN
.image/租户套餐.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

BIN
.image/租户管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

BIN
.image/系统接口.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

BIN
.image/菜单管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

BIN
.image/表单构建.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

BIN
.image/角色管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

BIN
.image/访问日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

BIN
.image/退款订单.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

BIN
.image/通知公告.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

BIN
.image/部门管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

BIN
.image/配置管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

BIN
.image/链路追踪.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

BIN
.image/错误日志.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

BIN
.image/错误码管理.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

BIN
.image/首页.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

14
.vscode/settings.json vendored
View File

@ -1,5 +1,5 @@
{
"typescript.tsdk": "./node_modules/typescript/lib",
"typescript.tsdk": "node_modules/typescript/lib",
"npm.packageManager": "pnpm",
"editor.tabSize": 2,
"prettier.printWidth": 100, // 超过最大值换行
@ -83,18 +83,15 @@
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"[vue]": {
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.fixAll.stylelint": true
}
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
},
"i18n-ally.localesPaths": ["src/locales"],
"i18n-ally.keystyle": "nested",
"i18n-ally.sortKeys": true,
"i18n-ally.namespace": true,
"i18n-ally.namespace": false,
"i18n-ally.enabledParsers": ["ts"],
"i18n-ally.sourceLanguage": "en",
"i18n-ally.displayLanguage": "zh-CN",
@ -105,6 +102,7 @@
"codemirror",
"commitlint",
"cropperjs",
"echart",
"echarts",
"esnext",
"esno",
@ -119,10 +117,12 @@
"sider",
"sortablejs",
"stylelint",
"svgs",
"unocss",
"unplugin",
"unref",
"videojs",
"VITE",
"vitejs",
"vueuse",
"wangeditor",

105
README.md
View File

@ -38,15 +38,15 @@
| 框架 | 说明 | 版本 |
|----------------------------------------------------------------------|------------------|--------|
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 |
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.14 |
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.8 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.5.0 |
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.4.2 |
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 |
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 |
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.4.1 |
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.7 |
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.6.1 |
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.6.5 |
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.1 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.57.4 |
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
@ -66,6 +66,18 @@
| ESLint | 脚本代码检查 |
| DotENV | env 文件高亮 |
## 🔥 后端架构
支持 Spring Boot、Spring Cloud 两种架构:
① Spring Boot 单体架构:<https://github.com/YunaiV/ruoyi-vue-pro>
![架构图](/.image/common/ruoyi-vue-pro-architecture.png)
② Spring Cloud 微服务架构:<https://github.com/YunaiV/yudao-cloud>
![架构图](/.image/common/yudao-cloud-architecture.png)
## 内置功能
系统内置多种多种业务功能,可以用于快速你的业务系统:
@ -174,62 +186,61 @@ ps核心功能已经实现正在对接微信小程序中...
### 商城系统
建设中...
![功能图](/.image/common/mall-feature.png)
![功能图](http://static.iocoder.cn/mall%20%E5%8A%9F%E8%83%BD%E5%9B%BE-min.png)
![功能图](/.image/common/mall-preview.png)
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-admin-min.gif)
_前端基于 crmeb uniapp 经过授权重构优化代码实现接入芋道快速开发平台_
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-h5-min.gif)
演示地址:<https://doc.iocoder.cn/mall-preview/>
## 🐷 演示图
### 系统功能
| 模块 | biu | biu | biu |
|------------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
| 登录 & 首页 | ![登录](https://static.iocoder.cn/images/ruoyi-vue-pro/登录.jpg?imageView2/2/format/webp/w/1280) | ![首页](https://static.iocoder.cn/images/ruoyi-vue-pro/首页.jpg?imageView2/2/format/webp/w/1280) | ![个人中心](https://static.iocoder.cn/images/ruoyi-vue-pro/个人中心.jpg?imageView2/2/format/webp/w/1280) |
| 用户 & 应用 | ![用户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/用户管理.jpg?imageView2/2/format/webp/w/1280) | ![令牌管理](https://static.iocoder.cn/images/ruoyi-vue-pro/令牌管理.jpg?imageView2/2/format/webp/w/1280) | ![应用管理](https://static.iocoder.cn/images/ruoyi-vue-pro/应用管理.jpg?imageView2/2/format/webp/w/1280) |
| 租户 & 套餐 | ![租户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/租户管理.jpg?imageView2/2/format/webp/w/1280) | ![租户套餐](https://static.iocoder.cn/images/ruoyi-vue-pro/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](https://static.iocoder.cn/images/ruoyi-vue-pro/部门管理.jpg?imageView2/2/format/webp/w/1280) | ![岗位管理](https://static.iocoder.cn/images/ruoyi-vue-pro/岗位管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 菜单 & 角色 | ![菜单管理](https://static.iocoder.cn/images/ruoyi-vue-pro/菜单管理.jpg?imageView2/2/format/webp/w/1280) | ![角色管理](https://static.iocoder.cn/images/ruoyi-vue-pro/角色管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 审计日志 | ![操作日志](https://static.iocoder.cn/images/ruoyi-vue-pro/操作日志.jpg?imageView2/2/format/webp/w/1280) | ![登录日志](https://static.iocoder.cn/images/ruoyi-vue-pro/登录日志.jpg?imageView2/2/format/webp/w/1280) | - |
| 短信 | ![短信渠道](https://static.iocoder.cn/images/ruoyi-vue-pro/短信渠道.jpg?imageView2/2/format/webp/w/1280) | ![短信模板](https://static.iocoder.cn/images/ruoyi-vue-pro/短信模板.jpg?imageView2/2/format/webp/w/1280) | ![短信日志](https://static.iocoder.cn/images/ruoyi-vue-pro/短信日志.jpg?imageView2/2/format/webp/w/1280) |
| 字典 & 敏感词 | ![字典类型](https://static.iocoder.cn/images/ruoyi-vue-pro/字典类型.jpg?imageView2/2/format/webp/w/1280) | ![字典数据](https://static.iocoder.cn/images/ruoyi-vue-pro/字典数据.jpg?imageView2/2/format/webp/w/1280) | ![敏感词](https://static.iocoder.cn/images/ruoyi-vue-pro/敏感词.jpg?imageView2/2/format/webp/w/1280) |
| 错误码 & 通知 | ![错误码管理](https://static.iocoder.cn/images/ruoyi-vue-pro/错误码管理.jpg?imageView2/2/format/webp/w/1280) | ![通知公告](https://static.iocoder.cn/images/ruoyi-vue-pro/通知公告.jpg?imageView2/2/format/webp/w/1280) | - |
| 模块 | biu | biu | biu |
|----------|-----------------------------|---------------------------|--------------------------|
| 登录 & 首页 | ![登录](/.image/登录.jpg) | ![首页](/.image/首页.jpg) | ![个人中心](/.image/个人中心.jpg) |
| 用户 & 应用 | ![用户管理](/.image/用户管理.jpg) | ![令牌管理](/.image/令牌管理.jpg) | ![应用管理](/.image/应用管理.jpg) |
| 租户 & 套餐 | ![租户管理](/.image/租户管理.jpg) | ![租户套餐](/.image/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](/.image/部门管理.jpg) | ![岗位管理](/.image/岗位管理.jpg) | - |
| 菜单 & 角色 | ![菜单管理](/.image/菜单管理.jpg) | ![角色管理](/.image/角色管理.jpg) | - |
| 审计日志 | ![操作日志](/.image/操作日志.jpg) | ![登录日志](/.image/登录日志.jpg) | - |
| 短信 | ![短信渠道](/.image/短信渠道.jpg) | ![短信模板](/.image/短信模板.jpg) | ![短信日志](/.image/短信日志.jpg) |
| 字典 & 敏感词 | ![字典类型](/.image/字典类型.jpg) | ![字典数据](/.image/字典数据.jpg) | ![敏感词](/.image/敏感词.jpg) |
| 错误码 & 通知 | ![错误码管理](/.image/错误码管理.jpg) | ![通知公告](/.image/通知公告.jpg) | - |
### 工作流程
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 流程模型 | ![流程模型-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-列表.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-设计](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-设计.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-定义](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-定义.jpg?imageView2/2/format/webp/w/1280) |
| 表单 & 分组 | ![流程表单](https://static.iocoder.cn/images/ruoyi-vue-pro/流程表单.jpg?imageView2/2/format/webp/w/1280) | ![用户分组](https://static.iocoder.cn/images/ruoyi-vue-pro/用户分组.jpg?imageView2/2/format/webp/w/1280) | - |
| 我的流程 | ![我的流程-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-列表.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-发起.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-详情.jpg?imageView2/2/format/webp/w/1280) |
| 待办 & 已办 | ![任务列表-审批](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-审批.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-待办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-待办.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-已办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-已办.jpg?imageView2/2/format/webp/w/1280) |
| OA 请假 | ![OA请假-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-列表.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-发起.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-详情.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------|---------------------------------|---------------------------------|---------------------------------|
| 流程模型 | ![流程模型-列表](/.image/流程模型-列表.jpg) | ![流程模型-设计](/.image/流程模型-设计.jpg) | ![流程模型-定义](/.image/流程模型-定义.jpg) |
| 表单 & 分组 | ![流程表单](/.image/流程表单.jpg) | ![用户分组](/.image/用户分组.jpg) | - |
| 我的流程 | ![我的流程-列表](/.image/我的流程-列表.jpg) | ![我的流程-发起](/.image/我的流程-发起.jpg) | ![我的流程-详情](/.image/我的流程-详情.jpg) |
| 待办 & 已办 | ![任务列表-审批](/.image/任务列表-审批.jpg) | ![任务列表-待办](/.image/任务列表-待办.jpg) | ![任务列表-已办](/.image/任务列表-已办.jpg) |
| OA 请假 | ![OA请假-列表](/.image/OA请假-列表.jpg) | ![OA请假-发起](/.image/OA请假-发起.jpg) | ![OA请假-详情](/.image/OA请假-详情.jpg) |
### 基础设施
| 模块 | biu | biu | biu |
|---------------|----------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------|
| 代码生成 | ![代码生成](https://static.iocoder.cn/images/ruoyi-vue-pro/代码生成.jpg?imageView2/2/format/webp/w/1280) | ![生成效果](https://static.iocoder.cn/images/ruoyi-vue-pro/生成效果.jpg?imageView2/2/format/webp/w/1280) | - |
| 文档 | ![系统接口](https://static.iocoder.cn/images/ruoyi-vue-pro/系统接口.jpg?imageView2/2/format/webp/w/1280) | ![数据库文档](https://static.iocoder.cn/images/ruoyi-vue-pro/数据库文档.jpg?imageView2/2/format/webp/w/1280) | - |
| 文件 & 配置 | ![文件配置](https://static.iocoder.cn/images/ruoyi-vue-pro/文件配置.jpg?imageView2/2/format/webp/w/1280) | ![文件管理](https://static.iocoder.cn/images/ruoyi-vue-pro/文件管理2.jpg?imageView2/2/format/webp/w/1280) | ![配置管理](https://static.iocoder.cn/images/ruoyi-vue-pro/配置管理.jpg?imageView2/2/format/webp/w/1280) |
| 定时任务 | ![定时任务](https://static.iocoder.cn/images/ruoyi-vue-pro/定时任务.jpg?imageView2/2/format/webp/w/1280) | ![任务日志](https://static.iocoder.cn/images/ruoyi-vue-pro/任务日志.jpg?imageView2/2/format/webp/w/1280) | - |
| API 日志 | ![访问日志](https://static.iocoder.cn/images/ruoyi-vue-pro/访问日志.jpg?imageView2/2/format/webp/w/1280) | ![错误日志](https://static.iocoder.cn/images/ruoyi-vue-pro/错误日志.jpg?imageView2/2/format/webp/w/1280) | - |
| MySQL & Redis | ![MySQL](https://static.iocoder.cn/images/ruoyi-vue-pro/MySQL.jpg?imageView2/2/format/webp/w/1280) | ![Redis](https://static.iocoder.cn/images/ruoyi-vue-pro/Redis.jpg?imageView2/2/format/webp/w/1280) | - |
| 监控平台 | ![Java监控](https://static.iocoder.cn/images/ruoyi-vue-pro/Java监控.jpg?imageView2/2/format/webp/w/1280) | ![链路追踪](https://static.iocoder.cn/images/ruoyi-vue-pro/链路追踪.jpg?imageView2/2/format/webp/w/1280) | ![日志中心](https://static.iocoder.cn/images/ruoyi-vue-pro/日志中心.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------------|-------------------------------|-----------------------------|---------------------------|
| 代码生成 | ![代码生成](/.image/代码生成.jpg) | ![生成效果](/.image/生成效果.jpg) | - |
| 文档 | ![系统接口](/.image/系统接口.jpg) | ![数据库文档](/.image/数据库文档.jpg) | - |
| 文件 & 配置 | ![文件配置](/.image/文件配置.jpg) | ![文件管理](/.image/文件管理2.jpg) | ![配置管理](/.image/配置管理.jpg) |
| 定时任务 | ![定时任务](/.image/定时任务.jpg) | ![任务日志](/.image/任务日志.jpg) | - |
| API 日志 | ![访问日志](/.image/访问日志.jpg) | ![错误日志](/.image/错误日志.jpg) | - |
| MySQL & Redis | ![MySQL](/.image/MySQL.jpg) | ![Redis](/.image/Redis.jpg) | - |
| 监控平台 | ![Java监控](/.image/Java监控.jpg) | ![链路追踪](/.image/链路追踪.jpg) | ![日志中心](/.image/日志中心.jpg) |
### 支付系统
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 商家 & 应用 | ![商户信息](https://static.iocoder.cn/images/ruoyi-vue-pro/商户信息.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-列表.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 支付 & 退款 | ![支付订单](https://static.iocoder.cn/images/ruoyi-vue-pro/支付订单.jpg?imageView2/2/format/webp/w/1280) | ![退款订单](https://static.iocoder.cn/images/ruoyi-vue-pro/退款订单.jpg?imageView2/2/format/webp/w/1280) | --- |
| 模块 | biu | biu | biu |
|---------|---------------------------|---------------------------------|---------------------------------|
| 商家 & 应用 | ![商户信息](/.image/商户信息.jpg) | ![应用信息-列表](/.image/应用信息-列表.jpg) | ![应用信息-编辑](/.image/应用信息-编辑.jpg) |
| 支付 & 退款 | ![支付订单](/.image/支付订单.jpg) | ![退款订单](/.image/退款订单.jpg) | --- |
### 数据报表
| 模块 | biu | biu | biu |
|-------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|
| 报表设计器 | ![数据报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-数据报表.jpg?imageView2/2/format/webp/w/1280) | ![图形报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-图形报表.jpg?imageView2/2/format/webp/w/1280) | ![报表设计器-打印设计](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-打印设计.jpg?imageView2/2/format/webp/w/1280) |
| 大屏设计器 | ![大屏列表](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-列表.jpg?imageView2/2/format/webp/w/1280) | ![大屏预览](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-预览.jpg?imageView2/2/format/webp/w/1280) | ![大屏编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|-------|---------------------------------|---------------------------------|---------------------------------------|
| 报表设计器 | ![数据报表](/.image/报表设计器-数据报表.jpg) | ![图形报表](/.image/报表设计器-图形报表.jpg) | ![报表设计器-打印设计](/.image/报表设计器-打印设计.jpg) |
| 大屏设计器 | ![大屏列表](/.image/大屏设计器-列表.jpg) | ![大屏预览](/.image/大屏设计器-预览.jpg) | ![大屏编辑](/.image/大屏设计器-编辑.jpg) |

View File

@ -60,18 +60,11 @@ export function createVitePlugins() {
}
}),
Components({
// 要搜索组件的目录的相对路径
dirs: ['src/components'],
// 组件的有效文件扩展名
extensions: ['vue', 'md'],
// 搜索子目录
deep: true,
include: [/\.vue$/, /\.vue\?vue/],
// 生成自定义 `auto-components.d.ts` 全局声明
dts: 'src/types/auto-components.d.ts',
// 自定义组件的解析器
resolvers: [ElementPlusResolver()],
exclude: [/[\\/]node_modules[\\/]/]
globs: ["src/components/**/**.{vue, md}", '!src/components/DiyEditor/components/mobile/**']
}),
EslintPlugin({
cache: false,

View File

@ -1,23 +1,22 @@
{
"name": "yudao-ui-admin-vue3",
"version": "1.8.2-snapshot",
"version": "2.0.0-snapshot",
"description": "基于vue3、vite4、element-plus、typesScript",
"author": "xingyu",
"private": false,
"scripts": {
"i": "pnpm install",
"dev": "vite --mode base",
"front": "vite --mode front",
"dev": "vite --mode local-dev",
"dev-server": "vite --mode dev",
"ts:check": "vue-tsc --noEmit",
"build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro",
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
"build:base": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode base",
"build:local-dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
"build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",
"build:static": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode static",
"build:front": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode front",
"serve:pro": "vite preview --mode pro",
"build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod",
"serve:dev": "vite preview --mode dev",
"preview": "pnpm build:base && vite preview",
"serve:prod": "vite preview --mode prod",
"preview": "pnpm build:local-dev && vite preview",
"clean": "npx rimraf node_modules",
"clean:cache": "npx rimraf node_modules/.cache",
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
@ -31,39 +30,39 @@
"@form-create/element-ui": "^3.1.24",
"@iconify/iconify": "^3.1.1",
"@videojs-player/vue": "^1.0.0",
"@vueuse/core": "^10.4.1",
"@vueuse/core": "^10.6.1",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.10",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.5.0",
"axios": "^1.6.1",
"benz-amr-recorder": "^1.1.5",
"bpmn-js-token-simulation": "^0.10.0",
"camunda-bpmn-moddle": "^7.0.1",
"cropperjs": "^1.6.1",
"crypto-js": "^4.1.1",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.10",
"diagram-js": "^12.3.0",
"diagram-js": "^12.8.0",
"driver.js": "^1.3.1",
"echarts": "^5.4.3",
"echarts-wordcloud": "^2.1.0",
"element-plus": "2.3.14",
"fast-xml-parser": "^4.3.0",
"highlight.js": "^11.8.0",
"intro.js": "^7.2.0",
"element-plus": "2.4.2",
"fast-xml-parser": "^4.3.2",
"highlight.js": "^11.9.0",
"jsencrypt": "^3.3.2",
"lodash-es": "^4.17.21",
"min-dash": "^4.1.1",
"mitt": "^3.0.1",
"nprogress": "^0.2.0",
"pinia": "^2.1.6",
"pinia": "^2.1.7",
"qrcode": "^1.5.3",
"qs": "^6.11.2",
"steady-xml": "^0.1.0",
"url": "^0.11.3",
"video.js": "^7.21.5",
"vue": "^3.3.4",
"vue": "^3.3.8",
"vue-dompurify-html": "^4.1.4",
"vue-i18n": "^9.4.1",
"vue-i18n": "^9.6.5",
"vue-router": "^4.2.5",
"vue-types": "^5.1.1",
"vuedraggable": "^4.1.0",
@ -71,54 +70,52 @@
"xml-js": "^1.6.11"
},
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@iconify/json": "^2.2.119",
"@intlify/unplugin-vue-i18n": "^1.2.0",
"@commitlint/cli": "^18.4.1",
"@commitlint/config-conventional": "^18.4.0",
"@iconify/json": "^2.2.142",
"@intlify/unplugin-vue-i18n": "^1.5.0",
"@purge-icons/generated": "^0.9.0",
"@types/intro.js": "^5.1.1",
"@types/lodash-es": "^4.17.9",
"@types/node": "^20.6.0",
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.5.2",
"@types/qs": "^6.9.8",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"@unocss/transformer-variant-group": "^0.56.1",
"@unocss/eslint-config": "^0.56.1",
"@types/lodash-es": "^4.17.11",
"@types/node": "^20.9.0",
"@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5",
"@types/qs": "^6.9.10",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"@unocss/transformer-variant-group": "^0.57.4",
"@unocss/eslint-config": "^0.57.4",
"@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-vue": "^4.3.4",
"@vitejs/plugin-vue": "^4.4.1",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vue-macros/volar": "^0.14.3",
"autoprefixer": "^10.4.16",
"bpmn-js": "8.9.0",
"bpmn-js-properties-panel": "0.46.0",
"consola": "^3.2.3",
"eslint": "^8.49.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-define-config": "^1.23.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-vue": "^9.17.0",
"lint-staged": "^14.0.1",
"postcss": "^8.4.30",
"eslint-define-config": "^1.24.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-vue": "^9.18.1",
"lint-staged": "^15.1.0",
"postcss": "^8.4.31",
"postcss-html": "^1.5.0",
"postcss-scss": "^4.0.8",
"prettier": "^3.0.3",
"rimraf": "^5.0.1",
"rollup": "^3.29.2",
"sass": "^1.68.0",
"stylelint": "^15.10.3",
"postcss-scss": "^4.0.9",
"prettier": "^3.1.0",
"rimraf": "^5.0.5",
"rollup": "^4.4.1",
"sass": "^1.69.5",
"stylelint": "^15.11.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^13.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-order": "^6.0.3",
"terser": "^5.20.0",
"terser": "^5.24.0",
"typescript": "5.2.2",
"unocss": "^0.56.1",
"unplugin-auto-import": "^0.16.6",
"unocss": "^0.57.4",
"unplugin-auto-import": "^0.16.7",
"unplugin-element-plus": "^0.8.0",
"unplugin-vue-components": "^0.25.2",
"vite": "4.4.9",
"vite": "4.5.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-ejs": "^1.6.4",
"vite-plugin-eslint": "^1.8.1",
@ -126,8 +123,8 @@
"vite-plugin-purge-icons": "^0.9.2",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-top-level-await": "^1.3.1",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.13"
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.22"
},
"license": "MIT",
"repository": {

View File

@ -20,6 +20,17 @@ export type ProcessInstanceVO = {
endTime: string
}
export type ProcessInstanceCCVO = {
type: number,
taskName: string,
taskKey: string,
processInstanceName: string,
processInstanceKey: string,
startUserId: string,
options:string [],
reason: string
}
export const getMyProcessInstancePage = async (params) => {
return await request.get({ url: '/bpm/process-instance/my-page', params })
}
@ -39,3 +50,21 @@ export const cancelProcessInstance = async (id: number, reason: string) => {
export const getProcessInstance = async (id: number) => {
return await request.get({ url: '/bpm/process-instance/get?id=' + id })
}
/**
* 抄送
* @param data 抄送数据
* @returns 是否抄送成功
*/
export const createProcessInstanceCC = async (data) => {
return await request.post({ url: '/bpm/process-instance/cc/create', data: data })
}
/**
* 抄送列表
* @param params
* @returns
*/
export const getProcessInstanceCCPage = async (params) => {
return await request.get({ url: '/bpm/process-instance/cc/my-page', params })
}

View File

@ -44,10 +44,38 @@ export const exportTask = async (params) => {
// 获取所有可回退的节点
export const getReturnList = async (params) => {
return await request.get({ url: '/bpm/task/get-return-list', params })
return await request.get({ url: '/bpm/task/return-list', params })
}
// 回退
export const returnTask = async (data) => {
return await request.put({ url: '/bpm/task/return', data })
}
/**
* 委派
*/
export const delegateTask = async (data) => {
return await request.put({ url: '/bpm/task/delegate', data })
}
/**
* 加签
*/
export const taskAddSign = async (data) => {
return await request.put({ url: '/bpm/task/create-sign', data })
}
/**
* 获取减签任务列表
*/
export const getChildrenTaskList = async (id: string) => {
return await request.get({ url: '/bpm/task/children-list?taskId=' + id })
}
/**
* 减签
*/
export const taskSubSign = async (data) => {
return await request.delete({ url: '/bpm/task/delete-sign', data })
}

View File

@ -0,0 +1,72 @@
import request from '@/config/axios'
export interface BusinessVO {
id: number
name: string
statusTypeId: number
statusId: number
contactNextTime: Date
customerId: number
dealTime: Date
price: number
discountPercent: number
productPrice: number
remark: string
ownerUserId: number
roUserIds: string
rwUserIds: string
endStatus: number
endRemark: string
contactLastTime: Date
followUpStatus: number
}
// 查询 CRM 商机列表
export const getBusinessPage = async (params) => {
return await request.get({ url: `/crm/business/page`, params })
}
// 查询 CRM 商机列表,基于指定客户
export const getBusinessPageByCustomer = async (params) => {
return await request.get({ url: `/crm/business/page-by-customer`, params })
}
// 查询 CRM 商机详情
export const getBusiness = async (id: number) => {
return await request.get({ url: `/crm/business/get?id=` + id })
}
// 获得 CRM 商机列表(精简)
export const getSimpleBusinessList = async () => {
return await request.get({ url: `/crm/business/simple-all-list` })
}
// 新增 CRM 商机
export const createBusiness = async (data: BusinessVO) => {
return await request.post({ url: `/crm/business/create`, data })
}
// 修改 CRM 商机
export const updateBusiness = async (data: BusinessVO) => {
return await request.put({ url: `/crm/business/update`, data })
}
// 删除 CRM 商机
export const deleteBusiness = async (id: number) => {
return await request.delete({ url: `/crm/business/delete?id=` + id })
}
// 导出 CRM 商机 Excel
export const exportBusiness = async (params) => {
return await request.download({ url: `/crm/business/export-excel`, params })
}
// 联系人关联商机列表
export const getBusinessPageByContact = async (params) => {
return await request.get({ url: `/crm/business/page-by-contact`, params })
}
// 获得 CRM 商机列表
export const getBusinessListByIds = async (val: number[]) => {
return await request.get({ url: '/crm/business/list-by-ids', params: { ids: val.join(',') } })
}

View File

@ -0,0 +1,48 @@
import request from '@/config/axios'
export interface BusinessStatusTypeVO {
id: number
name: string
deptIds: number[]
status: boolean
}
// 查询商机状态类型列表
export const getBusinessStatusTypePage = async (params) => {
return await request.get({ url: `/crm/business-status-type/page`, params })
}
// 查询商机状态类型详情
export const getBusinessStatusType = async (id: number) => {
return await request.get({ url: `/crm/business-status-type/get?id=` + id })
}
// 新增商机状态类型
export const createBusinessStatusType = async (data: BusinessStatusTypeVO) => {
return await request.post({ url: `/crm/business-status-type/create`, data })
}
// 修改商机状态类型
export const updateBusinessStatusType = async (data: BusinessStatusTypeVO) => {
return await request.put({ url: `/crm/business-status-type/update`, data })
}
// 删除商机状态类型
export const deleteBusinessStatusType = async (id: number) => {
return await request.delete({ url: `/crm/business-status-type/delete?id=` + id })
}
// 导出商机状态类型 Excel
export const exportBusinessStatusType = async (params) => {
return await request.download({ url: `/crm/business-status-type/export-excel`, params })
}
// 获取商机状态类型信息列表
export const getBusinessStatusTypeList = async () => {
return await request.get({ url: `/crm/business-status-type/get-simple-list` })
}
// 根据类型ID获取商机状态信息列表
export const getBusinessStatusListByTypeId = async (typeId: number) => {
return await request.get({ url: `/crm/business-status-type/get-status-list?typeId=` + typeId })
}

46
src/api/crm/clue/index.ts Normal file
View File

@ -0,0 +1,46 @@
import request from '@/config/axios'
export interface ClueVO {
id: number
transformStatus: boolean
followUpStatus: boolean
name: string
customerId: number
contactNextTime: Date
telephone: string
mobile: string
address: string
ownerUserId: number
contactLastTime: Date
remark: string
}
// 查询线索列表
export const getCluePage = async (params) => {
return await request.get({ url: `/crm/clue/page`, params })
}
// 查询线索详情
export const getClue = async (id: number) => {
return await request.get({ url: `/crm/clue/get?id=` + id })
}
// 新增线索
export const createClue = async (data: ClueVO) => {
return await request.post({ url: `/crm/clue/create`, data })
}
// 修改线索
export const updateClue = async (data: ClueVO) => {
return await request.put({ url: `/crm/clue/update`, data })
}
// 删除线索
export const deleteClue = async (id: number) => {
return await request.delete({ url: `/crm/clue/delete?id=` + id })
}
// 导出线索 Excel
export const exportClue = async (params) => {
return await request.download({ url: `/crm/clue/export-excel`, params })
}

View File

@ -0,0 +1,92 @@
import request from '@/config/axios'
export interface ContactVO {
name: string
nextTime: Date
mobile: string
telephone: string
email: string
post: string
customerId: number
detailAddress: string
remark: string
ownerUserId: string
lastTime: Date
id: number
parentId: number
qq: number
wechat: string
sex: number
master: boolean
creatorName: string
updateTime?: Date
createTime?: Date
customerName: string
areaName: string
ownerUserName: string
}
export interface ContactBusinessReqVO {
contactId: number
businessIds: number[]
}
// 查询 CRM 联系人列表
export const getContactPage = async (params) => {
return await request.get({ url: `/crm/contact/page`, params })
}
// 查询 CRM 联系人列表,基于指定客户
export const getContactPageByCustomer = async (params: any) => {
return await request.get({ url: `/crm/contact/page-by-customer`, params })
}
// 查询 CRM 联系人详情
export const getContact = async (id: number) => {
return await request.get({ url: `/crm/contact/get?id=` + id })
}
// 新增 CRM 联系人
export const createContact = async (data: ContactVO) => {
return await request.post({ url: `/crm/contact/create`, data })
}
// 修改 CRM 联系人
export const updateContact = async (data: ContactVO) => {
return await request.put({ url: `/crm/contact/update`, data })
}
// 删除 CRM 联系人
export const deleteContact = async (id: number) => {
return await request.delete({ url: `/crm/contact/delete?id=` + id })
}
// 导出 CRM 联系人 Excel
export const exportContact = async (params) => {
return await request.download({ url: `/crm/contact/export-excel`, params })
}
// 获得 CRM 联系人列表(精简)
export const getSimpleContactList = async () => {
return await request.get({ url: `/crm/contact/simple-all-list` })
}
// 获得 CRM 联系人列表
export const getContactListByIds = async (val: number[]) => {
return await request.get({ url: '/crm/contact/list-by-ids', params: { ids: val.join(',') } })
}
// 批量新增联系人商机关联
export const createContactBusinessList = async (data: ContactBusinessReqVO) => {
return await request.post({ url: `/crm/contact/create-business-list`, data })
}
// 解除联系人商机关联
export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
return await request.delete({ url: `/crm/contact/delete-business-list`, data })
}
// 查询联系人操作日志
export const getOperateLogPage = async (params: any) => {
return await request.get({ url: '/crm/contact/operate-log-page', params })
}

View File

@ -0,0 +1,58 @@
import request from '@/config/axios'
export interface ContractVO {
id: number
name: string
customerId: number
businessId: number
processInstanceId: number
orderDate: Date
ownerUserId: number
no: string
startTime: Date
endTime: Date
price: number
discountPercent: number
productPrice: number
roUserIds: string
rwUserIds: string
contactId: number
signUserId: number
contactLastTime: Date
remark: string
}
// 查询 CRM 合同列表
export const getContractPage = async (params) => {
return await request.get({ url: `/crm/contract/page`, params })
}
// 查询 CRM 联系人列表,基于指定客户
export const getContractPageByCustomer = async (params: any) => {
return await request.get({ url: `/crm/contract/page-by-customer`, params })
}
// 查询 CRM 合同详情
export const getContract = async (id: number) => {
return await request.get({ url: `/crm/contract/get?id=` + id })
}
// 新增 CRM 合同
export const createContract = async (data: ContractVO) => {
return await request.post({ url: `/crm/contract/create`, data })
}
// 修改 CRM 合同
export const updateContract = async (data: ContractVO) => {
return await request.put({ url: `/crm/contract/update`, data })
}
// 删除 CRM 合同
export const deleteContract = async (id: number) => {
return await request.delete({ url: `/crm/contract/delete?id=` + id })
}
// 导出 CRM 合同 Excel
export const exportContract = async (params) => {
return await request.download({ url: `/crm/contract/export-excel`, params })
}

Some files were not shown because too many files have changed in this diff Show More