435 Commits
Author SHA1 Message Date
芋道源码 fa6ec8f07f !338 修复公众号-素材管理 上传时缺少accountId参数
Merge pull request !338 from Evol郑天/N/A
2023-11-30 12:38:24 +00:00
芋道源码 c322959c40 !337 crm联系人review修改
Merge pull request !337 from zyna/master
2023-11-29 05:54:39 +00:00
Evol郑天 fd266516fe 修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-11-29 01:24:42 +00: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
芋道源码 038f3d6ab0 !335 crm联系人review修改
Merge pull request !335 from zyna/master
2023-11-27 12:30:20 +00: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
芋道源码 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
芋道源码 8f97155b43 !328 商城装修
Merge pull request !328 from 疯狂的世界/dev
2023-11-24 14:41:12 +00: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
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
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
芋道源码 4423e9b804 !326 CRM 客户最新的代码
Merge pull request !326 from 芋道源码/dev
2023-11-18 16:30:42 +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
owen f5d611968f Merge remote-tracking branch 'origin/dev' into dev 2023-11-17 21:51:42 +08: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
xingyu 8a74b954d0 docs: update deps 2023-11-14 21:53:30 +08:00
xingyu e56afbf80f chore: update deps 2023-11-14 21:49:49 +08:00
puhui999 8e0cf5c1e5 crm-团队成员:新增获得权限级别名称函数 getLevelName 2023-11-14 12:06:42 +08:00
puhui999 ba702d03bc Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-11-14 11:26:41 +08:00
puhui999 015a1640c1 crm-团队成员:完善团队成员通用组件封装 2023-11-14 11:26:07 +08:00
YunaiV 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
puhui999 27c9a0f32d crm-团队成员: 先提交一波 2023-11-13 17:49:27 +08:00
puhui999 2385cd9b9a fix:如果已经到重新登录页面则不进行弹窗提示 2023-11-13 15:48:21 +08:00
YunaiV 999d8de9e9 代码生成:增加主子表(内嵌)的示例 2023-11-13 13:57:15 +08:00
YunaiV f0f7886025 代码生成:增加主子表(普通)的示例 2023-11-12 22:33:38 +08:00
YunaiV 72c5eaae31 代码生成:增加 one 情况下的示例代码 2023-11-12 19:50:38 +08:00
owen 49ebadd748 营销:适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
Wanwan 702f23e672 feat: CRM 客户限制 2023-11-12 14:34:25 +08:00
zyna ed26142bb0 crm联系人init 2023-11-11 23:35:18 +08:00
Wanwan a7f86dfd8b feat: CRM 客户限制 2023-11-11 21:06:11 +08:00
Wanwan 6369b334e3 feat: CRM 客户限制 2023-11-11 20:50:33 +08:00
YunaiV 55f6e4ca25 主子表:确认列表编辑的支持组件情况 2023-11-10 23:01:36 +08:00
Wanwan b63e2a9efb Merge remote-tracking branch 'origin/dev' into dev 2023-11-10 22:47:34 +08:00
YunaiV 9f9e0f8bda 主子表:同步三种模式的代码 2023-11-10 19:54:55 +08:00
niou233 af5d1cf25e update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:36:11 +00:00
niou233 1ab5b44254 update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:35:54 +00:00
niou233 2ff97758fd update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:34:32 +00:00
YunaiV 86d9a97ccb 主子表:暂时存储,参数校验-表单数据跑通 2023-11-10 08:51:01 +08:00
YunaiV d45ebd4fcf 主子表:暂时存储,样式跑通 2023-11-10 00:20:00 +08:00
YunaiV 4e413a10e6 主子表:暂时存储,准备重构 2023-11-09 23:10:54 +08:00
owen 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
YunaiV e9299c6710 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-09 09:20:21 +08:00
YunaiV a08e9bea7c 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-09 09:20:21 +08:00
owen 82aed175ab 营销:适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +08:00
Wanwan 59b2d89a18 feat: CRM 客户公海配置 2023-11-09 00:08:09 +08:00
Wanwan 288aa72cdd feat: CRM 客户公海配置 2023-11-09 00:05:10 +08:00
owen ac42493659 营销:适配商城装修组件【宫格导航】 2023-11-08 22:22:35 +08:00
owen 325e2e4ff2 营销:适配商城装修组件【列表导航】 2023-11-08 21:10:05 +08:00
niou233 084009f7f2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-08 17:30:04 +08:00
niou233 f2c71d5836 refactor: 会员商品收藏 2023-11-08 17:29:57 +08:00
Wanwan 57474c0644 Merge remote-tracking branch 'origin/dev' into dev 2023-11-07 22:54:50 +08:00
Wanwan 7146fdc9b9 style: 客户 review 修改 2023-11-06 22:00:40 +08:00
YunaiV eb9f8c9f6f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-06 21:43:55 +08:00
YunaiV 85ee558bef 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-06 19:42:28 +08:00
YunaiV 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
owen 4253173a2a 营销:适配商城装修组件【轮播图】 2023-11-06 09:31:42 +08:00
owen 6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 08:33:16 +08:00
owen bb2b7ffd03 营销:增加商城装修组件【视频播放】 2023-11-05 22:53:30 +08:00
VicoHu 3f803767c4 fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
2023-11-05 13:59:28 +00:00
YunaiV 47bb88d892 code review:产品分类 2023-11-05 20:50:13 +08:00
YunaiV e1cff74f41 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:48:12 +08:00
owen 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
YunaiV 17742988c9 code review:回款 2023-11-05 20:25:52 +08:00
YunaiV 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
owen 434aa864da 营销:优化装修编辑器 2023-11-05 12:40:32 +08:00
owen 0b0ba1f313 营销:优化装修编辑器样式 2023-11-05 10:08:03 +08:00
owen 984351fbf0 修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致 2023-11-05 09:47:54 +08:00
owen aedf014407 营销:装修页面适配搜索框 2023-11-04 22:06:40 +08:00
YunaiV 4f2f4f72b5 优化:社交登录、用户的管理 2023-11-04 20:43:36 +08:00
ZanGe丶 ff6f05df84 【crm:产品及产品分类】 2023-11-04 18:28:59 +08:00
YunaiV a9b91e7436 优化:社交登录、用户的管理 2023-11-04 14:37:23 +08:00
YunaiV 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
YunaiV 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
YunaiV 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
Wanwan 23f483ac45 feat: 客户详情 + review 修改 2023-11-04 03:21:01 +08:00
liuhongfeng 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
YunaiV de62a7a5b7 bugfix:注释掉 uno 的 transformerVariantGroup,解决 vite 监控到 css 变化,导致 Login.vue 登录时的重加载问题 2023-11-03 18:44:56 +08:00
jason fcc748dc63 Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 08:47:57 +08:00
jason 753f5de81e 转账 - 新增转账订单查询 2023-11-03 08:46:53 +08:00
owen 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
liuhongfeng 3d54ad3a6a 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-31 23:32:35 +08:00
owen 9bd33355e2 营销:装修编辑器样式优化 2023-10-31 17:17:46 +08:00
dongshanshan 18e2c33cef Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-31 16:53:48 +08:00
dongshanshan 9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
owen 881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
xingyu 10483577b7 fix: types 2023-10-31 14:26:17 +08:00
xingyu 52755b38a9 fix: props 2023-10-31 14:25:49 +08:00
xingyu 13f31c19f5 chore: words warn 2023-10-31 14:25:41 +08:00
xingyu 4365ca6177 fix: title name 2023-10-31 14:10:05 +08:00
xingyu ce93c8d4e9 fix: name warn 2023-10-31 14:04:43 +08:00
xingyu 7321ff2136 chore: wh-full 2023-10-31 10:20:39 +08:00
xingyu af7c6f3b2c fix: url error 2023-10-31 10:17:00 +08:00
xingyu 80e72fd924 feat: coding 2023-10-31 10:13:22 +08:00
xingyu 2a029ba35b feat: add useTagsView hooks 2023-10-31 10:12:04 +08:00
xingyu 57e8256e9a feat: add useNow hooks 2023-10-31 10:11:55 +08:00
xingyu bdcef303ff perf: useValidator hooks 2023-10-31 10:11:43 +08:00
xingyu f8fdebffe6 feat: add useNetwork hooks 2023-10-31 10:11:34 +08:00
xingyu 4ba264e00d perf: use driver.js 2023-10-31 10:07:21 +08:00
xingyu f26a4cae10 feat: unocss add shortcuts 2023-10-31 10:04:31 +08:00
xingyu 899880bfe1 chore: update deps 2023-10-31 09:52:08 +08:00
liuhongfeng 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
jason c1534bf168 Merge remote-tracking branch 'origin/dev' into dev 2023-10-29 23:48:20 +08:00
jason 55a961e862 转账 - 管理后台新增转账示例 2023-10-29 23:48:10 +08:00
YunaiV 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
owen e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
YunaiV dc5cf9f24c code review:客户表的实现 2023-10-29 17:55:39 +08:00
YunaiV 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
Wanwan 60d53126c4 feat: 调整客户表的字段 2023-10-29 00:33:38 +08:00
Wanwan 59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
Wanwan 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
YunaiV 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
puhui999 a624db04e9 三方应用新增授权方的网页应用 agentId 属性 2023-10-26 17:00:13 +08:00
puhui999 88a22d90e5 解决钉钉绑定失败的问题 2023-10-26 16:19:22 +08:00
puhui999 6ee2492ff1 新增社交用户 RUD 2023-10-25 17:02:11 +08:00
puhui999 8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
puhui999 d060d27ab2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-25 11:14:26 +08:00
puhui999 ca385bc08e 解决列数据中的 table#header 数据不刷新的问题 2023-10-25 11:14:00 +08:00
xingyu 309c3f30d1 chore: remove vue-macros/volar 2023-10-25 10:43:03 +08:00
xingyu 238537df83 fix: ElLoading need import 2023-10-25 10:36:06 +08:00
xingyu bf2c59c6e0 chore: stylelint config 2023-10-25 10:35:30 +08:00
xingyu 50f1ae9524 chore: eslint config 2023-10-25 10:35:20 +08:00
xingyu 96db6ab538 chore: vscode setting 2023-10-25 10:35:10 +08:00
xingyu b8403c1b90 chore: update vue v3.3.7 2023-10-25 10:34:54 +08:00
Wanwan 044754cdb4 feat: 客户表的 crud 2023-10-25 00:24:20 +08:00
YunaiV ef334dfc66 1.8.3 版本发布 2023-10-24 21:07:51 +08:00
YunaiV 539352f598 修复 banner 返回字段不对 2023-10-24 20:29:23 +08:00
YunaiV 6644a4d4a6 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-24 20:12:39 +08:00
YunaiV 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
puhui999 95d7d1eb42 优惠卷模版样式调整 2023-10-24 17:39:02 +08:00
puhui999 75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
puhui999 a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
KONGDY-PC\Kongdy 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
YunaiV 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
YunaiV 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
YunaiV 423ea319e0 code review:限时折扣 2023-10-21 18:18:40 +08:00
kehaiyou 5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 2023-10-21 18:16:39 +08:00
jason 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
puhui999 491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
913752709@qq.com fb90a85e43 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:32 +08:00
liuhongfeng 26780c3525 【新增】回款计划 功能 2023-10-20 23:48:39 +08:00
liuhongfeng 7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
puhui999 0730e215d8 完善文章管理 review 提到的问题 2023-10-20 22:16:18 +08:00
puhui999 2a150cf0c0 修复合并差异 2023-10-20 21:42:50 +08:00
zhangshuai 9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
puhui999 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
puhui999 1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
puhui999 01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
puhui999 18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
YunaiV 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
1351515658@qq.com 3074adb1df fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 2023-10-19 18:43:02 +08:00
puhui999 3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
puhui999 5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
puhui999 094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
puhui999 70778fd9e6 UserOrderList 重构完善 2023-10-19 10:54:10 +08:00
puhui999 5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00
913752709@qq.com 7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
puhui999 04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
puhui999 d1a3fe5d5a 营销文章:新增表单属性移除浏览量 2023-10-18 11:33:42 +08:00
owen ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen 431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
owen 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
YunaiV 8832eafaae code review:crm 合同流程 2023-10-17 22:52:24 +08:00
1163996518@qq.com 533b4e5006 支付渠道配置--修复权限 2023-10-17 21:27:13 +08:00
1163996518@qq.com 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
YunaiV c27685285a code review:修复工作流的审批界面报错问题 2023-10-17 19:50:09 +08:00
YunaiV 63fd52828c Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 19:03:02 +08:00
YunaiV 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
owen 57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00
owen 6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
dhb52 dced551698 feat: CRM/合同 crud 2023-10-16 23:56:34 +08:00
jason c3f06f5fbe 钱包 - 钱包余额流水 2023-10-16 22:45:32 +08:00
jason 8626bccc4c 钱包 - 钱包余额流水 2023-10-16 22:32:10 +08:00
jason ae2c3f2ad5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 22:27:39 +08:00
owen e3a0cfe5e9 统计:修复错误 2023-10-16 22:18:51 +08:00
owen 6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
YunaiV 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
xingyu 8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
xingyu 5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
xingyu 1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
xingyu 42c8db4f34 chore: update deps 2023-10-16 15:03:55 +08:00
owen edfd03903f 统计:会员终端统计,处理未知终端情况 2023-10-16 14:26:04 +08:00
owen 2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
owen 661e72bcfd 统计:修复错误 2023-10-16 13:15:17 +08:00
owen 8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
xingyu a2ded16718 docs: element plus 2.4.0 2023-10-16 10:25:24 +08:00
xingyu de3fa7a765 chore: update deps 2023-10-16 10:24:35 +08:00
YunaiV 99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
owen 195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
owen 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
YunaiV 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
jason 90d6f4da9f 钱包- 钱包余额查询 2023-10-15 17:47:36 +08:00
puhui999 50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-15 16:14:32 +08:00
puhui999 befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
dhb52 89417ac393 fix: 删除SSOLogin.vue组建,解决登录界面不停重定向问题 2023-10-15 14:58:13 +08:00
dhb52 3587d1ef97 fix: 路由缺少name字段,ts不高兴 2023-10-15 14:29:16 +08:00
dhb52 4d77d7e136 feat: 社交平台登录 2023-10-15 14:26:20 +08:00
puhui999 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
jason 8b6ca3028a Merge remote-tracking branch 'origin/dev' into dev 2023-10-14 11:33:15 +08:00
jason f9d0c1aa1c 钱包-充值套餐 2023-10-14 11:32:54 +08:00
YunaiV 529a821cdb Merge remote-tracking branch 'origin/master' 2023-10-13 18:44:27 +08:00
YunaiV 470fb23ae1 同步最新 README.md 功能列表 2023-10-13 18:35:44 +08:00
xingyu 9b09304c50 docs: update deps 2023-10-13 10:41:10 +08:00
xingyu e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00
xingyu 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
YunaiV 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
puhui999 b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:55:53 +08:00
puhui999 3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
youkehai 62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
owen ad4607db09 Merge remote-tracking branch 'owen/dev' into dev 2023-10-09 23:29:36 +08:00
owen 6b7040404e 统计:会员统计 2023-10-09 23:27:32 +08:00
owen d4a521eff1 统计:交易统计Review修改 2023-10-09 23:27:32 +08:00
owen 22adab8590 统计:会员统计 2023-10-09 23:27:09 +08:00
kehaiyou 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
YunaiV 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
puhui999 5b4983a3e9 拼团记录:优化页面布局,添加日期快捷选项 2023-10-07 11:10:26 +08:00
puhui999 8c347e5990 拼团活动:表单添加虚拟成团控制按钮 2023-10-07 10:04:05 +08:00
puhui999 e86dfa30fd Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-06 22:21:10 +08:00
puhui999 c445173855 拼团记录:接口对接 2023-10-06 22:20:40 +08:00
YunaiV 24fc36e23a promotion:调整拼团活动的界面 2023-10-06 21:03:17 +08:00
puhui999 eee3d0fef5 拼团记录: 完成 UI 部分 2023-10-06 18:40:21 +08:00
owen c8a476ac7c Merge remote-tracking branch 'origin/dev' into dev 2023-10-06 14:17:13 +08:00
owen 2a58b04a98 统计:交易统计Review修改 2023-10-06 14:15:58 +08:00
YunaiV 78062dd474 promotion:调整拼团活动的界面 2023-10-06 10:58:31 +08:00
puhui999 869bac2501 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-05 21:50:33 +08:00
YunaiV cf7ac2cb10 promotion:新增记录记录列表 2023-10-05 12:42:00 +08:00
YunaiV 860872a890 promotion:新增砍价记录列表 2023-10-05 12:06:57 +08:00
YunaiV 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
owen 58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
YunaiV 7c491ff62a promotion:优化秒杀活动的界面 2023-10-03 18:41:57 +08:00
YunaiV 40f44fc78e promotion:优化优惠劵的界面 2023-10-03 13:01:31 +08:00
YunaiV 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
owen 6515e218e2 Merge branch 'dev' into dev_local 2023-10-02 23:58:41 +08:00
owen a06a63c1be Merge remote-tracking branch 'origin/dev' into dev 2023-10-02 23:52:23 +08:00
YunaiV ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 2023-10-02 21:18:31 +08:00
YunaiV a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
YunaiV bb08f6f54f trade:完善退款详情 2023-10-02 15:44:26 +08:00
owen df8a3941c1 对齐面包屑的图标和文字 2023-10-02 11:11:07 +08:00
owen 4c077711a1 对齐面包屑的图标和文字 2023-10-02 11:03:46 +08:00
YunaiV 4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
YunaiV 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
YunaiV 17c31978f7 product:优化商品评论 2023-10-01 21:23:50 +08:00
YunaiV 8b7543acd5 product:优化属性列表 2023-10-01 21:11:47 +08:00
YunaiV 5f80d1611c product:优化分类列表 2023-10-01 20:55:51 +08:00
YunaiV 88677ee121 product:优化商品发布页 2023-10-01 20:16:02 +08:00
YunaiV 3a9668d632 product:优化商品列表的样式、实现代码 2023-10-01 19:44:13 +08:00
owen 3a96812d47 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:20 +08:00
owen 3ab1ed707f 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen 0066d79876 签到:签到后增加用户积分、经验 2023-10-01 09:53:52 +08:00
owen 6508d841f5 Merge remote-tracking branch 'origin/dev' into dev 2023-09-30 22:08:45 +08:00
owen 4b7e57e67d 会员详情,修改会员积分 2023-09-30 15:50:12 +08:00
owen 940a102546 会员:会员详情-推广用户列表 2023-09-30 14:10:15 +08:00
owen b48f19c646 会员:会员详情-优惠券列表 2023-09-30 13:55:42 +08:00
owen 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
owen 6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
owen c322fb3d0d 统计:交易统计 2023-09-29 21:08:14 +08:00
owen 150c77cff0 fix eslint problems 2023-09-29 16:25:38 +08:00
YunaiV fb94ae9674 trade:退款理由的维护 2023-09-29 13:35:52 +08:00
kehaiyou a438353308 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:38:53 +08:00
kehaiyou b1469669e2 Merge branch 'feature/bpm-delegate'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:37:32 +08:00
YunaiV 04e02ffbd2 trade:分佣界面的微调 2023-09-28 16:38:51 +08:00
YunaiV 74de8e9687 trade:优化交易配置的参数校验 2023-09-28 15:29:15 +08:00
YunaiV 2f82eff526 Merge remote-tracking branch 'origin/dev' into dev 2023-09-27 23:30:48 +08:00
YunaiV 888c1371c6 Merge remote-tracking branch 'origin/master' 2023-09-27 23:30:16 +08:00
YunaiV 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
shizhong 361e4fadda 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:25:33 +08:00
youkehai 0fba0d9a6a feat: 对齐后端-工作流委派的参数 2023-09-25 11:31:13 +08:00
youkehai 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
YunaiV 99a0c7c3e7 1.8.2 版本发布 2023-09-24 23:45:10 +08:00
owen a5dd7f4a81 分销:修正分享海报 2023-09-24 23:18:50 +08:00
YunaiV 245147223f code review:驳回逻辑 2023-09-24 23:05:33 +08:00
芋道源码 ada93a160b !251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
2023-09-24 14:45:54 +00:00
owen 2c22ef8ef1 分销:重命名提现类型字段 2023-09-24 22:32:10 +08:00
kehaiyou f40d1de62a fix: 【工作流】--回退的高亮和api地址更换 2023-09-24 19:42:53 +08:00
kehaiyou 20fe343646 feat: 【工作流】--委派 2023-09-24 15:44:02 +08:00
芋道源码 0ffd07447b !248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
2023-09-24 07:18:26 +00:00
芋道源码 795847586a !249 合并最新商城代码
Merge pull request !249 from 芋道源码/dev
2023-09-24 04:11:34 +00:00
YunaiV ce78336fca Merge remote-tracking branch 'origin/dev' into dev 2023-09-24 12:10:14 +08:00
YunaiV 539f8a5bb5 修复 member 详情无法展示的问题 2023-09-24 12:10:03 +08:00
YunaiV e489627748 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
2023-09-24 12:00:10 +08:00
芋道源码 be589cfb99 !247 Trade: 完善配置
Merge pull request !247 from 疯狂的世界/brokerage
2023-09-24 01:55:48 +00:00
kehaiyou de79e79d91 feat: 支持回退按钮 2023-09-23 14:52:40 +08:00
owen 21c67b1b75 Trade: 完善配置 2023-09-22 22:51:45 +08:00
xingyu 2a58e3f691 style: unocss eslint 2023-09-22 17:49:11 +08:00
xingyu 57a7ed46e7 chore: add unocss eslint 2023-09-22 17:48:56 +08:00
xingyu 436cc8069c docs: update deps 2023-09-22 17:43:45 +08:00
xingyu ce5f303272 chore: update deps 2023-09-22 17:42:31 +08:00
puhui999 dd5a1f2d43 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-20 16:39:19 +08:00
芋道源码 df6a384321 !244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
2023-09-19 17:12:27 +00:00
芋道源码 f63d518d0d !243 订单详情页面 请求详情接口改为真实携带的id
Merge pull request !243 from 风狗/dev
2023-09-19 17:11:34 +00:00
owen 854acf6e70 trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
owen 18b6c70d1a trade: 分销业务review代码修改 2023-09-19 16:37:50 +08:00
绮梦 245301452c 订单详情页面 请求详情接口改为真实携带的id 2023-09-19 13:57:26 +08:00
YunaiV 1be57ea8d3 增加 404 的说明 2023-09-16 15:14:41 +08:00
xingyu a6b4908f45 !232 update src/components/Dialog/src/Dialog.vue.
Merge pull request !232 from AKING/N/A
2023-09-13 11:38:07 +00:00
puhui999 8778f5746f spu:分佣属性和分佣保持一致 2023-09-13 10:17:14 +08:00
芋道源码 de615c2387 !241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
2023-09-12 15:19:33 +00:00
YunaiV 8b65a2866e code review:订单相关的逻辑 2023-09-12 23:14:53 +08:00
芋道源码 ef15261926 !240 完善前端 mall-order 模块相关问题
Merge pull request !240 from puhui999/dev-to-dev
2023-09-12 15:08:34 +00:00
xingyu 4ae1722e72 fix: stylelint 2023-09-11 17:08:57 +08:00
xingyu 2035484a83 chore: vscode setting 2023-09-11 17:08:48 +08:00
xingyu 5494756a66 fix: eslint 2023-09-11 17:08:39 +08:00
xingyu 56a71f64e7 fix: #I7WY9N 2023-09-11 16:55:49 +08:00
xingyu 9a6d29b295 fix: avatar 2023-09-11 16:54:34 +08:00
xingyu 1fe950aea5 chore: 1.8.1-snapshot 2023-09-11 16:47:19 +08:00
xingyu 8f0c6625de docs: update version 2023-09-11 16:23:31 +08:00
xingyu 4664014fc4 chore: update deps 2023-09-11 16:22:11 +08:00
xingyu 4c5d0392d7 chore: vscode setting 2023-09-11 16:22:05 +08:00
owen 2e830d14d5 trade: 分销业务review代码修改 2023-09-11 00:54:11 +08:00
owen 0582d41972 trade: 分销业务后台功能:推广订单列表 2023-09-10 23:30:43 +08:00
owen 2aa372d8f4 trade: 分销业务后台功能:推广用户列表 2023-09-10 22:32:38 +08:00
puhui999 5dc0c6e3da spu:分佣属性和分佣保持一致 2023-09-09 23:14:02 +08:00
puhui999 615763d415 order:完善订单聚合搜索 2023-09-09 23:08:28 +08:00
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 2023-09-09 20:51:33 +08:00
owen 87ca916e69 trade: 分销业务后台功能:佣金格式化 2023-09-09 20:00:56 +08:00
owen 5ed909263a trade: 分销业务后台功能:修改上级推广人 2023-09-09 19:20:12 +08:00
owen 7ea3571356 trade: 分销业务后台功能:清除推广员、修改推广资格 2023-09-09 14:40:06 +08:00
puhui999 a79f1452b3 登录界面:姐姐点击登录后界面疯狂闪动的问题 2023-09-09 14:27:48 +08:00
YunaiV 0e2ea39591 code review:会员详情 2023-09-09 10:06:32 +08:00
YunaiV 30f0c1b351 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/utils/dict.ts
2023-09-09 09:50:13 +08:00
芋道源码 944565a241 !236 update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
Merge pull request !236 from 岁月不经谈/N/A
2023-09-09 01:47:40 +00:00
芋道源码 e3b9a15c26 !239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
2023-09-09 01:46:05 +00:00
YunaiV 3c315cf287 code review:完善订单详情和售后退款 TODO 提到的问题 2023-09-09 01:44:08 +08:00
芋道源码 dbfabcbbb5 !238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
2023-09-08 17:29:05 +00:00
owen dbb87e3850 trade: 分销员表格佣金字段格式化 2023-09-08 23:58:45 +08:00
芋道源码 1719debd11 !237 分销业务从 member 模块 转移到 trade模块
Merge pull request !237 from 疯狂的世界/brokerage
2023-09-08 15:18:32 +00:00
owen e9d5027e72 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen 7263315412 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:04 +08:00
owen 34ce7f7ec5 trade: 分销用户管理 2023-09-08 11:05:31 +08:00
puhui999 b3639977a7 完善订单详情 2023-09-08 01:01:50 +08:00
puhui999 f44688d61c Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-08 01:00:59 +08:00
puhui999 73628d3930 完善订单详情和售后退款 TODO 提到的问题 2023-09-06 11:23:16 +08:00
owen 1e2120806d trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:41:20 +08:00
owen 2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:33:59 +08:00
owen 35664d1f32 trade: 增加交易中心配置表 2023-09-05 22:31:35 +08:00
岁月不经谈 a1ce9eda2a update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
部门树节点过滤不生效

Signed-off-by: 岁月不经谈 <473831241@qq.com>
2023-09-05 10:14:42 +00:00
绮梦 2318f176a6 新增用户详情下订单页面 2023-09-05 10:15:12 +08:00
芋道源码 d8ca08a348 !235 会员:佣金记录、配置
Merge pull request !235 from 疯狂的世界/brokerage
2023-09-05 01:58:33 +00:00
绮梦 fe6cf7ce98 新增用户详情下成长值页面。 2023-09-04 15:02:41 +08:00
AKING d74f96fe17 update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
2023-09-04 03:31:35 +00:00
owen 73f8cef3b4 member: 佣金记录 2023-09-03 23:04:20 +08:00
owen 5a9764c08c member: 分销配置 2023-09-03 21:14:44 +08:00
puhui999 46fd154e3a 完善订单详情和售后退款日志展示样式重构 2023-09-03 01:44:22 +08:00
504 changed files with 31593 additions and 2609 deletions

No files matched your search

+2 -2
View File
@@ -4,10 +4,10 @@ NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
VITE_BASE_URL='http://127.0.0.1:48080'
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
VITE_UPLOAD_URL='http://127.0.0.1:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
+6 -4
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,12 +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',
@@ -53,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',
{
@@ -66,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 插件
}
})
Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

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

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

+31 -54
View File
@@ -1,7 +1,5 @@
{
"typescript.tsdk": "./node_modules/typescript/lib",
"volar.tsPlugin": true,
"volar.tsPluginStatus": false,
"typescript.tsdk": "node_modules/typescript/lib",
"npm.packageManager": "pnpm",
"editor.tabSize": 2,
"prettier.printWidth": 100, // 超过最大值换行
@@ -88,71 +86,49 @@
"source.fixAll.eslint": true
},
"[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",
"i18n-ally.enabledFrameworks": ["vue", "react"],
"cSpell.words": [
"xingyu",
"yudao",
"unocss",
"brotli",
"browserslist",
"codemirror",
"commitlint",
"cropperjs",
"echart",
"echarts",
"esnext",
"unplugin",
"esno",
"iconify",
"INTLIFY",
"lintstagedrc",
"logicflow",
"nprogress",
"pinia",
"pnpm",
"qrcode",
"sider",
"pinia",
"sider",
"nprogress",
"INTLIFY",
"stylelint",
"esno",
"vitejs",
"sortablejs",
"codemirror",
"iconify",
"commitlint",
"stylelint",
"svgs",
"unocss",
"unplugin",
"unref",
"videojs",
"echarts",
"wangeditor",
"cropperjs",
"logicflow",
"VITE",
"vitejs",
"vueuse",
"zxcvbn",
"lintstagedrc",
"brotli",
"sider",
"pnpm"
],
"vetur.format.scriptInitialIndent": true,
"vetur.format.styleInitialIndent": true,
"vetur.validation.script": false,
"MicroPython.executeButton": [
{
"text": "▶",
"tooltip": "运行",
"alignment": "left",
"command": "extension.executeFile",
"priority": 3.5
}
],
"MicroPython.syncButton": [
{
"text": "$(sync)",
"tooltip": "同步",
"alignment": "left",
"command": "extension.execute",
"priority": 4
}
"wangeditor",
"xingyu",
"yudao",
"zxcvbn"
],
// 控制相关文件嵌套展示
"explorer.fileNesting.enabled": true,
@@ -161,7 +137,8 @@
"*.ts": "$(capture).test.ts, $(capture).test.tsx",
"*.tsx": "$(capture).test.ts, $(capture).test.tsx",
"*.env": "$(capture).env.*",
"package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
"package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
},
"terminal.integrated.scrollback": 10000
"terminal.integrated.scrollback": 10000,
"nuxt.isNuxtApp": false
}
+61 -50
View File
@@ -9,7 +9,7 @@
## 🐶 新手必读
* nodejs > 16.0.0 && pnpm > 8.6.0 (强制使用pnpm)
* nodejs > 16.18.0 && pnpm > 8.6.0 (强制使用pnpm)
* 演示地址【Vue3 + element-plus】:<http://dashboard-vue3.yudao.iocoder.cn>
* 演示地址【Vue3 + vben(ant-design-vue)】:<http://dashboard-vben.yudao.iocoder.cn>
* 演示地址【Vue2 + element-ui】:<http://dashboard.yudao.iocoder.cn>
@@ -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.12 |
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.1.6 |
| [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.2.2 |
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.4 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.55.3 |
| [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.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.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) |
+1 -8
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,
+59 -58
View File
@@ -1,6 +1,6 @@
{
"name": "yudao-ui-admin-vue3",
"version": "1.8.0-snapshot",
"version": "1.8.3-snapshot",
"description": "基于vue3、vite4、element-plus、typesScript",
"author": "xingyu",
"private": false,
@@ -22,102 +22,103 @@
"clean:cache": "npx rimraf node_modules/.cache",
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
"lint:format": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
"lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:style": "stylelint --fix \"./src/**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:lint-staged": "lint-staged -c "
},
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@form-create/designer": "^3.1.0",
"@form-create/element-ui": "^3.1.17",
"@form-create/designer": "^3.1.3",
"@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.3",
"@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.0",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.9",
"diagram-js": "^12.3.0",
"cropperjs": "^1.6.1",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.10",
"diagram-js": "^12.8.0",
"driver.js": "^1.3.1",
"echarts": "^5.4.3",
"echarts-wordcloud": "^2.1.0",
"element-plus": "2.3.12",
"fast-xml-parser": "^4.2.7",
"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",
"sortablejs": "^1.15.0",
"steady-xml": "^0.1.0",
"url": "^0.11.1",
"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.2.2",
"vue-router": "^4.2.4",
"vue-i18n": "^9.6.5",
"vue-router": "^4.2.5",
"vue-types": "^5.1.1",
"vuedraggable": "^4.1.0",
"web-storage-cache": "^1.1.1",
"xml-js": "^1.6.11"
},
"devDependencies": {
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@iconify/json": "^2.2.107",
"@intlify/unplugin-vue-i18n": "^0.12.3",
"@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.8",
"@types/node": "^20.5.0",
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.5.1",
"@types/qs": "^6.9.7",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"@unocss/transformer-variant-group": "^0.55.3",
"@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",
"@types/sortablejs": "^1.15.5",
"@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.3",
"@vitejs/plugin-vue": "^4.4.1",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vue-macros/volar": "^0.14.2",
"autoprefixer": "^10.4.15",
"bpmn-js": "^8.9.0",
"bpmn-js-properties-panel": "^0.46.0",
"autoprefixer": "^10.4.16",
"bpmn-js": "8.9.0",
"bpmn-js-properties-panel": "0.46.0",
"consola": "^3.2.3",
"eslint": "^8.48.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.28",
"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.7",
"prettier": "^3.0.2",
"rimraf": "^5.0.1",
"rollup": "^3.28.1",
"sass": "^1.66.1",
"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.19.2",
"typescript": "5.1.6",
"unocss": "^0.55.3",
"unplugin-auto-import": "^0.16.6",
"terser": "^5.24.0",
"typescript": "5.2.2",
"unocss": "^0.57.4",
"unplugin-auto-import": "^0.16.7",
"unplugin-element-plus": "^0.8.0",
"unplugin-vue-components": "^0.25.1",
"vite": "4.4.9",
"unplugin-vue-components": "^0.25.2",
"vite": "4.5.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-ejs": "^1.6.4",
"vite-plugin-eslint": "^1.8.1",
@@ -125,8 +126,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.8"
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.22"
},
"license": "MIT",
"repository": {
+38
View File
@@ -41,3 +41,41 @@ export const getTaskListByProcessInstanceId = async (processInstanceId) => {
export const exportTask = async (params) => {
return await request.download({ url: '/bpm/task/export', params })
}
// 获取所有可回退的节点
export const getReturnList = async (params) => {
return await request.get({ url: '/bpm/task/get-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 })
}
+46
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 })
}
+67
View File
@@ -0,0 +1,67 @@
/*
* @Author: zyna
* @Date: 2023-11-05 13:34:41
* @LastEditTime: 2023-11-26 20:47:04
* @FilePath: \yudao-ui-admin-vue3\src\api\crm\contact\index.ts
* @Description:
*/
import request from '@/config/axios'
export interface ContactVO {
name: string
nextTime: Date
mobile: string
telephone: string
email: string
post: string
customerId: number
address: 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
}
// 查询crm联系人列表
export const getContactPage = async (params) => {
return await request.get({ url: `/crm/contact/page`, 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 })
}
export const simpleAllList = async () => {
return await request.get({ url: `/crm/contact/simple-all-list` })
}
+53
View File
@@ -0,0 +1,53 @@
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
}
// 查询合同列表
export const getContractPage = async (params) => {
return await request.get({ url: `/crm/contract/page`, params })
}
// 查询合同详情
export const getContract = async (id: number) => {
return await request.get({ url: `/crm/contract/get?id=` + id })
}
// 新增合同
export const createContract = async (data: ContractVO) => {
return await request.post({ url: `/crm/contract/create`, data })
}
// 修改合同
export const updateContract = async (data: ContractVO) => {
return await request.put({ url: `/crm/contract/update`, data })
}
// 删除合同
export const deleteContract = async (id: number) => {
return await request.delete({ url: `/crm/contract/delete?id=` + id })
}
// 导出合同 Excel
export const exportContract = async (params) => {
return await request.download({ url: `/crm/contract/export-excel`, params })
}
+68
View File
@@ -0,0 +1,68 @@
import request from '@/config/axios'
export interface CustomerVO {
id?: number
name: string
industryId: number
level: number
source: number
followUpStatus?: boolean
lockStatus?: boolean
dealStatus?: boolean
mobile: string
telephone: string
website: string
qq: string
wechat: string
email: string
description: string
remark: string
ownerUserId?: number
ownerUserName?: string
ownerUserDept?: string
roUserIds?: string
rwUserIds?: string
areaId?: number
areaName?: string
detailAddress: string
contactLastTime?: Date
contactNextTime: Date
createTime?: Date
updateTime?: Date
creator?: string
creatorName?: string
}
// 查询客户列表
export const getCustomerPage = async (params) => {
return await request.get({ url: `/crm/customer/page`, params })
}
// 查询客户详情
export const getCustomer = async (id: number) => {
return await request.get({ url: `/crm/customer/get?id=` + id })
}
// 新增客户
export const createCustomer = async (data: CustomerVO) => {
return await request.post({ url: `/crm/customer/create`, data })
}
// 修改客户
export const updateCustomer = async (data: CustomerVO) => {
return await request.put({ url: `/crm/customer/update`, data })
}
// 删除客户
export const deleteCustomer = async (id: number) => {
return await request.delete({ url: `/crm/customer/delete?id=` + id })
}
// 导出客户 Excel
export const exportCustomer = async (params) => {
return await request.download({ url: `/crm/customer/export-excel`, params })
}
//客户列表
export const queryAllList = async () => {
return await request.get({ url: `/crm/customer/query-all-list` })
}
+35
View File
@@ -0,0 +1,35 @@
import request from '@/config/axios'
export interface CustomerLimitConfigVO {
id?: number
type?: number
userIds?: string
deptIds?: string
maxCount?: number
dealCountEnabled?: boolean
}
// 查询客户限制配置列表
export const getCustomerLimitConfigPage = async (params) => {
return await request.get({ url: `/crm/customer-limit-config/page`, params })
}
// 查询客户限制配置详情
export const getCustomerLimitConfig = async (id: number) => {
return await request.get({ url: `/crm/customer-limit-config/get?id=` + id })
}
// 新增客户限制配置
export const createCustomerLimitConfig = async (data: CustomerLimitConfigVO) => {
return await request.post({ url: `/crm/customer-limit-config/create`, data })
}
// 修改客户限制配置
export const updateCustomerLimitConfig = async (data: CustomerLimitConfigVO) => {
return await request.put({ url: `/crm/customer-limit-config/update`, data })
}
// 删除客户限制配置
export const deleteCustomerLimitConfig = async (id: number) => {
return await request.delete({ url: `/crm/customer-limit-config/delete?id=` + id })
}
+19
View File
@@ -0,0 +1,19 @@
import request from '@/config/axios'
export interface CustomerPoolConfigVO {
enabled?: boolean
contactExpireDays?: number
dealExpireDays?: number
notifyEnabled?: boolean
notifyDays: number
}
// 获取客户公海规则设置
export const getCustomerPoolConfig = async () => {
return await request.get({ url: `/crm/customer-pool-config/get` })
}
// 更新客户公海规则设置
export const updateCustomerPoolConfig = async (data: ConfigVO) => {
return await request.put({ url: `/crm/customer-pool-config/update`, data })
}
+48
View File
@@ -0,0 +1,48 @@
import request from '@/config/axios'
export interface PermissionVO {
id?: number // 数据权限编号
userId: number | undefined // 用户编号
bizType: number | undefined // Crm 类型
bizId: number | undefined // Crm 类型数据编号
level: number | undefined // 权限级别
deptName?: string // 部门名称
nickname?: string // 用户昵称
postNames?: string[] // 岗位名称数组
createTime?: Date
}
// 查询团队成员列表
export const getPermissionList = async (params) => {
return await request.get({ url: `/crm/permission/list`, params })
}
// 新增团队成员
export const createPermission = async (data: PermissionVO) => {
return await request.post({ url: `/crm/permission/create`, data })
}
// 修改团队成员权限级别
export const updatePermission = async (data) => {
return await request.put({ url: `/crm/permission/update`, data })
}
// 删除团队成员
export const deletePermission = async (params) => {
return await request.delete({ url: '/crm/permission/delete', params })
}
// 退出团队
export const quitTeam = async (id) => {
return await request.delete({ url: '/crm/permission/quit-team?id=' + id })
}
// 领取公海数据
export const receive = async (data: { bizType: number; bizId: number }) => {
return await request.put({ url: `/crm/permission/receive`, data })
}
// 数据放入公海
export const putPool = async (data: { bizType: number; bizId: number }) => {
return await request.put({ url: `/crm/permission/put-pool`, data })
}
+43
View File
@@ -0,0 +1,43 @@
import request from '@/config/axios'
export interface ProductVO {
id: number
name: string
no: string
unit: string
price: number
status: number
categoryId: number
description: string
ownerUserId: number
}
// 查询产品列表
export const getProductPage = async (params) => {
return await request.get({ url: `/crm/product/page`, params })
}
// 查询产品详情
export const getProduct = async (id: number) => {
return await request.get({ url: `/crm/product/get?id=` + id })
}
// 新增产品
export const createProduct = async (data: ProductVO) => {
return await request.post({ url: `/crm/product/create`, data })
}
// 修改产品
export const updateProduct = async (data: ProductVO) => {
return await request.put({ url: `/crm/product/update`, data })
}
// 删除产品
export const deleteProduct = async (id: number) => {
return await request.delete({ url: `/crm/product/delete?id=` + id })
}
// 导出产品 Excel
export const exportProduct = async (params) => {
return await request.download({ url: `/crm/product/export-excel`, params })
}
+33
View File
@@ -0,0 +1,33 @@
import request from '@/config/axios'
// TODO @zange:挪到 product 下,建个 category 包,挪进去哈;
export interface ProductCategoryVO {
id: number
name: string
parentId: number
}
// 查询产品分类详情
export const getProductCategory = async (id: number) => {
return await request.get({ url: `/crm/product-category/get?id=` + id })
}
// 新增产品分类
export const createProductCategory = async (data: ProductCategoryVO) => {
return await request.post({ url: `/crm/product-category/create`, data })
}
// 修改产品分类
export const updateProductCategory = async (data: ProductCategoryVO) => {
return await request.put({ url: `/crm/product-category/update`, data })
}
// 删除产品分类
export const deleteProductCategory = async (id: number) => {
return await request.delete({ url: `/crm/product-category/delete?id=` + id })
}
// 产品分类列表
export const getProductCategoryList = async (params) => {
return await request.get({ url: `/crm/product-category/list`, params })
}
+51
View File
@@ -0,0 +1,51 @@
import request from '@/config/axios'
export interface ReceivableVO {
id: number
no: string
planId: number
customerId: number
contractId: number
checkStatus: number
processInstanceId: number
returnTime: Date
returnType: string
price: number
ownerUserId: number
batchId: number
sort: number
dataScope: number
dataScopeDeptIds: string
status: number
remark: string
}
// 查询回款管理列表
export const getReceivablePage = async (params) => {
return await request.get({ url: `/crm/receivable/page`, params })
}
// 查询回款管理详情
export const getReceivable = async (id: number) => {
return await request.get({ url: `/crm/receivable/get?id=` + id })
}
// 新增回款管理
export const createReceivable = async (data: ReceivableVO) => {
return await request.post({ url: `/crm/receivable/create`, data })
}
// 修改回款管理
export const updateReceivable = async (data: ReceivableVO) => {
return await request.put({ url: `/crm/receivable/update`, data })
}
// 删除回款管理
export const deleteReceivable = async (id: number) => {
return await request.delete({ url: `/crm/receivable/delete?id=` + id })
}
// 导出回款管理 Excel
export const exportReceivable = async (params) => {
return await request.download({ url: `/crm/receivable/export-excel`, params })
}
+49
View File
@@ -0,0 +1,49 @@
import request from '@/config/axios'
export interface ReceivablePlanVO {
id: number
period: number
receivableId: number
status: number
checkStatus: string
processInstanceId: number
price: number
returnTime: Date
remindDays: number
remindTime: Date
customerId: number
contractId: number
ownerUserId: number
sort: number
remark: string
}
// 查询回款计划列表
export const getReceivablePlanPage = async (params) => {
return await request.get({ url: `/crm/receivable-plan/page`, params })
}
// 查询回款计划详情
export const getReceivablePlan = async (id: number) => {
return await request.get({ url: `/crm/receivable-plan/get?id=` + id })
}
// 新增回款计划
export const createReceivablePlan = async (data: ReceivablePlanVO) => {
return await request.post({ url: `/crm/receivable-plan/create`, data })
}
// 修改回款计划
export const updateReceivablePlan = async (data: ReceivablePlanVO) => {
return await request.put({ url: `/crm/receivable-plan/update`, data })
}
// 删除回款计划
export const deleteReceivablePlan = async (id: number) => {
return await request.delete({ url: `/crm/receivable-plan/delete?id=` + id })
}
// 导出回款计划 Excel
export const exportReceivablePlan = async (params) => {
return await request.download({ url: `/crm/receivable-plan/export-excel`, params })
}
Loaded 100 of 504 files, more files were not shown because too many files have changed in this diff. Show more