Commit Graph

2154 Commits

Author SHA1 Message Date
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
dhb52
24e8bd4c47 Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-20 22:06:16 +08:00
puhui999
9628517b8b CRM: 跟进组件完善 2024-01-20 18:56:24 +08:00
puhui999
f88b26e3c3 多图上传组件优化 2024-01-20 17:31:10 +08:00
YunaiV
948ef08533 PAY:增加钱包、微信条码支付的渠道配置界面 2024-01-18 23:40:38 +08:00
YunaiV
bf3e051d74 BPM:抄送任务的 code review 2024-01-18 19:07:12 +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
芋道源码
d852103929
!365 流程增加抄送功能
Merge pull request !365 from 云开/feature/BPM_CC
2024-01-18 04:46:09 +00:00
kyle
2c9393702d feat: 新增流程抄送 2024-01-17 09:40:05 +08:00
dhb52
040b80b35f wip: CRM-代办消息-添加其他页面草稿 2024-01-15 22:45:42 +08:00
dhb52
48693b50f2 wip: CRM-代办消息-修改模块为backlog 2024-01-15 22:45:12 +08:00
dhb52
39da43cc7d Merge remote-tracking branch 'yudao/dev' into crm-msg 2024-01-15 21:48:32 +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
芋道源码
68fc1760a5
!364 wip: CRM-待办事项
Merge pull request !364 from dhb52/crm-msg
2024-01-15 01:34:14 +00: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
dhb52
25347b3ea5 Merge remote-tracking branch 'yudao/dev' into dev 2024-01-14 11:50:26 +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
YunaiV
a77658b336 Merge remote-tracking branch 'origin/dev' into dev 2024-01-13 10:24:54 +08:00
芋道源码
66c48a913c 📖 CRM:产品模块的 review 2024-01-13 10:24:48 +08:00
芋道源码
2be14817a0
!361 新增:产品详情页面
Merge pull request !361 from 安浩浩/dev
2024-01-13 02:04:20 +00:00
YunaiV
a9400c5171 MALL:简化 SPU 属性的维护逻辑 2024-01-12 23:17:48 +08:00
YunaiV
10afbe8e2f 📖 MALL:商品编辑 => 优化 DescriptionForm 表单 2024-01-12 21:01:10 +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
2b8eb49f71 Review代码修改 2024-01-11 12:25:34 +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