Commit Graph

1484 Commits

Author SHA1 Message Date
YunaiV
57044cb716 ERP:采购入库 100% 2024-02-12 16:51:18 +08:00
YunaiV
3d4feeff6b ERP:采购入库 50% 2024-02-12 11:28:16 +08:00
YunaiV
5339cca40e ERP:基本完成采购订单 100% 2024-02-12 10:00:09 +08:00
YunaiV
600892b112 ERP:初始化采购订单 50% 2024-02-12 08:56:25 +08:00
YunaiV
eae2ea0a82 ERP:初始化销售退货逻辑 100% 2024-02-12 06:52:24 +08:00
YunaiV
3860aaef6f ERP:初始化销售退货逻辑 70%(详情) 2024-02-12 06:29:03 +08:00
YunaiV
949096f776 ERP:初始化销售退货逻辑 50% 2024-02-12 06:20:56 +08:00
YunaiV
5736083534 ERP:基本完成销售入库模块 2024-02-11 22:13:02 +08:00
YunaiV
00a386dd7c ERP:增加 ERP 销售出库的编辑界面 2024-02-11 16:12:12 +08:00
YunaiV
c0db4df880 ERP:增加 ERP 可出库订单列表 2024-02-11 10:33:27 +08:00
YunaiV
e535384f45 ERP:增加 ERP 销售出库的实现 30%(列表) 2024-02-10 22:47:14 +08:00
YunaiV
f7c5266015 ERP:增加 ERP 销售订单的实现 90% 2024-02-10 21:48:15 +08:00
YunaiV
b25d9c0f09 ERP:增加结算账户 100% 2024-02-10 08:32:34 +08:00
YunaiV
5deabcf692 ERP:增加 ERP 销售订单的实现 60%(详情) 2024-02-10 00:50:56 +08:00
YunaiV
ab63660bf8 ERP:增加 ERP 销售订单的实现 50%(详情)
新年快乐~
2024-02-10 00:07:00 +08:00
YunaiV
2615054fb2 ERP:增加 ERP 销售订单的实现 40%(列表) 2024-02-09 21:56:01 +08:00
YunaiV
b55c8417fb ERP:增加 ERP 销售订单的实现 30% 2024-02-09 20:20:15 +08:00
YunaiV
14ab46c870 ERP:增加 ERP 盘点单的实现 100% 2024-02-08 09:06:24 +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
318d5261ad ERP:增加金额计算的四舍五入 2024-02-07 12:29:34 +08:00
YunaiV
3308a494c7 ERP:增加金额计算的四舍五入 2024-02-07 10:34:32 +08:00
YunaiV
1c98deaf27 ERP:增加入库单号的自动生成 2024-02-07 00:37:51 +08:00
YunaiV
115c30ea40 ERP:增加入库单的审批功能 2024-02-06 23:28:48 +08:00
dhb52
361c06bd6f feat: crm-backlog 待审核合同 2024-02-06 22:58:33 +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
YunaiV
6d0231d409 CRM:优化合同列表界面 2024-02-04 12:10:49 +08:00
YunaiV
3ad68c3227 CRM:合同的 code review 2024-02-04 09:48:44 +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
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
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
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
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
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
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