Commit Graph

189 Commits

Author SHA1 Message Date
YunaiV
427c2d5d2a MALL:修复营销的商品范围枚举不正确的问题 2024-03-30 15:42:28 +08:00
YunaiV
34b788cb88 Merge branch 'dev-crm' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/bpm/definition/index.vue
#	src/views/bpm/model/index.vue
#	src/views/bpm/processInstance/create/index.vue
#	src/views/crm/statistics/customer/index.vue
2024-03-30 12:54:51 +08:00
YunaiV
1b7d604858 CRM:code review【客户统计】的代码实现 2024-03-30 11:02:29 +08:00
YunaiV
b51397fe19 CRM:优化【客户统计】的代码实现 2024-03-30 09:23:02 +08:00
puhui999
3820710c56 二次封装 form-create 组件,使用项目重新封装的文件上传组件实现文件上载 2024-03-26 10:59:03 +08:00
YunaiV
77971f9c96 Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-03-24 10:47:04 +08:00
YunaiV
faf4557783 BPM:增加任务监听器、执行监听器的管理 2024-03-23 15:58:38 +08:00
YunaiV
d16194b794 BPM:优化 task 审批详情界面,增加开始时间、结束时间的展示 2024-03-20 21:33:48 +08:00
YunaiV
08dd4ed072 BPM:支持多表单,每个流程任务都可以绑定流程表单 2024-03-20 12:50:59 +08:00
YunaiV
501a1c2f4d BPM:新增流程分类表,替代现有的 bpm_category 数据字典 2024-03-19 19:49:52 +08:00
YunaiV
03b8bd5e22 BPM:调整抄送逻辑的实现,改成审批通过、不通过时,可选择抄送 2024-03-17 22:14:28 +08:00
YunaiV
5f7ccd4e7c BPM:重构流程分配人的实现,通过 BpmTaskCandidateStrategy 策略模式 2024-03-15 00:19:23 +08:00
YunaiV
1bc4eefeab 修复记住密码失效的问题 2024-02-29 22:42:10 +08:00
YunaiV
f8580fdf2a 2023-05-10:feat: 新增锁屏功能 2024-02-29 18:52:46 +08:00
dhb52
9e86e47c1c !391 perf: utils/formatDate.ts更好的ts类型
* perf: utils/formatDate.ts更好的ts类型
2024-02-27 12:36:49 +00:00
YunaiV
8a70b3fbba ERP:付款单 60%(接入)【可付款的采购入库单列表】 2024-02-14 15:20:17 +08:00
YunaiV
3308a494c7 ERP:增加金额计算的四舍五入 2024-02-07 10:34:32 +08:00
YunaiV
5bdf0fc0ff ERP:增加供应商的实现 2024-02-06 18:00:08 +08:00
YunaiV
26343635e4 ERP:完成 stock 产品库存、库存明细的实现 2024-02-05 19:24:26 +08:00
anhaohao
770e551900 新增:商业智能-排行榜,合同金额排行和回款金额排行 2024-01-28 20:04:42 +08:00
YunaiV
948ef08533 PAY:增加钱包、微信条码支付的渠道配置界面 2024-01-18 23:40:38 +08:00
YunaiV
9fa769b16a 📖 CRM:跟进记录的 code review 2024-01-15 21:30:25 +08:00
puhui999
2a55d88a44 Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
#	src/router/modules/remaining.ts
2024-01-14 21:53:31 +08:00
puhui999
d29dfef7c7 新增客户跟进 2024-01-14 00:00:50 +08:00
YunaiV
a38ddb699a 📖 MALL:商品编辑 => 优化 DeliveryForm 表单 2024-01-12 20:53:17 +08:00
YunaiV
efe702d383 📖 MALL:商品编辑 => 简化 InfoForm 基础设置 2024-01-11 09:42:23 +08:00
YunaiV
a5d6d18b6a 📖 MALL:优化商品列表的样式 2024-01-10 13:51:00 +08:00
芋道源码
1e68cd53a0
!352 满减送模块
Merge pull request !352 from Bluemark/dev
2024-01-07 14:16:02 +00:00
落日晚风
21e8dbf985 满减送数据对接 2023-12-22 18:04:29 +08:00
owen
ca35e1a4af 统计:增加商品统计 2023-12-16 23:48:09 +08:00
YunaiV
b3d66cd0aa 🔨 CRM:优化产品代码的实现 2023-12-06 12:32:51 +08:00
YunaiV
aecc9bb8cb 🐛 修复 IDEA 在 v-for="dict in getIntDictOptions(...)" 时,el-optionkey 会告警的问题 2023-12-03 09:52:13 +08:00
YunaiV
1066551fd1 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2023-12-02 19:25:50 +08:00
YunaiV
a77173f2ae 🐛 修复 post 和 dept 在 IDEA 报错的问题 2023-12-02 10:20:09 +08:00
owen
b982397449 Merge remote-tracking branch 'origin/dev' into dev 2023-12-02 00:00:50 +08:00
YunaiV
b0c1e55c6a crm: 增加基于客户查询回款计划分页 2023-12-01 22:46:20 +08:00
owen
08be359578 Merge remote-tracking branch 'origin/dev' into dev 2023-12-01 00:39:55 +08:00
owen
23a6bf5ef5 营销:商城装修增加控件【APP 链接选择】 2023-12-01 00:39:10 +08:00
YunaiV
31a42fc3f7 crm:增加合同 List 组件 2023-11-30 19:12:57 +08:00
YunaiV
5f26c4afe9 crm:完善数据权限的界面 2023-11-30 13:42:49 +08:00
YunaiV
661dc2ff67 crm:code review 成员 2023-11-29 13:55:53 +08:00
芋道源码
c6192a1918
!329 完善团队成员公共组件,crm-客户:集成团队成员
Merge pull request !329 from puhui999/dev-crm
2023-11-25 02:24:45 +00:00
owen
c3cad3f3ee 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题 2023-11-24 20:54:47 +08:00
puhui999
19a0a83054 crm-数据权限:完善团队成员公共组件 2023-11-22 15:44:42 +08:00
owen
82aed175ab 营销:适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +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
芋道源码
596ad888e1
!308 【增加CRM:产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
2023-11-05 12:28:31 +00: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
ZanGe丶
ff6f05df84 【crm:产品及产品分类】 2023-11-04 18:28:59 +08:00
YunaiV
a9b91e7436 优化:社交登录、用户的管理 2023-11-04 14:37:23 +08:00