yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,306 Commits
8 Branches
14 Tags
26 MiB
Commit Graph

1688 Commits (8d33476472ddd6667c72ba59f5e7f3f4319fe11c)

Author SHA1 Message Date
cherishsince cea5b8b138 【增加】chat 增加 modal 切换 2024-05-14 15:32:30 +08:00
cherishsince 27569a746e 【增加】对话 modal 拉取 2024-05-14 13:43:56 +08:00
cherishsince 20b7403a6a Merge remote-tracking branch 'origin/dev' into dev 2024-05-13 23:22:50 +08:00
cherishsince 6c1298f7ef 【优化】采用 marked 重写 md 渲染，增加 code 复制功能 2024-05-13 23:22:42 +08:00
YunaiV df60cb617f Merge remote-tracking branch 'origin/dev' into dev 2024-05-13 21:46:39 +08:00
YunaiV c16bcef5a6 【新增】AI：聊天角色管理（80%） 2024-05-13 21:46:32 +08:00
cherishsince ffc134d26c Merge remote-tracking branch 'origin/dev' into dev 2024-05-13 21:39:53 +08:00
cherishsince 5ec08e9758 【增加】markdown-it 渲染、增加 highlight 高亮 2024-05-13 21:38:18 +08:00
YunaiV 9e99807bd0 【新增】AI：聊天角色管理（50%） 2024-05-13 20:46:45 +08:00
cherishsince 10beee84fb 【增加】消息增加 marked 渲染 markdown 2024-05-13 18:26:28 +08:00
cherishsince 7f25419caf 【优化】处理空的对话，消息靠左问题 2024-05-13 17:52:39 +08:00
cherishsince b0de27a721 【增加】增加发送 stream 中可以进行取消 2024-05-13 17:49:18 +08:00
cherishsince c1b9baf8b6 【增加】stream 聊天进行中删除，调用 stream 控制器中断 2024-05-12 22:22:34 +08:00
cherishsince 151076a79e 【增加】增加 chat stream 功能(删除、复制、滚动删除、发送消息自动到最下面) 2024-05-12 19:02:45 +08:00
cherishsince b116d82376 【增加】增加 chat 聊天列表、删除、复制到粘贴板 2024-05-12 14:28:27 +08:00
YunaiV 73e8516024 【代码评审】CRM：优化员工业绩统计的实现 2024-05-11 22:30:44 +08:00
YunaiV 8ba6095b1b Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
 2024-05-11 22:22:27 +08:00
YunaiV 43dcefdcf0 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-11 22:20:19 +08:00
芋道源码 93bee8c82c
!445 解决部门管理页面中，重置按钮失效问题 
Merge pull request !445 from 刘岩Tony/N/A
 2024-05-11 13:59:08 +00:00
芋道源码 0385d4dbb3
!442 update src/views/Login/SocialLogin.vue. 
Merge pull request !442 from 天痕/N/A
 2024-05-11 13:58:56 +00:00
芋道源码 aefee5211a
!443 update src/views/Login/SocialLogin.vue. 
Merge pull request !443 from 天痕/N/A
 2024-05-11 13:57:12 +00:00
YunaiV dd2c4b6b3c 【新增】AI：API 模型管理（完善） 2024-05-11 19:46:33 +08:00
scholar f01dc0a539 优化代码实现。 2024-05-11 11:26:47 +08:00
cherishsince b19d56ad02 【优化】调整 right 对话 头像距离问题 2024-05-10 23:38:44 +08:00
cherishsince 0887c46f14 Merge remote-tracking branch 'origin/dev' into dev 2024-05-10 23:36:05 +08:00
cherishsince 9d322c3a94 【添加】调整ui 增加 chat对话和发送 2024-05-10 23:35:47 +08:00
YunaiV 1776217f1c 【新增】AI：API 模型管理 2024-05-10 22:48:33 +08:00
YunaiV 02fe7e31d0 【新增】AI：API 密钥管理 2024-05-09 23:02:57 +08:00
cherishsince 5525bc2257 【优化】优化 ai chat 主框架布局 2024-05-09 22:13:23 +08:00
刘岩Tony 742456dd87
解决部门管理页面中，重置按钮失效问题 
部门名称中的prop属性值写错了，会导致重置按钮不生效，已做相应更改

Signed-off-by: 刘岩Tony <345006662@qq.com>
 2024-05-08 06:14:01 +00:00
syubun 657ad506a4 oa请假，修复列表展示的状态字段取值错误 2024-05-08 09:44:47 +08:00
YunaiV 760bab7d29 【修复】全局：id=0导致sqlserver的insert失败 2024-05-07 22:18:43 +08:00
YunaiV 3976e49e35 【新增】AI：新增 chat 对话界面（草稿状态） 2024-05-07 21:59:47 +08:00
天痕 7092e24098
update src/views/Login/SocialLogin.vue. 
这里应该取反

Signed-off-by: 天痕 <614891294@qq.com>
 2024-05-07 09:10:43 +00:00
天痕 eeae01e661
update src/views/Login/SocialLogin.vue. 
这里已经是布尔值了，不用在判断为布尔值

Signed-off-by: 天痕 <614891294@qq.com>
 2024-05-07 09:08:28 +00:00
YunaiV 9402b29684 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-07 09:13:25 +08:00
dhb52 0fb70607d9 fix: id=0导致sqlserver的insert失败 2024-05-06 23:28:33 +08:00
芋道源码 a60826529b
!440 fix: id=0导致sqlserver新增菜单失败 
Merge pull request !440 from dhb52/N/A
 2024-05-06 14:53:17 +00:00
dhb52 c350fc466e
fix: id=0导致sqlserver新增菜单失败 
Signed-off-by: dhb52 <dhb52@126.com>
 2024-05-06 14:43:52 +00:00
山野羡民 2101731f0b
update src/views/mall/statistics/product/components/ProductSummary.vue. 
商品统计计数显示有问题，数量显示成价格了

Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
 2024-05-06 01:55:15 +00:00
puhui999 bcf2f7a5dc Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-06 02:12:39 +08:00
YunaiV 66c6463f44 【修复】商城：seckill 导致打包失败的问题 2024-05-05 11:20:08 +08:00
scholar 449d1191ff fix同比环比数据计算的bug。 2024-05-04 22:28:37 +08:00
YunaiV f4705ad4e1 【发版】全局：2.1.0 发版 2024-05-04 21:51:06 +08:00
YunaiV bbf009e15d 【优化】首页增加“项目说明” 2024-05-04 11:14:11 +08:00
芋道源码 869cae0675
!437 update src/views/infra/webSocket/index.vue. #434 
Merge pull request !437 from AhJindeg/N/A
 2024-05-02 07:14:15 +00:00
YunaiV e2fe04749b 【修复】商城系统：管理后台的商城订单统计数据有问题 2024-05-02 09:24:45 +08:00
YunaiV 20a9780654 【修复】商城：秒杀时段点击编辑报错 2024-05-01 20:53:01 +08:00
puhui999 51e6887bde Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-01 14:52:16 +08:00
AhJindeg de967a0160
update src/views/infra/webSocket/index.vue. #434 
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
 2024-04-30 08:50:55 +00:00
YunaiV 9527b41b62 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-30 15:04:41 +08:00
puhui999 1f1ac1f246 使用 tsx 封装 form-create 通用选择组件 2024-04-30 14:15:44 +08:00
puhui999 769b63d9ca form-create：移除自带的下拉选择器组件，使用 currencySelectRule 替代 2024-04-30 00:07:25 +08:00
YunaiV 500b8632df 【优化】增加 pnpm-lock 保证大家更好的打包 2024-04-29 21:47:49 +08:00
puhui999 0076236280 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-25 22:34:14 +08:00
YunaiV f55c9b7273 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-24 23:01:05 +08:00
puhui999 6ff31b90c7 CRM: 修复客户导入 2024-04-24 22:55:14 +08:00
YunaiV a0996bd0cf 【优化】移除 env 多余的 VITE_API_BASEPATH 配置项 2024-04-24 21:50:21 +08:00
YunaiV f405ac3293 【优化】新增 sslEnable 字段，支持 outlook 邮箱 2024-04-24 09:14:43 +08:00
YunaiV 1d533e49e4 crm：bugfix FunnelBusiness.vue 导致打包失败的问题 2024-04-24 00:31:44 +08:00
YunaiV dee479ce3c Merge remote-tracking branch 'origin/dev' into dev 2024-04-23 23:31:58 +08:00
YunaiV 715f37eb0b crm：code review 员工业绩统计 2024-04-23 23:31:52 +08:00
YunaiV 56543b8db4 Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
 2024-04-23 23:17:15 +08:00
YunaiV 7f3950018e Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 
# Conflicts:
#	src/api/infra/codegen/index.ts
#	src/views/system/sensitiveWord/index.vue
 2024-04-23 00:28:26 +08:00
芋道源码 d26e0976db
!430 bugfix：修复角色管理页面-角色类型字段没有被字典翻译问题 
Merge pull request !430 from limz/bugfix-pull
 2024-04-22 16:27:11 +00:00
YunaiV 0925253a9d 【移除】敏感词的管理，简化项目的复杂度 2024-04-22 19:52:05 +08:00
YunaiV 98bf5a102e 【移除】错误码的管理，简化项目的复杂度 2024-04-22 19:42:56 +08:00
YunaiV ff0c12c551 【移除】数据库文档，简化项目的复杂度 2024-04-22 19:13:57 +08:00
puhui999 243da124a8 fix: 调整价格弹窗不出来问题 2024-04-22 11:35:28 +08:00
puhui999 deb4585d4b fix: 适配 echarts map 的地名 2024-04-22 11:04:53 +08:00
scholar f4dd1bed63 1, 修改数据列表无法刷新的问题； 
2， 修改时间选择，后端按照年实现的，前端同样按照年份选择实现；
3，修改环比同比计算；
4，回款金额统计bug修复。
 2024-04-19 17:46:09 +08:00
limingz d96f951113 bugfix：修复角色管理页面-角色类型字段没有被字典翻译问题 2024-04-18 14:45:43 +08:00
YunaiV f5d013187b crm：code review 销售漏斗 2024-04-18 09:28:07 +08:00
芋道源码 50ab864698
!428 CRM: 新增商机赢单转化率分析 
Merge pull request !428 from puhui999/dev-crm
 2024-04-18 01:10:12 +00:00
AhJindeg ac6618a943 fix: 🐞 fix sensitiveWord hasPermi value 2024-04-16 18:24:56 +08:00
AhJindeg decdd1b25d fix: 🐞 fix post hasPermi value 2024-04-16 18:24:36 +08:00
AhJindeg 97c8cefb7d fix: 🐞 fix operatelog hasPermi value 2024-04-16 18:24:16 +08:00
AhJindeg bfb69ccccd fix: 🐞 fix template hasPermi value 2024-04-16 18:23:57 +08:00
AhJindeg 958ec41f4e fix: 🐞 fix loginlog hasPermi value 2024-04-16 18:23:39 +08:00
AhJindeg dc5bede084 fix: 🐞 fix fileConfig hasPermi value 2024-04-16 18:23:24 +08:00
AhJindeg 755526834e fix: 🐞 fix file hasPermi value 2024-04-16 18:23:08 +08:00
AhJindeg 221f78aa9a fix: 🐞 fix apiAccessLog hasPermi value 2024-04-16 18:22:46 +08:00
puhui999 4e640bae88 CRM: 新增商机赢单转化率分析 2024-04-15 16:38:24 +08:00
puhui999 014d1f8cd2 CRM: 新增商机赢单转化率分析 2024-04-15 16:32:48 +08:00
puhui999 6acfc77d08 CRM: 完善销售漏斗 2024-04-15 15:37:37 +08:00
YunaiV c331a83b74 crm：code review 销售漏斗 2024-04-14 21:21:52 +08:00
芋道源码 56829ff921
!426 CRM: 完善销售漏斗分析 
Merge pull request !426 from puhui999/dev-crm
 2024-04-14 12:19:51 +00:00
芋道源码 6037ac4052
!419 feat: 客户成交周期分析(按区域、按产品) 
Merge pull request !419 from dhb52/dev
 2024-04-14 10:23:40 +00:00
芋道源码 aba61120e4
!421 fix(UserImportForm): fix a bunch of bugs 
Merge pull request !421 from AhJindeg/hotfix-UserImportForm
 2024-04-14 10:18:31 +00:00
puhui999 bc95dc2959 CRM: 完善新增商机分析 2024-04-14 16:31:43 +08:00
puhui999 3c49ed570a CRM: 完善销售漏斗分析 2024-04-14 00:34:33 +08:00
zhanhong 2f0fdd1d36 fix:移除多余的代码 2024-04-13 12:39:41 +08:00
puhui999 2d7bab8adb CRM: 完善用户画像数据统计 2024-04-13 11:04:56 +08:00
puhui999 64af029c86 CRM: 完善用户画像数据统计 2024-04-11 15:25:48 +08:00
AhJindeg 4793897511 fix(UserImportForm): 🐞 add update formLoading and dialogVisible to submitFormSuccess 2024-04-11 11:03:06 +08:00
AhJindeg 786468f437 fix(UserImportForm): 🐞 add init updateSupport to open 2024-04-11 11:00:24 +08:00
AhJindeg 4c15e6675a fix(UserImportForm): 🐞 add nextTick to resetForm 2024-04-10 18:09:43 +08:00
dhb52 5358863fc6 refactor: 统一处理null数据为'未知' 2024-04-09 18:47:31 +08:00
dhb52 0e15d6c9d2 feat: 客户成交周期分析(按区域、按产品) 2024-04-09 00:21:10 +08:00
芋道源码 f6e4753b34
!414 fix(role): add nextTick for open 
Merge pull request !414 from AhJindeg/hotfix-role
 2024-04-07 13:28:38 +00:00
YunaiV e8a3745b5e crm：code review 公海客户分析 2024-04-07 21:27:29 +08:00
芋道源码 091ce90359
!417 feat: 增加[客户公海分析]tab 
Merge pull request !417 from dhb52/dev
 2024-04-07 13:17:35 +00:00
AhJindeg b5fa188805 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into hotfix-role 
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
 2024-04-06 14:37:34 +00:00
YunaiV 8f8edc9565 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-06 19:39:14 +08:00
dhb52 3c54f5f565 feat: 增加[客户公海分析]tab 2024-04-06 15:38:50 +08:00
dhb52 13cf1feefb refactor: 使用try finally停止loading 2024-04-06 15:38:04 +08:00
YunaiV 6772568a58 crm：code review 客户画像 2024-04-05 14:43:55 +08:00
芋道源码 8926dd1173
!415 CRM: 完善用户画像数据统计 
Merge pull request !415 from puhui999/dev-crm
 2024-04-05 05:54:06 +00:00
YunaiV dcfad7a427 crm：code review 员工业绩的前端 2024-04-05 13:53:14 +08:00
AhJindeg db4795744e style: 🌈 add more readable for open 2024-04-05 13:51:27 +08:00
芋道源码 f17dfb9a31
!416 CRM员工业绩统计分析v2.0 
Merge pull request !416 from scholarli/dev
 2024-04-05 05:45:09 +00:00
AhJindeg 7b84ddd358 perf: 🎈 add await for nextTick() 2024-04-04 18:54:51 +08:00
YunaiV 283a9d0507 【新增】system user 和 role 接入新操作日志 2024-04-04 09:57:25 +08:00
YunaiV c01571d11d 【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:21:27 +08:00
YunaiV 757281ce34 【优化】增强访问日志，支持是否记录、脱敏、操作信息等功能 2024-04-03 19:55:54 +08:00
scholar b57a2c50a9 CRM员工业绩统计分析v2.0 2024-04-03 18:43:34 +08:00
puhui999 36385a74ba CRM: 完善用户画像数据统计 2024-04-03 12:19:09 +08:00
AhJindeg c048dcf02a fix(role): 🐞 add nextTick for open 
- 增加 nextTick()，修复在权限范围为指定机构并且已选择数据时，编辑打开提示 setChecked undefined 问题
 2024-04-01 16:14:30 +08:00
puhui999 d16bed4ad7 form-create-designer: 表单组件新增用户选择器 2024-03-31 17:58:44 +08:00
YunaiV d05c67ffaa infra：code review 表单增强 2024-03-30 21:15:01 +08:00
YunaiV ffc81621d7 REPORT：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差 2024-03-30 20:41:32 +08:00
puhui999 a489d21add Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-30 18:53:30 +08:00
puhui999 bc004b3b27 使用项目组件对 form-create-designer 进行增强 2024-03-30 18:53:05 +08:00
芋道源码 52889e3504
!411 SYSTEM：修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误 
Merge pull request !411 from aqiangaqiang/master
 2024-03-30 07:56:52 +00:00
芋道源码 02af138069
!402 修复数据权限无法回显的问题 
Merge pull request !402 from moon69/master
 2024-03-30 07:50:38 +00:00
YunaiV 427c2d5d2a MALL：修复营销的商品范围枚举不正确的问题 2024-03-30 15:42:28 +08:00
YunaiV 87d1047fa9 CRM：code review【客户画像】的实现 2024-03-30 14:17:14 +08:00
YunaiV 34b788cb88 Merge branch 'dev-crm' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/views/bpm/definition/index.vue
#	src/views/bpm/model/index.vue
#	src/views/bpm/processInstance/create/index.vue
#	src/views/crm/statistics/customer/index.vue
 2024-03-30 12:54:51 +08:00
YunaiV 291dc51849 CRM：完善【排行版】功能 2024-03-30 11:48:41 +08:00
YunaiV 1b7d604858 CRM：code review【客户统计】的代码实现 2024-03-30 11:02:29 +08:00
YunaiV b51397fe19 CRM：优化【客户统计】的代码实现 2024-03-30 09:23:02 +08:00
sunva 68e1556378 SYSTEM：修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误 2024-03-29 17:06:56 +08:00
YunaiV 23150fcfc3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	package.json
 2024-03-28 19:30:02 +08:00
YunaiV 9f3bc1ead8 BPM：修复 bpmnxml 为空时，展示的 key 被覆盖的问题 2024-03-27 18:51:06 +08:00
YunaiV 607c2b6c4a BPM：完善文档说明 2024-03-27 09:41:00 +08:00
puhui999 3820710c56 二次封装 form-create 组件，使用项目重新封装的文件上传组件实现文件上载 2024-03-26 10:59:03 +08:00
puhui999 cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2024-03-24 22:22:09 +08:00
YunaiV 77971f9c96 Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-03-24 10:47:04 +08:00
YunaiV eed7bb2e1a BPM：流程模型的 icon 维护 2024-03-24 10:08:59 +08:00
YunaiV cc14963bc8 BPM：增加流程表达式的管理 2024-03-23 21:12:09 +08:00
YunaiV faf4557783 BPM：增加任务监听器、执行监听器的管理 2024-03-23 15:58:38 +08:00
YunaiV 728cf15c45 BPM：增加「发起人自选」的任务审批人的分配策略 2024-03-23 00:54:33 +08:00
YunaiV 48f6624737 BPM：新增【流程任务】菜单，用于全部流程任务的查询 2024-03-22 09:07:04 +08:00
YunaiV 5286ad1cd6 BPM：新增【流程实例】菜单，用于全部流程实例的查询 2024-03-22 08:26:26 +08:00
jason ee12e691be 暂时去掉原有设计器的审批人设置, 避免缺少资源报错。后续需要改造 2024-03-21 21:14:16 +08:00
YunaiV 05b408d107 BPM：新增流程的重新发起 2024-03-21 00:34:10 +08:00
jason 0d4b6f6344 流程模型中增加仿钉钉设计器入口 2024-03-20 22:26:35 +08:00
YunaiV d16194b794 BPM：优化 task 审批详情界面，增加开始时间、结束时间的展示 2024-03-20 21:33:48 +08:00
YunaiV d0f73344bf BPM：增强 model 流程模型部署时，各种参数校验 2024-03-20 18:51:49 +08:00
YunaiV 08dd4ed072 BPM：支持多表单，每个流程任务都可以绑定流程表单 2024-03-20 12:50:59 +08:00
YunaiV 501a1c2f4d BPM：新增流程分类表，替代现有的 `bpm_category` 数据字典 2024-03-19 19:49:52 +08:00
YunaiV a0f157c8b6 BPM：简化 userGroup 的实现 2024-03-19 12:13:54 +08:00
YunaiV 2d424fc9a6 BPM：优化 task 加减签的实现 2024-03-19 01:31:51 +08:00
YunaiV a40866e27f BPM：完善 task 转派的实现 2024-03-18 20:45:39 +08:00
YunaiV 60ddc45b9b BPM：增加 task 的审批建议 2024-03-18 18:41:11 +08:00
YunaiV 03b8bd5e22 BPM：调整抄送逻辑的实现，改成审批通过、不通过时，可选择抄送 2024-03-17 22:14:28 +08:00
YunaiV de29528165 BPM：简化 task 接口的 VO，做一些合并。虽然字段上有冗余，但是读代码难度降低 2024-03-17 17:25:40 +08:00
YunaiV 59c7c49efa BPM：流程实例的 `status` 状态实现，使用 Flowable 的 `variables` 存储，移除 `bpm_process_instance_ext` 表 2024-03-16 16:43:47 +08:00
YunaiV 5f7ccd4e7c BPM：重构流程分配人的实现，通过 BpmTaskCandidateStrategy 策略模式 2024-03-15 00:19:23 +08:00
YunaiV feadd022e7 BPM：重构审批人的分配规则实现，移除 bpm_task_assign_rule 表，存储在 bpmn 的 userTask 中 2024-03-13 21:18:26 +08:00
moon69 4c0a5e8c30 修复数据权限无法回显的问题 2024-03-10 11:59:49 +08:00
dhb52 b0d4c87d8e feat: [CRM-客户分析]增加[时间间隔]选项 2024-03-10 10:30:32 +08:00
puhui999 d21c060903 CRM：完善转移 2024-03-09 17:57:24 +08:00
moon69 0230a4af01 修复数据权限无法回显的问题 2024-03-09 17:38:56 +08: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
AhJindeg 2d4ed85e94 fix(LoginForm): 🐞 update doSocialLogin 
- 修复手动填写租户名称时，点击取消按钮，登录按钮 loading 状态未取消，并且会继续执行 LoginApi.socialAuthRedirect 方法
 2024-03-07 14:38:31 +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
YunaiV 74a66b7c70 Merge remote-tracking branch 'origin/master' 2024-02-29 22:42:53 +08:00
YunaiV 1bc4eefeab 修复记住密码失效的问题 2024-02-29 22:42:10 +08:00
dhb52 3ddba81e24 Merge remote-tracking branch 'yudao/dev' into dev 2024-02-29 21:03:19 +08:00
moon69 ca8858a33f
修正校验文本错误 
Signed-off-by: moon69 <1016830869@qq.com>
 2024-02-29 05:40:40 +00:00
YunaiV 1a5e7902b8 Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 23:07:45 +08: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
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 d220ffae6a ✨ CRM：增加回款的待办事项逻辑 2024-02-26 12:24:47 +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
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
YunaiV 6caa94ec47 ✨ CRM：待办事项（接入合同） 2024-02-24 17:55:34 +08:00
YunaiV 8f8591fc45 ✨ CRM：增加合同配置表 2024-02-24 16:51:25 +08:00
YunaiV 43bdb3cdba ✨ CRM：商机接入合同列表 2024-02-24 16:08:00 +08:00
YunaiV 7164ae5d49 ✨ CRM：完善 CRM 跟进记录（联系人的展示、添加） 2024-02-24 15:46:36 +08:00
YunaiV 28eb23738c ✨ CRM：完善 CRM 跟进记录（商机的展示、添加） 2024-02-24 15:19:03 +08:00
YunaiV a9e4ef9b7b ✨ CRM：完善 CRM 相关实现（产品） 2024-02-24 09:50:35 +08:00
YunaiV 56db6bf307 ✨ CRM：完善 CRM 相关实现 2024-02-24 08:18:36 +08:00
YunaiV c1f507bcae ✨ CRM：完善合同的审批逻辑 2024-02-23 12:58:39 +08:00
YunaiV 9acd01e768 ✨ CRM：完善合同的跟进记录实现 2024-02-23 09:31:48 +08:00
YunaiV 3bfdb2df33 ✨ CRM：完善合同的新增、修改需求 2024-02-23 00:20:14 +08:00
YunaiV 9d44b9acaa ✨ CRM：完善合同的新增、修改需求 2024-02-23 00:06:03 +08:00
YunaiV 11766f5107 ✨ CRM：完善合同的列表实现 2024-02-22 21:53:39 +08:00
YunaiV bbf6c16b8d ✨ CRM：完成商机状态的变更 2024-02-22 20:41:37 +08:00
YunaiV cf7036d34b ✨ CRM：完善商机产品的展示列表 2024-02-22 12:45:15 +08:00
YunaiV 8512fe6b43 ✨ CRM：完善商机和联系人之间的关联 2024-02-22 09:35:35 +08:00
YunaiV 01684aa6e8 ✨ CRM：完善商机的详情、跟进记录、操作日志、团队成员 2024-02-22 08:32:07 +08:00
YunaiV 29605800b5 ✨ CRM：完善商机的新增、修改逻辑 2024-02-21 21:49:55 +08:00
YunaiV 6baeadc87a ✨ CRM：完善商机状态的实现 2024-02-21 21:13:30 +08:00
YunaiV a2443e48f7 ✨ CRM：完善商机的列表 2024-02-21 18:44:54 +08:00
YunaiV 08bb022cb5 ✨ CRM：完善联系人的编辑、详情 2024-02-20 23:31:52 +08:00
YunaiV 094b1925d6 ✨ CRM：完善联系人的列表 2024-02-20 21:18:38 +08:00
YunaiV a401fff74c ✨ CRM：完成客户的分配接入 2024-02-20 20:19:11 +08:00
YunaiV 4362251b59 ✨ CRM：优化客户的详情、更新成交状态 2024-02-20 12:55:33 +08:00
YunaiV ac9a77e6e4 ✨ CRM：优化客户的列表、编辑的样式 2024-02-20 09:35:48 +08:00
YunaiV 04a42bc6d4 📖 CRM：线索的跟进逻辑 2024-02-19 22:47:35 +08:00
YunaiV 0ae6139e92 📖 CRM：线索的转化逻辑 2024-02-19 20:40:37 +08:00
YunaiV 1047c5b097 📖 CRM：线索 clue 新增/修改的完善 2024-02-19 19:02:03 +08:00
YunaiV e7bb17dc4e 📖 CRM：线索 clue 列表的完善 2024-02-19 13:02:48 +08:00
芋道源码 c804ec5e7a
!387 feat: CRM/backlog 提醒数量 
Merge pull request !387 from dhb52/crm-msg
 2024-02-18 13:49:08 +00:00
YunaiV f01bb2dc78 🐛 bugfix：无法打包问题，原因：import clone 从 unocss 导致 2024-02-18 20:58:01 +08:00
YunaiV cd86c08e59 📖 ERP：增加 ERP 首页的统计 2024-02-18 19:05:57 +08:00
dhb52 e067d5073d feat: CRM/backlog 提醒数量 2024-02-18 00:04:43 +08:00
dhb52 42b8df4767 refactor: 清理【待回款提醒】页面代码 2024-02-18 00:04:15 +08:00
YunaiV 71ac59f22e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-02-17 20:41:43 +08:00
芋道源码 a3b21e70dc
!375 修复权限范围默认展开，deptExpand 却默认折叠的问题 
Merge pull request !375 from moon69/N/A
 2024-02-17 12:41:36 +00:00
芋道源码 1549a57c4b
!385 fix: 用户头像、昵称修改，同步更新Layout/UserInfo 
Merge pull request !385 from dhb52/hotfix/dhb52/avatarupdate
 2024-02-17 12:37:34 +00:00
芋道源码 ffeaa891df
!382 基础设施：前端直连上传文件 
Merge pull request !382 from 疯狂的世界/dev
 2024-02-17 11:34:00 +00:00
dhb52 a3e95b56ca fix: 用户头像、昵称修改 2024-02-17 19:19:51 +08:00
芋道源码 b603515855
!383 新增：CRM 商业智能，其他排名接口 
Merge pull request !383 from 安浩浩/dev
 2024-02-17 10:03:59 +00:00
YunaiV 06e2019adf 📖 CRM：code review 待办项目的实现 2024-02-17 18:02:40 +08:00
YunaiV 2f37232f5e Merge remote-tracking branch 'origin/dev' into dev 2024-02-17 16:45:08 +08:00
YunaiV 6e9e9e88a8 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-02-17 16:44:59 +08:00
芋道源码 a0497a6485
!384 feat: 待回款提醒,即将到期的合同,待审核回款 
Merge pull request !384 from dhb52/crm-msg
 2024-02-17 08:43:34 +00:00
芋道源码 96071bdcb7
!379 【轻PR】label错误 
Merge pull request !379 from NiceShow/master
 2024-02-17 08:41:07 +00:00
芋道源码 a451c0b7c8
!311 修复DocAlert无法配置是否启用的问题 
Merge pull request !311 from dhb52/master
 2024-02-17 03:45:58 +00:00
YunaiV bb6d6dac79 ✨ 增加 ERP 系统的介绍 2024-02-17 10:12:01 +08:00
dhb52 c1c48c20a3 refactor: TodayCustomer利用CustomerApi 2024-02-16 22:38:06 +08:00
YunaiV c18b24e611 ✨ ERP：初始化 receipt 收款单的逻辑 100% 2024-02-16 08:13:25 +08:00
YunaiV e07e19106c ✨ ERP：销售订单的 receiptPrice 调整，为接入财务的收款单做准备 2024-02-15 09:16:18 +08:00
dhb52 a2de0665eb fix: Backlog侧边栏样式黑暗模式显示问题 2024-02-14 23:28:25 +08:00
YunaiV e951ed1bd1 ✨ ERP：完成 payment 付款单的逻辑 100% 2024-02-14 17:13:55 +08:00
YunaiV 8a70b3fbba ✨ ERP：付款单 60%（接入）【可付款的采购入库单列表】 2024-02-14 15:20:17 +08:00