Commit Graph

591 Commits

Author SHA1 Message Date
YunaiV
b55c8417fb ERP:增加 ERP 销售订单的实现 30% 2024-02-09 20:20:15 +08:00
YunaiV
0319056e4b ERP:增加 ERP 盘点单的实现 50% 2024-02-08 08:36:20 +08:00
dhb52
ae3d44d8bd feat: 待回款提醒,即将到期的合同,待审核回款 2024-02-07 23:52:46 +08:00
YunaiV
3c4932bc77 ERP:增加 ERP 调拨单的实现 100% 2024-02-07 20:48:20 +08:00
YunaiV
896f9758ed ERP:增加 ERP 客户的实现 2024-02-07 15:41:07 +08:00
YunaiV
616fd3f7ba ERP:初始化其它出库的实现 2024-02-07 15:00:47 +08:00
YunaiV
115c30ea40 ERP:增加入库单的审批功能 2024-02-06 23:28:48 +08:00
YunaiV
5bdf0fc0ff ERP:增加供应商的实现 2024-02-06 18:00:08 +08:00
YunaiV
9cbdfe0ecb ERP:初始化其它入库的表单 50% 2024-02-06 15:58:25 +08:00
YunaiV
53c94af027 ERP:初始化其它入库的表单 40% 2024-02-06 12:44:39 +08:00
YunaiV
d92404f351 ERP:初始化其它入库的表单 20% 2024-02-06 00:56:43 +08:00
YunaiV
26343635e4 ERP:完成 stock 产品库存、库存明细的实现 2024-02-05 19:24:26 +08:00
YunaiV
6d9ca290b3 ERP:完成 stock 仓库信息的实现 2024-02-05 01:36:24 +08:00
YunaiV
36a0330277 ERP:完成 product 信息、分类、单位的实现 2024-02-05 00:15:40 +08:00
安浩浩
3cdcd67a6a 新增:CRM 商业智能,其他排名接口 2024-02-04 23:55:26 +08:00
owen
89fdb5ced9 基础设施:前端直连上传,优先使用自定义域名 2024-02-04 20:57:05 +08:00
YunaiV
ce9317e3d0 ERP:初始化 product 信息、分类、单位的实现 2024-02-04 19:57:56 +08:00
owen
dd08fbcb46 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 19:42:14 +08:00
owen
490bb901e1 基础设施:增加前端直连上传文件到S3服务的功能 2024-02-04 19:41:48 +08:00
YunaiV
cac39ae126 CRM:优化合同列的新增/修改界面 2024-02-04 12:57:39 +08:00
puhui999
fe91c5ec5c CRM:transfer 2024-02-03 22:17:45 +08:00
puhui999
6d0e242387 CRM-合同:完善 TODO 2024-02-03 20:47:50 +08:00
YunaiV
4549f8ed3c CRM:优化合同金额排行、回款金额排行 2024-02-03 01:14:24 +08:00
芋道源码
d6438943b8
!380 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改
Merge pull request !380 from 安浩浩/dev
2024-02-02 15:49:13 +00:00
YunaiV
956f19d9d0 CRM:合同的 code review 2024-02-01 13:38:14 +08:00
安浩浩
34a796de89 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改 2024-01-31 23:37:21 +08:00
芋道源码
a5f8c3d79c
!376 完善客户导入,统一日志获取接口
Merge pull request !376 from puhui999/dev-crm
2024-01-30 04:42:33 +00:00
芋道源码
4271788a83
!377 feat: CRM-backlog-待进入公海的客户
Merge pull request !377 from dhb52/crm-msg
2024-01-30 04:10:25 +00:00
anhaohao
770e551900 新增:商业智能-排行榜,合同金额排行和回款金额排行 2024-01-28 20:04:42 +08:00
puhui999
41195d5b4a CRM-合同:新增合同预览审批流程和提交审核 2024-01-28 16:33:06 +08:00
puhui999
668da2fa86 CRM-合同:新增合同详情 2024-01-28 01:32:49 +08:00
puhui999
90e0baf5bc CRM-合同:完善合同表单 2024-01-27 23:43:30 +08:00
dhb52
4a2349ecf5 feat: CRM-backlog-待进入公海的客户 2024-01-27 23:42:13 +08:00
puhui999
331b6c5611 CRM-合同:完善合同表单 2024-01-27 23:18:52 +08:00
puhui999
ed94205fa7 CRM-合同:完善合同表单 2024-01-27 23:11:43 +08:00
puhui999
a64d4240a3 CRM-联系人:完善联系人转移、数据权限 2024-01-27 17:03:07 +08:00
puhui999
5adf75d15b CRM:统一日志获取接口 2024-01-27 15:15:07 +08:00
puhui999
26daa3a1ff CRM-客户:完善客户导入 2024-01-27 15:02:25 +08:00
YunaiV
64cfcbf6e0 Merge branch 'crm-msg' of https://gitee.com/dhb52/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/backlog/tables/TodayCustomer.vue
2024-01-22 09:45:23 +08:00
YunaiV
66ff10d00c CRM:code review 跟进记录, 2024-01-22 09:35:59 +08:00
puhui999
d735f782fc fix: 修复 CRM 的一些 bug 2024-01-20 22:46:52 +08:00
dhb52
24e8bd4c47 Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-20 22:06:16 +08:00
puhui999
f88b26e3c3 多图上传组件优化 2024-01-20 17:31:10 +08:00
YunaiV
49a806a6f9 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-01-18 12:47:44 +08:00
YunaiV
2dcd131097 调整启动命令,恢复 npm run dev;如果要连接远程服务 2024-01-18 12:47:23 +08:00
kyle
2c9393702d feat: 新增流程抄送 2024-01-17 09:40:05 +08:00
dhb52
48693b50f2 wip: CRM-代办消息-修改模块为backlog 2024-01-15 22:45:12 +08:00
YunaiV
9fa769b16a 📖 CRM:跟进记录的 code review 2024-01-15 21:30:25 +08:00
芋道源码
163613e90c
!363 crm:新增跟进组件、转移表单组件封装,完善按钮数据权限控制、客户公海抽离
Merge pull request !363 from puhui999/dev-crm
2024-01-15 04:36:13 +00:00
YunaiV
1e70a1d57e 📖 CRM:待办事项的 code review 2024-01-15 12:15:59 +08:00
dhb52
24849335a8 wip: 待办事项 2024-01-14 22:44:25 +08:00
puhui999
2a55d88a44 Merge remote-tracking branch 'yudao/dev' into dev-crm
# Conflicts:
#	src/router/modules/remaining.ts
2024-01-14 21:53:31 +08:00
puhui999
9cbb3aa84a crm-客户:完善转移和按钮权限 2024-01-14 21:48:20 +08:00
puhui999
5151824110 crm-客户:公海抽离,完善跟进 2024-01-14 20:57:06 +08:00
puhui999
d29dfef7c7 新增客户跟进 2024-01-14 00:00:50 +08:00
YunaiV
26bb847383 MALL:简化商品分类的 VO 转化 2024-01-13 22:58:32 +08:00
芋道源码
fdfb028dd9
!360 Review代码修改
Merge pull request !360 from 疯狂的世界/dev
2024-01-13 03:16:16 +00:00
芋道源码
66c48a913c 📖 CRM:产品模块的 review 2024-01-13 10:24:48 +08:00
YunaiV
a9400c5171 MALL:简化 SPU 属性的维护逻辑 2024-01-12 23:17:48 +08:00
YunaiV
a38ddb699a 📖 MALL:商品编辑 => 优化 DeliveryForm 表单 2024-01-12 20:53:17 +08:00
YunaiV
20b4a7fd66 📖 MALL:商品编辑 => 优化 SKU 表单 2024-01-11 22:22:07 +08:00
anhaohao
4f89eb6ba9 新增:产品详情页面 2024-01-11 17:51:45 +08:00
owen
bdf95dc0f8 Merge remote-tracking branch 'origin/dev' into dev 2024-01-11 11:35:08 +08:00
owen
a9c231bed6 营销:统一装修预览图片字段名称 2024-01-11 11:21:23 +08:00
YunaiV
2c76d3aeee 📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本 2024-01-11 00:25:39 +08:00
YunaiV
f1c858b9af 📖 MALL:商品编辑的简化 2024-01-10 23:50:19 +08:00
YunaiV
ab64a1d1df 📖 MALL:code review 满减送活动 2024-01-07 22:41:17 +08:00
芋道源码
1e68cd53a0
!352 满减送模块
Merge pull request !352 from Bluemark/dev
2024-01-07 14:16:02 +00:00
YunaiV
ec87c1b61d 📖 CRM:code review crm 客户列表 2024-01-07 21:20:00 +08:00
芋道源码
4eb3c8a2f9
!358 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
Merge pull request !358 from puhui999/dev-crm
2024-01-07 12:53:49 +00:00
芋道源码
09fa30b0d6
!359 crm联系人新增操作日志
Merge pull request !359 from zyna/dev
2024-01-07 10:15:05 +00:00
芋道源码
9bdba0f67e
!351 商品统计
Merge pull request !351 from 疯狂的世界/dev
2024-01-07 07:23:49 +00:00
zyna
3af6811c72 crm联系人新增操作日志 2024-01-06 21:04:58 +08:00
puhui999
17be1abb65 客户详情完善 2024-01-06 12:29:35 +08:00
YunaiV
d36c4ab36c MALL:去除分销提现的银行配置 2024-01-05 22:46:22 +08:00
owen
1fb7701e6e Merge remote-tracking branch 'origin/dev' into dev 2024-01-05 15:26:41 +08:00
YunaiV
5e265a9094 CRM:【联系人】统一字段 2024-01-03 23:30:29 +08:00
YunaiV
d71097ac31 📖 CRM:【客户配置】调整目录结构 2024-01-03 20:09:56 +08:00
YunaiV
4fbb3b88e6 📖 CRM:【客户】微调客户列表界面 2024-01-03 19:38:55 +08:00
YunaiV
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
YunaiV
1eefa02c4c 📖 操作日志的界面实现 2023-12-30 21:25:08 +08:00
芋道源码
631c105f94
!346 feat:新增公共操作日志详情组件
Merge pull request !346 from puhui999/dev-crm
2023-12-30 12:54:53 +00:00
puhui999
261d8b2aa4 crm-客户:集成操作日志详情组件 2023-12-30 17:06:09 +08:00
AhJindeg
2223f7f197 fix(task): 🐞 Update return list API endpoint
- 修改获取回退节点列表接口地址
2023-12-26 11:32:40 +08:00
落日晚风
21e8dbf985 满减送数据对接 2023-12-22 18:04:29 +08:00
zyna
a1fd3afc32 crm联系人商机修改 2023-12-17 17:34:32 +08:00
owen
ca35e1a4af 统计:增加商品统计 2023-12-16 23:48:09 +08:00
YunaiV
be4750a174 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-12-16 20:49:47 +08:00
水人
346863a8a9
update src/api/bpm/task/index.ts.
后台接口地址是return-list,前台写成了get-return-list

Signed-off-by: 水人 <417693680@qq.com>
2023-12-16 00:00:14 +00:00
puhui999
455688eaa8 crm-客户:集成操作日志详情组件 2023-12-14 18:19:34 +08:00
puhui999
59c6670775 feat:新增公共操作日志详情组件 2023-12-14 18:18:55 +08:00
芋道源码
b4aa09aa6c
!327 【新增】ureport2 集成
Merge pull request !327 from souvc/master
2023-12-06 12:57:44 +00:00
YunaiV
ce79dd68a3 📈 CRM:code review 联系人商机功能 2023-12-06 19:26:39 +08:00
芋道源码
d6291382e8
!341 crm联系人商机功能
Merge pull request !341 from zyna/dev
2023-12-06 05:55:59 +00:00
YunaiV
b3d66cd0aa 🔨 CRM:优化产品代码的实现 2023-12-06 12:32:51 +08:00
芋道源码
ee9667504f
!342 【CRM:优化产品以及产品分类】
Merge pull request !342 from ZanGe丶/master
2023-12-05 14:36:16 +00:00
YunaiV
0c613e94a8 🐛 修复 CodegenColumnVO 的 autoIncrement 类型不正确 2023-12-05 20:03:40 +08:00
liuhongfeng
d9ed3d1a6b Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-12-03 23:01:52 +08:00
ZanGe丶
dde61c29a0 【crm:优化产品及产品分类】 2023-12-03 21:24:38 +08:00