Commit Graph

1355 Commits

Author SHA1 Message Date
AKING
af5ef1f287 update src/permission.ts.
解决了跳转不带参数的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 024d08555b)
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 24062c7a3b)
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 530107eba7)
2024-03-08 21:45:06 +08:00
YunaiV
a1635da641 CRM:code review 跟进记录,
(cherry picked from commit 66ff10d00c)
2024-03-08 21:44:51 +08:00
min
90743cdb85 CRM:线索创建时增加负责人选择框
(cherry picked from commit e0bc3ea6dc)
2024-03-08 21:44:35 +08:00
min
d7209882b8 CRM:线索表单去掉客户字段
(cherry picked from commit 3471b5c5b2)
2024-03-08 21:44:24 +08:00
dhb52
a3d7efa669 refactor: 提取公共选项定义
(cherry picked from commit c38bbb99a1)
2024-03-08 21:44:13 +08:00
dhb52
f8e13a5ccd feat: backlog 分配给我的线索、客户
(cherry picked from commit 7c0c651592)
2024-03-08 21:43:34 +08:00
puhui999
ba4a848fa8 fix: 修复 CRM 的一些 bug
(cherry picked from commit d735f782fc)
2024-03-08 21:43:26 +08:00
puhui999
c8e8ebf025 CRM: 跟进组件完善
(cherry picked from commit 9628517b8b)
2024-03-08 21:43:16 +08:00
puhui999
3fec9de1cf 多图上传组件优化
(cherry picked from commit f88b26e3c3)
2024-03-08 21:43:09 +08:00
YunaiV
cfd454b989 PAY:增加钱包、微信条码支付的渠道配置界面
(cherry picked from commit 948ef08533)
2024-03-08 21:42:58 +08:00
YunaiV
45f96650f0 BPM:抄送任务的 code review
(cherry picked from commit bf3e051d74)
2024-03-08 21:42:46 +08:00
YunaiV
d8c15b3aa7 调整启动命令,恢复 npm run dev;如果要连接远程服务
(cherry picked from commit 2dcd131097)
2024-03-08 21:41:51 +08:00
kyle
dccd2d7d4a feat: 新增流程抄送
(cherry picked from commit 2c9393702d)
2024-03-08 21:40:23 +08:00
dhb52
743ac20538 wip: CRM-代办消息-添加其他页面草稿
(cherry picked from commit 040b80b35f)
2024-03-08 21:36:26 +08:00
dhb52
65ee931335 wip: CRM-代办消息-修改模块为backlog
(cherry picked from commit 48693b50f2)
2024-03-08 21:36:23 +08:00
YunaiV
748eb2b576 📖 CRM:跟进记录的 code review
(cherry picked from commit 9fa769b16a)
2024-03-08 21:36:13 +08:00
YunaiV
d9c8135bd8 📖 CRM:待办事项的 code review
(cherry picked from commit 1e70a1d57e)
2024-03-08 21:35:46 +08:00
dhb52
811be75681 wip: 待办事项
(cherry picked from commit 24849335a8)
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 9cbb3aa84a)
2024-03-08 21:30:50 +08:00
puhui999
7a8f9b3742 crm-客户:公海抽离,完善跟进
(cherry picked from commit 5151824110)
2024-03-08 21:30:24 +08:00
puhui999
bb694349f1 新增客户跟进
(cherry picked from commit d29dfef7c7)
2024-03-08 21:27:10 +08:00
YunaiV
68aed119dd MALL:简化商品分类的 VO 转化
(cherry picked from commit 26bb847383)
2024-03-08 21:26:43 +08:00
shizhong
231ba51650 📖 CRM:产品模块的 review 2024-03-08 21:24:00 +08:00
YunaiV
f2fcaf0eb3 MALL:简化 SPU 属性的维护逻辑
(cherry picked from commit a9400c5171)
2024-03-08 21:15:22 +08:00
YunaiV
92d3564cae 📖 MALL:商品编辑 => 优化 DescriptionForm 表单
(cherry picked from commit 10afbe8e2f)
2024-03-08 21:15:17 +08:00
YunaiV
890d31ff5f 📖 MALL:商品编辑 => 优化 DeliveryForm 表单
(cherry picked from commit a38ddb699a)
2024-03-08 21:15:13 +08:00
YunaiV
48fe4332bc 📖 MALL:商品编辑 => 优化 SKU 表单
(cherry picked from commit 20b4a7fd66)
2024-03-08 21:14:52 +08:00
anhaohao
d352e022b6 新增:产品详情页面
(cherry picked from commit 4f89eb6ba9)
2024-03-08 21:14:46 +08:00
owen
a959935cf8 Review代码修改
(cherry picked from commit 2b8eb49f71)
2024-03-08 21:14:40 +08:00
owen
ae2209a53e 营销:统一装修预览图片字段名称
(cherry picked from commit a9c231bed6)
2024-03-08 21:14:10 +08:00
YunaiV
d1c9f702d9 📖 MALL:商品编辑 => 简化 InfoForm 基础设置
(cherry picked from commit efe702d383)
2024-03-08 21:13:52 +08:00
YunaiV
ddcf1f672b 📖 MALL:商品编辑 => 将 detail 还是使用 form 复用,减少维护成本
(cherry picked from commit 2c76d3aeee)
2024-03-08 21:13:46 +08:00
YunaiV
135f4803b1 📖 MALL:商品编辑的简化
(cherry picked from commit c0905fdc8e)
2024-03-08 21:13:38 +08:00
YunaiV
ac0efcd9b5 📖 MALL:商品编辑的简化
(cherry picked from commit f1c858b9af)
2024-03-08 21:13:18 +08:00
YunaiV
bb45bfd4c6 📖 MALL:优化商品列表的样式
(cherry picked from commit a5d6d18b6a)
2024-03-08 21:12:45 +08:00
YunaiV
642ba23160 📖 MALL:code review 满减送活动
(cherry picked from commit ab64a1d1df)
2024-03-08 21:12:20 +08:00
YunaiV
f8b0250def 📖 CRM:code review crm 客户列表
(cherry picked from commit ec87c1b61d)
2024-03-08 21:12:10 +08:00
YunaiV
65e6465a7a 📖 CRM:code review crm 联系人新增操作日志
(cherry picked from commit a0f7775321)
2024-03-08 21:11:58 +08:00
YunaiV
f4792d9b08 📖 MALL:code review 商品统计的代码
(cherry picked from commit 29e7161eba)
2024-03-08 21:11:52 +08:00
zyna
dd0a9781a1 crm联系人新增操作日志
(cherry picked from commit 3af6811c72)
2024-03-08 21:11:30 +08:00
answer-huang
187368bcc8 fix: remove bg color with xl size
(cherry picked from commit 8801c82e15)
2024-03-08 21:11:19 +08:00
puhui999
b211e245db 客户详情完善
(cherry picked from commit 17be1abb65)
2024-03-08 21:11:08 +08:00
YunaiV
9286010e77 MALL:去除分销提现的银行配置
(cherry picked from commit d36c4ab36c)
2024-03-08 21:11:01 +08:00
shizhong
9e0e307d74 update src/views/bpm/model/ModelForm.vue. 创建的是用路由地址,但那个表单查看的是VUE源码的组件地址,不是路由。给我造成了很大的困扰~ 2024-03-08 21:09:06 +08:00
puhui999
4ddf19a601 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题
(cherry picked from commit 7fd564307d)
2024-03-08 21:04:38 +08:00
YunaiV
712a7df176 CRM:【联系人】统一字段
(cherry picked from commit 5e265a9094)
2024-03-08 21:04:15 +08:00
YunaiV
d991d92cfc 📖 CRM:【客户配置】调整目录结构
(cherry picked from commit d71097ac31)
2024-03-08 21:04:11 +08:00