root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,422 Commits 8 Branches 11 Tags 16 MiB
9a2dac3f73
Commit Graph

1276 Commits

Author SHA1 Message Date
YunaiV
1a5fa3e894 ✨ ERP：采购订单的 paymentPrice 调整，为接入财务的付款单做准备 
(cherry picked from commit 58972e0b98)
 2024-03-11 13:11:57 +08:00
YunaiV
5d6c762536 ✨ ERP：采购退货 100% 
(cherry picked from commit fcba2b4c48)
 2024-03-11 13:11:51 +08:00
YunaiV
1ec621f8b4 ✨ ERP：采购退货 70%（详情） 
(cherry picked from commit db446330c3)
 2024-03-11 13:11:34 +08:00
YunaiV
491dd650b7 ✨ ERP：采购退货 50%（列表） 
(cherry picked from commit ee35056767)
 2024-03-11 13:11:27 +08:00
YunaiV
ddc618a5ec ✨ ERP：采购入库 100% 
(cherry picked from commit 57044cb716)
 2024-03-11 13:11:20 +08:00
YunaiV
2453d3fb8d ✨ ERP：采购入库 50% 
(cherry picked from commit 3d4feeff6b)
 2024-03-11 13:10:46 +08:00
YunaiV
572289f936 ✨ ERP：基本完成采购订单 100% 
(cherry picked from commit 5339cca40e)
 2024-03-11 13:10:32 +08:00
YunaiV
a89bdda1c2 ✨ ERP：初始化采购订单 50% 
(cherry picked from commit 600892b112)
 2024-03-11 13:09:59 +08:00
YunaiV
5269cdf9af ✨ ERP：初始化销售退货逻辑 100% 
(cherry picked from commit eae2ea0a82)
 2024-03-11 13:09:55 +08:00
YunaiV
b89471d43e ✨ ERP：初始化销售退货逻辑 70%（详情） 
(cherry picked from commit 3860aaef6f)
 2024-03-11 13:09:46 +08:00
YunaiV
0bd46a118a ✨ ERP：初始化销售退货逻辑 50% 
(cherry picked from commit 949096f776)
 2024-03-11 13:09:15 +08:00
YunaiV
0f33ff4973 ✨ ERP：基本完成销售入库模块 
(cherry picked from commit 5736083534)
 2024-03-11 13:08:48 +08:00
YunaiV
ef7c5725c3 ✨ ERP：增加 ERP 销售出库的编辑界面 
(cherry picked from commit 00a386dd7c)
 2024-03-11 13:08:43 +08:00
YunaiV
3fdceb2b93 ✨ ERP：增加 ERP 可出库订单列表 
(cherry picked from commit c0db4df880)
 2024-03-11 13:08:30 +08:00
YunaiV
c0ad2cc48c ✨ ERP：增加 ERP 销售出库的实现 30%（列表） 
(cherry picked from commit e535384f45)
 2024-03-11 13:08:23 +08:00
YunaiV
f8b686fbc4 ✨ ERP：增加 ERP 销售订单的实现 90% 
(cherry picked from commit f7c5266015)
 2024-03-11 13:08:03 +08:00
YunaiV
03c7e2167e ✨ ERP：增加结算账户 100% 
(cherry picked from commit b25d9c0f09)
 2024-03-11 13:07:47 +08:00
YunaiV
58c40f3cdb ✨ ERP：增加 ERP 销售订单的实现 60%（详情） 
(cherry picked from commit 5deabcf692)
 2024-03-11 13:07:25 +08:00
YunaiV
2483c619be ✨ ERP：增加 ERP 销售订单的实现 50%（详情） 
新年快乐~

(cherry picked from commit ab63660bf8)
 2024-03-11 13:07:19 +08:00
YunaiV
f110a6f351 ✨ ERP：增加 ERP 销售订单的实现 40%（列表） 
(cherry picked from commit 2615054fb2)
 2024-03-11 13:07:15 +08:00
YunaiV
a3258573ca ✨ ERP：增加 ERP 销售订单的实现 30% 
(cherry picked from commit b55c8417fb)
 2024-03-11 13:07:12 +08:00
YunaiV
051c81db80 ✨ ERP：增加 ERP 盘点单的实现 100% 
(cherry picked from commit 14ab46c870)
 2024-03-11 13:07:07 +08:00
YunaiV
a093d051cc ✨ ERP：增加 ERP 盘点单的实现 50% 
(cherry picked from commit 0319056e4b)
 2024-03-11 13:07:02 +08:00
dhb52
054707bb0c feat: 待回款提醒,即将到期的合同,待审核回款 
(cherry picked from commit ae3d44d8bd)
 2024-03-11 13:06:50 +08:00
YunaiV
6d50c1f624 ✨ ERP：增加 ERP 调拨单的实现 100% 
(cherry picked from commit 3c4932bc77)
 2024-03-11 13:06:38 +08:00
YunaiV
f3cb466f30 ✨ ERP：增加 ERP 客户的实现 
(cherry picked from commit 896f9758ed)
 2024-03-11 13:06:35 +08:00
YunaiV
f575f6a503 ✨ ERP：初始化其它出库的实现 
(cherry picked from commit 616fd3f7ba)
 2024-03-11 13:06:31 +08:00
YunaiV
b818bd9e6d ✨ ERP：增加金额计算的四舍五入 
(cherry picked from commit 318d5261ad)
 2024-03-11 13:06:27 +08:00
YunaiV
015641d8c5 ✨ ERP：增加金额计算的四舍五入 
(cherry picked from commit 3308a494c7)
 2024-03-11 13:06:22 +08:00
YunaiV
ec25b23b87 ✨ ERP：增加入库单号的自动生成 
(cherry picked from commit 1c98deaf27)
 2024-03-11 13:06:05 +08:00
YunaiV
5ab17e3e4c ✨ ERP：增加入库单的审批功能 
(cherry picked from commit 115c30ea40)
 2024-03-11 13:05:59 +08:00
dhb52
011195fdf7 feat: crm-backlog 待审核合同 
(cherry picked from commit 361c06bd6f)
 2024-03-11 13:05:51 +08:00
YunaiV
4dcf30076e ✨ ERP：增加供应商的实现 
(cherry picked from commit 5bdf0fc0ff)
 2024-03-11 13:05:43 +08:00
YunaiV
6ecc996d76 ✨ ERP：初始化其它入库的表单 50% 
(cherry picked from commit 9cbdfe0ecb)
 2024-03-11 13:05:30 +08:00
YunaiV
0ad7f0acfb ✨ ERP：初始化其它入库的表单 40% 
(cherry picked from commit 53c94af027)
 2024-03-11 13:05:25 +08:00
YunaiV
35987401bc ✨ ERP：初始化其它入库的表单 20% 
(cherry picked from commit d92404f351)
 2024-03-11 13:05:12 +08:00
YunaiV
3543252dda ✨ ERP：完成 stock 产品库存、库存明细的实现 
(cherry picked from commit 26343635e4)
 2024-03-11 13:04:56 +08:00
YunaiV
7bfa782c0e ✨ ERP：完成 stock 仓库信息的实现 
(cherry picked from commit 6d9ca290b3)
 2024-03-11 13:04:08 +08:00
YunaiV
7f19593cc5 ✨ ERP：完成 product 信息、分类、单位的实现 
(cherry picked from commit 36a0330277)
 2024-03-11 13:03:58 +08:00
安浩浩
1c034ca575 新增：CRM 商业智能，其他排名接口 
(cherry picked from commit 3cdcd67a6a)
 2024-03-11 13:03:19 +08:00
owen
818dc4d8e3 基础设施：前端直连上传，优先使用自定义域名 
(cherry picked from commit 89fdb5ced9)
 2024-03-11 13:02:19 +08:00
YunaiV
e2a9835a5f ✨ ERP：初始化 product 信息、分类、单位的实现 
(cherry picked from commit ce9317e3d0)
 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 490bb901e1)
 2024-03-11 12:53:14 +08:00
YunaiV
0cda4612a9 CRM：优化合同列的新增/修改界面 
(cherry picked from commit cac39ae126)
 2024-03-11 12:51:42 +08:00
YunaiV
0d552b56e9 CRM：优化合同列表界面 
(cherry picked from commit 6d0231d409)
 2024-03-11 12:50:20 +08:00
YunaiV
b0a6af4b40 CRM：合同的 code review 
(cherry picked from commit 3ad68c3227)
 2024-03-11 12:50:09 +08:00
puhui999
d4eb24798b CRM：transfer 
(cherry picked from commit fe91c5ec5c)
 2024-03-11 12:50:02 +08:00
puhui999
1cbc8a29da CRM-合同：完善 TODO 
(cherry picked from commit 6d0e242387)
 2024-03-11 12:49:57 +08:00
YunaiV
ad987e9ef1 CRM：优化合同金额排行、回款金额排行 
(cherry picked from commit 4549f8ed3c)
 2024-03-11 12:49:33 +08:00
YunaiV
ff84ef64a5 CRM：合同的 code review 
(cherry picked from commit 956f19d9d0)
 2024-03-11 12:49:03 +08:00
安浩浩
82fbaa16a3 修改：商业智能-排行榜，合同金额排行和回款金额排行时间条件和接口修改 
(cherry picked from commit 34a796de89)
 2024-03-11 12:48:04 +08:00
NiceShow
882bcc1db5 fix: label错误-砍价商品 
(cherry picked from commit df7806d8d3)
 2024-03-11 12:47:08 +08:00
anhaohao
450c4ae6d4 新增：商业智能-排行榜，合同金额排行和回款金额排行 
(cherry picked from commit 770e551900)
 2024-03-11 12:46:58 +08:00
puhui999
4714a1b086 CRM-合同：新增合同预览审批流程和提交审核 
(cherry picked from commit 41195d5b4a)
 2024-03-11 12:46:52 +08:00
puhui999
8d1c746113 CRM-合同：新增合同详情 
(cherry picked from commit 668da2fa86)
 2024-03-11 12:45:53 +08:00
puhui999
49b7bb1821 CRM-合同：完善合同表单 
(cherry picked from commit 90e0baf5bc)
 2024-03-11 12:45:47 +08:00
dhb52
b6fbecd32b feat: CRM-backlog-待进入公海的客户 
(cherry picked from commit 4a2349ecf5)
 2024-03-11 12:45:41 +08:00
puhui999
e04bb9e03e CRM-合同：完善合同表单 
(cherry picked from commit 331b6c5611)
 2024-03-11 12:45:23 +08:00
puhui999
0ada34de16 CRM-合同：完善合同表单 
(cherry picked from commit ed94205fa7)
 2024-03-11 12:45:19 +08:00
puhui999
227f69c95d CRM-联系人：完善联系人转移、数据权限 
(cherry picked from commit a64d4240a3)
 2024-03-11 12:45:14 +08:00
puhui999
d3f8d40e40 CRM：统一日志获取接口 
(cherry picked from commit 5adf75d15b)
 2024-03-11 12:45:01 +08:00
puhui999
9f599fb790 CRM-客户：完善客户导入 
(cherry picked from commit 26daa3a1ff)
 2024-03-11 12:44:37 +08:00
dhb52
1cc6adc49b fix: warning UnoCSS utilities are not ordered 
(cherry picked from commit acc3a6bcfd)
 2024-03-11 12:42:18 +08:00
shizhong
88d3a47b18 BUG 2024-03-08 22:00:26 +08:00
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