Commit Graph

1836 Commits

Author SHA1 Message Date
AhJindeg
c048dcf02a fix(role): 🐞 add nextTick for open
- 增加 nextTick(),修复在权限范围为指定机构并且已选择数据时,编辑打开提示 setChecked undefined 问题
2024-04-01 16:14:30 +08:00
芋道源码
6b45ed7e78
!406 适配顶部导航
Merge pull request !406 from 疯狂的世界/dev
2024-03-17 01:25:50 +00:00
owen
aa57d89bea Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 00:13:58 +08:00
owen
c5b1ad480f 适配顶部导航 2024-03-14 00:13:40 +08:00
芋道源码
1a0f0a11b1
!403 CRM:完善转移
Merge pull request !403 from puhui999/dev-crm
2024-03-09 10:35:39 +00:00
puhui999
d21c060903 CRM:完善转移 2024-03-09 17:57:24 +08:00
芋道源码
2ed41ab164
!401 build(package): add prettier-eslint@16.3.0 #392
Merge pull request !401 from AhJindeg/N/A
2024-03-09 09:00:46 +00:00
YunaiV
c89941d435 CRM:code review 客户总量统计 2024-03-09 16:51:42 +08:00
芋道源码
55856be1de
!394 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !394 from dhb52/dev
2024-03-09 08:37:59 +00:00
芋道源码
a6e29c5615
!400 fix(LoginForm): update doSocialLogin
Merge pull request !400 from AhJindeg/dev
2024-03-09 07:35:04 +00:00
芋道源码
4dabfcba23
!399 CRM:完善数据权限,实现数据权限同时添加、同时转移
Merge pull request !399 from puhui999/dev-crm
2024-03-09 07:21:16 +00:00
AhJindeg
53c63ba68f
build(package): 🔧 add prettier-eslint@16.3.0 #392
修复 settings.json 文件中设置格式化插件 rvest.vs-code-prettier-eslint 未生效问题。

Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2024-03-07 07:42:59 +00:00
AhJindeg
2d4ed85e94 fix(LoginForm): 🐞 update doSocialLogin
- 修复手动填写租户名称时,点击取消按钮,登录按钮 loading 状态未取消,并且会继续执行 LoginApi.socialAuthRedirect 方法
2024-03-07 14:38:31 +08:00
dhb52
470c5076a3 fix: 合同摘要信息(客户转化率页面) api 地址错误 2024-03-05 23:16:57 +08:00
dhb52
762b51a5b4 fix: [CRM-客户统计]根据Code-Review 修改 2024-03-04 23:51:42 +08:00
puhui999
13e925e29f CRM:完善数据权限,实现数据权限同时添加、同时转移 2024-03-03 20:11:52 +08:00
puhui999
3660cd26ae CRM: 完善回款合同回款计划编辑合同回显 2024-03-02 23:38:13 +08:00
puhui999
a31c995508 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-02 23:26:26 +08:00
dhb52
d0501ee0a6 feat: CRM/数据统计/员工客户分析 初稿 2024-03-01 00:10:38 +08:00
dhb52
3ddba81e24 Merge remote-tracking branch 'yudao/dev' into dev 2024-02-29 21:03:19 +08:00
YunaiV
1a5e7902b8 Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 23:07:45 +08:00
芋道源码
8d88f4206b
!395 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子
Merge pull request !395 from puhui999/dev-crm
2024-02-28 15:01:45 +00:00
芋道源码
035bccb472
!396 修复:回款管理-编辑:不显示合同名称
Merge pull request !396 from 李占宏/dev
2024-02-28 14:48:45 +00:00
puhui999
c9d5ec26a2 fix: 主子表 demo03 List props 2024-02-28 09:35:12 +08:00
dhb52
441b91381f feat: CRM/数据统计/客户总量分析 2024-02-27 23:45:13 +08:00
zhanhong
776846febc 修复:回款管理-编辑:不显示合同名称 2024-02-27 23:38:58 +08:00
puhui999
1694827c6c Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-02-27 23:36:16 +08:00
puhui999
32d5892422 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子 2024-02-27 23:34:32 +08:00
dhb52
0db264dcac Merge remote-tracking branch 'yudao/dev' into dev 2024-02-27 21:42:40 +08:00
dhb52
9e86e47c1c !391 perf: utils/formatDate.ts更好的ts类型
* perf: utils/formatDate.ts更好的ts类型
2024-02-27 12:36:49 +00:00
YunaiV
c0eaad3a4b 完善 MALL、CRM、ERP 文档说明 2024-02-26 21:12:31 +08:00
YunaiV
249fe126ee 完善 MALL、CRM、ERP 文档说明 2024-02-26 20:23:14 +08:00
YunaiV
c792e69aa5 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-02-26 12:24:57 +08:00
YunaiV
d220ffae6a CRM:增加回款的待办事项逻辑 2024-02-26 12:24:47 +08:00
dhb52
783f6283ca Merge remote-tracking branch 'yudao/dev' into dev 2024-02-25 21:07:23 +08:00
YunaiV
154f84a89e CRM:完善合同的待回款金额 2024-02-25 20:50:30 +08:00
YunaiV
25665f548e CRM:完善回款在合同、客户的引入 2024-02-25 20:23:10 +08:00
YunaiV
c5e5228e78 CRM:完善回款的详情 2024-02-25 19:34:52 +08:00
YunaiV
5369328b37 CRM:完善回款的新增/修改 2024-02-25 18:44:19 +08:00
YunaiV
70bf234133 CRM:完善回款列表 2024-02-25 16:52:07 +08:00
YunaiV
56d92e5bfb CRM:完善回款 plan 新增/修改 2024-02-25 16:09:22 +08:00
YunaiV
fee444d191 CRM:完善回款 plan 详情 2024-02-25 12:33:01 +08:00
YunaiV
5cb86589c6 CRM:完善回款 plan 列表 2024-02-25 09:23:36 +08:00
芋道源码
f30f71b775
!393 CRM:完善回款
Merge pull request !393 from puhui999/dev-crm
2024-02-25 00:15:58 +00:00
puhui999
174724da98 CRM:完善回款集成客户详情和合同详情 2024-02-25 02:10:21 +08:00
puhui999
d9e1ffd522 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-02-25 00:40:49 +08:00
puhui999
41e5cf667e CRM:完善回款 2024-02-25 00:35:50 +08:00
puhui999
6725318f27 CRM:完善回款计划 2024-02-24 23:01:29 +08:00
YunaiV
12972cdf5c CRM:将 bi 调整成 statistics 2024-02-24 22:26:10 +08:00
YunaiV
dcfe1abb67 CRM:增加商机关联联系人 2024-02-24 19:35:24 +08:00