1380 Commits

Author SHA1 Message Date
YunaiV
e2a9835a5f ERP:初始化 product 信息、分类、单位的实现
(cherry picked from commit ce9317e3d0d5eeee963accf538efa9f96c8671ca)
2024-03-11 13:01:29 +08:00
shizhong
a7c37bce14 基础设施:增加前端直连上传文件到S3服务的功能 2024-03-11 12:59:37 +08:00
owen
c26eb543e0 基础设施:增加前端直连上传文件到S3服务的功能
(cherry picked from commit 490bb901e175abe1d2b4c198a7c0a0424218c6df)
2024-03-11 12:53:14 +08:00
YunaiV
0cda4612a9 CRM:优化合同列的新增/修改界面
(cherry picked from commit cac39ae126d5b3e7c8d17ab7c502a89267e22de6)
2024-03-11 12:51:42 +08:00
YunaiV
0d552b56e9 CRM:优化合同列表界面
(cherry picked from commit 6d0231d409cb5dac3ab4bf42ce2ec45aec20e43b)
2024-03-11 12:50:20 +08:00
YunaiV
b0a6af4b40 CRM:合同的 code review
(cherry picked from commit 3ad68c3227062aa3a37f07b7b760c73eeee4bd5c)
2024-03-11 12:50:09 +08:00
puhui999
d4eb24798b CRM:transfer
(cherry picked from commit fe91c5ec5ca52ef45abef6f961a24ddbea6a7daa)
2024-03-11 12:50:02 +08:00
puhui999
1cbc8a29da CRM-合同:完善 TODO
(cherry picked from commit 6d0e242387476f7cff3902b1a07e4e224843a397)
2024-03-11 12:49:57 +08:00
YunaiV
ad987e9ef1 CRM:优化合同金额排行、回款金额排行
(cherry picked from commit 4549f8ed3cf29006f3dfb0e7b6870a9982a3f215)
2024-03-11 12:49:33 +08:00
YunaiV
ff84ef64a5 CRM:合同的 code review
(cherry picked from commit 956f19d9d08930f2617ca76a96e841e86b7a9e91)
2024-03-11 12:49:03 +08:00
安浩浩
82fbaa16a3 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改
(cherry picked from commit 34a796de89b9d5e1fb660eb5bd4154a33ebf76f6)
2024-03-11 12:48:04 +08:00
NiceShow
882bcc1db5 fix: label错误-砍价商品
(cherry picked from commit df7806d8d3b2096fc6a4fd72be854b6971eea0c2)
2024-03-11 12:47:08 +08:00
anhaohao
450c4ae6d4 新增:商业智能-排行榜,合同金额排行和回款金额排行
(cherry picked from commit 770e551900cebf69deb5c34a08b85521861090ca)
2024-03-11 12:46:58 +08:00
puhui999
4714a1b086 CRM-合同:新增合同预览审批流程和提交审核
(cherry picked from commit 41195d5b4abf91771f419c1ea49a75f017f87e99)
2024-03-11 12:46:52 +08:00
puhui999
8d1c746113 CRM-合同:新增合同详情
(cherry picked from commit 668da2fa865835e51486d02b75fd5e2bc2561cc5)
2024-03-11 12:45:53 +08:00
puhui999
49b7bb1821 CRM-合同:完善合同表单
(cherry picked from commit 90e0baf5bc7787232c9cdbc9fc4b6e8f04f779cb)
2024-03-11 12:45:47 +08:00
dhb52
b6fbecd32b feat: CRM-backlog-待进入公海的客户
(cherry picked from commit 4a2349ecf57ba7ec89166de271487459994b59de)
2024-03-11 12:45:41 +08:00
puhui999
e04bb9e03e CRM-合同:完善合同表单
(cherry picked from commit 331b6c5611001f622c70646883bd4fc8b62ff091)
2024-03-11 12:45:23 +08:00
puhui999
0ada34de16 CRM-合同:完善合同表单
(cherry picked from commit ed94205fa7c0fa3f0fcaae88d0a59e727a625f0f)
2024-03-11 12:45:19 +08:00
puhui999
227f69c95d CRM-联系人:完善联系人转移、数据权限
(cherry picked from commit a64d4240a35400463fd7cb3919839e0b32c4116a)
2024-03-11 12:45:14 +08:00
puhui999
d3f8d40e40 CRM:统一日志获取接口
(cherry picked from commit 5adf75d15b8143cb327b338f43c4bd27a0e84fcb)
2024-03-11 12:45:01 +08:00
puhui999
9f599fb790 CRM-客户:完善客户导入
(cherry picked from commit 26daa3a1ff1e270666a964ea04430c443c53bfb4)
2024-03-11 12:44:37 +08:00
dhb52
1cc6adc49b fix: warning UnoCSS utilities are not ordered
(cherry picked from commit acc3a6bcfdb83a24d541bf4e7904cfbf328fc85f)
2024-03-11 12:42:18 +08:00
shizhong
88d3a47b18 BUG 2024-03-08 22:00:26 +08:00
YunaiV
dcb43e1ea9 🔥 2.0.0 版本发布!
(cherry picked from commit a0ce1f3a5b5ed2cbd5a99788b9c5d7791bd03f4a)
2024-03-08 21:47:22 +08:00
AKING
af5ef1f287 update src/permission.ts.
解决了跳转不带参数的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 024d08555b5d0168d9eb29168e970bb2f38d2829)
2024-03-08 21:46:50 +08:00
AKING
a81b4f6b06 update src/components/Descriptions/src/Descriptions.vue.
字段映射的功能点添加,已测

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 24062c7a3b8fa5a424471889d4d2cd0b2ab64211)
2024-03-08 21:45:11 +08:00
AKING
5dc7f8b595 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>
(cherry picked from commit 530107eba74dabeb6d66bf272f8241906fe67079)
2024-03-08 21:45:06 +08:00
YunaiV
a1635da641 CRM:code review 跟进记录,
(cherry picked from commit 66ff10d00c244ac4aac3b252f70b7ebff122eeaf)
2024-03-08 21:44:51 +08:00
min
90743cdb85 CRM:线索创建时增加负责人选择框
(cherry picked from commit e0bc3ea6dcf11e29ea8dcf500c39167263f003db)
2024-03-08 21:44:35 +08:00
min
d7209882b8 CRM:线索表单去掉客户字段
(cherry picked from commit 3471b5c5b2f915f29008ca38db0c6e4a3512fff1)
2024-03-08 21:44:24 +08:00
dhb52
a3d7efa669 refactor: 提取公共选项定义
(cherry picked from commit c38bbb99a1902c35d3ea26ead61a8b06af30d352)
2024-03-08 21:44:13 +08:00
dhb52
f8e13a5ccd feat: backlog 分配给我的线索、客户
(cherry picked from commit 7c0c65159270b86a2a791f63bd71a538b24ff602)
2024-03-08 21:43:34 +08:00
puhui999
ba4a848fa8 fix: 修复 CRM 的一些 bug
(cherry picked from commit d735f782fcb3fa63f625bbc53aeb0169731b1302)
2024-03-08 21:43:26 +08:00
puhui999
c8e8ebf025 CRM: 跟进组件完善
(cherry picked from commit 9628517b8bd8174f2774a8160bf98c694d6032ac)
2024-03-08 21:43:16 +08:00
puhui999
3fec9de1cf 多图上传组件优化
(cherry picked from commit f88b26e3c3b4f602bd53e463e06520b4158f6bb9)
2024-03-08 21:43:09 +08:00
YunaiV
cfd454b989 PAY:增加钱包、微信条码支付的渠道配置界面
(cherry picked from commit 948ef085339642e7361f1053c9e4ec30e594d509)
2024-03-08 21:42:58 +08:00
YunaiV
45f96650f0 BPM:抄送任务的 code review
(cherry picked from commit bf3e051d74125be2a247dce0b781d543cdf8b998)
2024-03-08 21:42:46 +08:00
YunaiV
d8c15b3aa7 调整启动命令,恢复 npm run dev;如果要连接远程服务
(cherry picked from commit 2dcd1310974c18a03f0d896789ed883e609b4083)
2024-03-08 21:41:51 +08:00
kyle
dccd2d7d4a feat: 新增流程抄送
(cherry picked from commit 2c9393702d0b3c7c308f0ecf932c103bb9483693)
2024-03-08 21:40:23 +08:00
dhb52
743ac20538 wip: CRM-代办消息-添加其他页面草稿
(cherry picked from commit 040b80b35f64373c41a44aa13116d74618c8cff9)
2024-03-08 21:36:26 +08:00
dhb52
65ee931335 wip: CRM-代办消息-修改模块为backlog
(cherry picked from commit 48693b50f2a50b904198ce787b9abd069d7c2a64)
2024-03-08 21:36:23 +08:00
YunaiV
748eb2b576 📖 CRM:跟进记录的 code review
(cherry picked from commit 9fa769b16aa76b73843a55e9c8a8c7c6837ca36d)
2024-03-08 21:36:13 +08:00
YunaiV
d9c8135bd8 📖 CRM:待办事项的 code review
(cherry picked from commit 1e70a1d57eaf3ed7a83ff37f19273907532c4a8b)
2024-03-08 21:35:46 +08:00
dhb52
811be75681 wip: 待办事项
(cherry picked from commit 24849335a834c1570dd7f96e80b92deb754f6ac6)
2024-03-08 21:35:27 +08:00
puhui999
6754fe06c2 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-08 21:35:05 +08:00
puhui999
d5be5f35a8 crm-客户:完善转移和按钮权限
(cherry picked from commit 9cbb3aa84a6adee46bde55208d2ee42f3babdc90)
2024-03-08 21:30:50 +08:00
puhui999
7a8f9b3742 crm-客户:公海抽离,完善跟进
(cherry picked from commit 5151824110335e970188d72a7139378fd04c07af)
2024-03-08 21:30:24 +08:00
puhui999
bb694349f1 新增客户跟进
(cherry picked from commit d29dfef7c70c6f13b988586f00a4c8ec9168f856)
2024-03-08 21:27:10 +08:00
YunaiV
68aed119dd MALL:简化商品分类的 VO 转化
(cherry picked from commit 26bb847383515f09c74ee2369cdf07c3014a3f14)
2024-03-08 21:26:43 +08:00