Commit Graph

1939 Commits

Author SHA1 Message Date
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
dhb52
e033793a94 Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-02-04 22:27:37 +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
YunaiV
6d0231d409 CRM:优化合同列表界面 2024-02-04 12:10:49 +08:00
YunaiV
3ad68c3227 CRM:合同的 code review 2024-02-04 09:48:44 +08:00
芋道源码
fffc9aed63
!381 CRM-合同:完善 TODO
Merge pull request !381 from puhui999/dev-crm
2024-02-04 01:42:52 +00: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
dhb52
9d9cdf427a Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-30 23:33:49 +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
芋道源码
f0a2c529b2
!378 新增:商业智能-排行榜,合同金额排行和回款金额排行
Merge pull request !378 from 安浩浩/dev
2024-01-30 01:34:09 +00:00
NiceShow
df7806d8d3 fix: label错误-砍价商品 2024-01-29 15:45:45 +08: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
moon69
6203744272
修复权限范围默认展开,deptExpand 却默认折叠的问题
Signed-off-by: moon69 <1016830869@qq.com>
2024-01-26 15:40:24 +00:00
dhb52
acc3a6bcfd fix: warning UnoCSS utilities are not ordered 2024-01-26 21:54:17 +08:00
YunaiV
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
dhb52
b3ed46db72 Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-26 21:41:14 +08:00
AKING
024d08555b
update src/permission.ts.
解决了跳转不带参数的问题

Signed-off-by: AKING <2734339436@qq.com>
2024-01-24 02:44:33 +00: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
AKING
24062c7a3b
update src/components/Descriptions/src/Descriptions.vue.
字段映射的功能点添加,已测

Signed-off-by: AKING <2734339436@qq.com>
2024-01-22 01:41:37 +00:00
AKING
530107eba7
update src/types/descriptions.d.ts.
此处添加了字段映射字段,方便在description在展示的时候减少slot的使用使用方式如下

// 确认人 confirmUser
  {
    label: '确认人',
    field: 'confirmUser',
    minWidth: 120,
    isForm: false,
    isDetail: true,
    detail: {
      mappedField: 'confirmUserName'
    }
  },

Signed-off-by: AKING <2734339436@qq.com>
2024-01-22 01:40:08 +00:00
芋道源码
bc934f56ad
!370 CRM线索
Merge pull request !370 from Minh-X/dev
2024-01-22 01:36:44 +00:00
YunaiV
66ff10d00c CRM:code review 跟进记录, 2024-01-22 09:35:59 +08:00
芋道源码
213af427a2
!366 fix: 修复 CRM 的一些 bug
Merge pull request !366 from puhui999/dev-crm
2024-01-22 01:20:02 +00:00
min
e0bc3ea6dc CRM:线索创建时增加负责人选择框 2024-01-21 18:58:48 +08:00
min
3471b5c5b2 CRM:线索表单去掉客户字段 2024-01-21 17:54:07 +08:00
dhb52
c38bbb99a1 refactor: 提取公共选项定义 2024-01-21 12:47:12 +08:00
dhb52
7c0c651592 feat: backlog 分配给我的线索、客户 2024-01-20 23:08:27 +08:00
puhui999
d735f782fc fix: 修复 CRM 的一些 bug 2024-01-20 22:46:52 +08:00