1806 Commits (5a93b48c90781f74714cc3f4b585c1a4a04e809c)

Author SHA1 Message Date
scholar f4dd1bed63 1, 修改数据列表无法刷新的问题;
2, 修改时间选择,后端按照年实现的,前端同样按照年份选择实现;
3,修改环比同比计算;
4,回款金额统计bug修复。
2 years ago
limingz d96f951113 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题 2 years ago
YunaiV f5d013187b crm:code review 销售漏斗 2 years ago
芋道源码 50ab864698
!428 CRM: 新增商机赢单转化率分析
Merge pull request !428 from puhui999/dev-crm
2 years ago
AhJindeg ac6618a943 fix: 🐞 fix sensitiveWord hasPermi value 2 years ago
AhJindeg decdd1b25d fix: 🐞 fix post hasPermi value 2 years ago
AhJindeg 97c8cefb7d fix: 🐞 fix operatelog hasPermi value 2 years ago
AhJindeg bfb69ccccd fix: 🐞 fix template hasPermi value 2 years ago
AhJindeg 958ec41f4e fix: 🐞 fix loginlog hasPermi value 2 years ago
AhJindeg dc5bede084 fix: 🐞 fix fileConfig hasPermi value 2 years ago
AhJindeg 755526834e fix: 🐞 fix file hasPermi value 2 years ago
AhJindeg 221f78aa9a fix: 🐞 fix apiAccessLog hasPermi value 2 years ago
puhui999 4e640bae88 CRM: 新增商机赢单转化率分析 2 years ago
puhui999 014d1f8cd2 CRM: 新增商机赢单转化率分析 2 years ago
puhui999 6acfc77d08 CRM: 完善销售漏斗 2 years ago
moon69 033462d25f
修复第四个导航模式无法点开菜单的问题
Signed-off-by: moon69 <1016830869@qq.com>
2 years ago
YunaiV c331a83b74 crm:code review 销售漏斗 2 years ago
芋道源码 56829ff921
!426 CRM: 完善销售漏斗分析
Merge pull request !426 from puhui999/dev-crm
2 years ago
芋道源码 6037ac4052
!419 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !419 from dhb52/dev
2 years ago
芋道源码 1c469300f5
!422 Infra模块>代码生成器>适配达梦数据库
Merge pull request !422 from 再见七月/infraBug-by-dm
2 years ago
芋道源码 aba61120e4
!421 fix(UserImportForm): fix a bunch of bugs
Merge pull request !421 from AhJindeg/hotfix-UserImportForm
2 years ago
puhui999 bc95dc2959 CRM: 完善新增商机分析 2 years ago
puhui999 3c49ed570a CRM: 完善销售漏斗分析 2 years ago
zhanhong 2f0fdd1d36 fix:移除多余的代码 2 years ago
puhui999 2d7bab8adb CRM: 完善用户画像数据统计 2 years ago
puhui999 64af029c86 CRM: 完善用户画像数据统计 2 years ago
AhJindeg 4793897511 fix(UserImportForm): 🐞 add update formLoading and dialogVisible to submitFormSuccess 2 years ago
AhJindeg 786468f437 fix(UserImportForm): 🐞 add init updateSupport to open 2 years ago
byeJuly 1f517c3faf 修复 Infra 模块:
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因:
调整策略:删除-> autoIncrement <-字段
2 years ago
AhJindeg 4c15e6675a fix(UserImportForm): 🐞 add nextTick to resetForm 2 years ago
dhb52 5358863fc6 refactor: 统一处理null数据为'未知' 2 years ago
dhb52 0e15d6c9d2 feat: 客户成交周期分析(按区域、按产品) 2 years ago
芋道源码 f6e4753b34
!414 fix(role): add nextTick for open
Merge pull request !414 from AhJindeg/hotfix-role
2 years ago
YunaiV e8a3745b5e crm:code review 公海客户分析 2 years ago
芋道源码 091ce90359
!417 feat: 增加[客户公海分析]tab
Merge pull request !417 from dhb52/dev
2 years ago
AhJindeg b5fa188805 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into hotfix-role
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2 years ago
YunaiV 8f8edc9565 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
dhb52 3c54f5f565 feat: 增加[客户公海分析]tab 2 years ago
dhb52 13cf1feefb refactor: 使用try finally停止loading 2 years ago
YunaiV 6772568a58 crm:code review 客户画像 2 years ago
芋道源码 8926dd1173
!415 CRM: 完善用户画像数据统计
Merge pull request !415 from puhui999/dev-crm
2 years ago
YunaiV dcfad7a427 crm:code review 员工业绩的前端 2 years ago
AhJindeg db4795744e style: 🌈 add more readable for open 2 years ago
芋道源码 f17dfb9a31
!416 CRM员工业绩统计分析v2.0
Merge pull request !416 from scholarli/dev
2 years ago
AhJindeg 7b84ddd358 perf: 🎈 add await for nextTick() 2 years ago
YunaiV 283a9d0507 【新增】system user 和 role 接入新操作日志 2 years ago
YunaiV c01571d11d 【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件 2 years ago
YunaiV 757281ce34 【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能 2 years ago
scholar b57a2c50a9 CRM员工业绩统计分析v2.0 2 years ago
puhui999 36385a74ba CRM: 完善用户画像数据统计 2 years ago
AhJindeg c048dcf02a fix(role): 🐞 add nextTick for open
- 增加 nextTick(),修复在权限范围为指定机构并且已选择数据时,编辑打开提示 setChecked undefined 问题
2 years ago
puhui999 d16bed4ad7 form-create-designer: 表单组件新增用户选择器 2 years ago
puhui999 68dae2d1fe form-create-designer: 表单组件新增字典选择器 2 years ago
YunaiV d05c67ffaa infra:code review 表单增强 2 years ago
YunaiV ffc81621d7 REPORT:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差 2 years ago
puhui999 a489d21add Merge remote-tracking branch 'yudao/dev' into dev-crm 2 years ago
puhui999 bc004b3b27 使用项目组件对 form-create-designer 进行增强 2 years ago
芋道源码 52889e3504
!411 SYSTEM:修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误
Merge pull request !411 from aqiangaqiang/master
2 years ago
芋道源码 6764f86980
!409 fix(crontab): add inputChange for crontab
Merge pull request !409 from AhJindeg/hotfix-crontab
2 years ago
芋道源码 02af138069
!402 修复数据权限无法回显的问题
Merge pull request !402 from moon69/master
2 years ago
YunaiV 427c2d5d2a MALL:修复营销的商品范围枚举不正确的问题 2 years ago
YunaiV 87d1047fa9 CRM:code review【客户画像】的实现 2 years ago
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
2 years ago
YunaiV 291dc51849 CRM:完善【排行版】功能 2 years ago
YunaiV 1b7d604858 CRM:code review【客户统计】的代码实现 2 years ago
YunaiV b51397fe19 CRM:优化【客户统计】的代码实现 2 years ago
sunva 68e1556378 SYSTEM:修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误 2 years ago
YunaiV 23150fcfc3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	package.json
2 years ago
芋道源码 1f14bf4bda
!404 feat: [CRM-客户分析]增加[时间间隔]选项
Merge pull request !404 from dhb52/dev
2 years ago
YunaiV 9f3bc1ead8 BPM:修复 bpmnxml 为空时,展示的 key 被覆盖的问题 2 years ago
YunaiV 607c2b6c4a BPM:完善文档说明 2 years ago
puhui999 3820710c56 二次封装 form-create 组件,使用项目重新封装的文件上传组件实现文件上载 2 years ago
puhui999 cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2 years ago
YunaiV 77971f9c96 Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2 years ago
YunaiV 624594bb5c BPM:处理打开 bpmn 设计器时,key 和 name 覆盖更新 2 years ago
YunaiV eed7bb2e1a BPM:流程模型的 icon 维护 2 years ago
YunaiV cc14963bc8 BPM:增加流程表达式的管理 2 years ago
YunaiV 7218e71884 BPM:增加任务监听器、执行监听器的管理 2 years ago
YunaiV faf4557783 BPM:增加任务监听器、执行监听器的管理 2 years ago
YunaiV 728cf15c45 BPM:增加「发起人自选」的任务审批人的分配策略 2 years ago
YunaiV 48f6624737 BPM:新增【流程任务】菜单,用于全部流程任务的查询 2 years ago
YunaiV 5286ad1cd6 BPM:新增【流程实例】菜单,用于全部流程实例的查询 2 years ago
jason ee12e691be 暂时去掉原有设计器的审批人设置, 避免缺少资源报错。后续需要改造 2 years ago
AhJindeg c2f98043df fix: 🐞 add inputChange for crontab 2 years ago
YunaiV 05b408d107 BPM:新增流程的重新发起 2 years ago
jason 0d4b6f6344 流程模型中增加仿钉钉设计器入口 2 years ago
jason 07dc725857 整合仿钉钉流程设计器 https://github.com/StavinLi/Workflow-Vue3 2 years ago
YunaiV d16194b794 BPM:优化 task 审批详情界面,增加开始时间、结束时间的展示 2 years ago
YunaiV d0f73344bf BPM:增强 model 流程模型部署时,各种参数校验 2 years ago
YunaiV 08dd4ed072 BPM:支持多表单,每个流程任务都可以绑定流程表单 2 years ago
YunaiV 501a1c2f4d BPM:新增流程分类表,替代现有的 `bpm_category` 数据字典 2 years ago
YunaiV a0f157c8b6 BPM:简化 userGroup 的实现 2 years ago
YunaiV 2d424fc9a6 BPM:优化 task 加减签的实现 2 years ago
YunaiV a40866e27f BPM:完善 task 转派的实现 2 years ago
YunaiV 60ddc45b9b BPM:增加 task 的审批建议 2 years ago
YunaiV 03b8bd5e22 BPM:调整抄送逻辑的实现,改成审批通过、不通过时,可选择抄送 2 years ago
YunaiV de29528165 BPM:简化 task 接口的 VO,做一些合并。虽然字段上有冗余,但是读代码难度降低 2 years ago
YunaiV 59c7c49efa BPM:流程实例的 `status` 状态实现,使用 Flowable 的 `variables` 存储,移除 `bpm_process_instance_ext` 表 2 years ago
YunaiV 33d59c8b7d BPM:新增顺序会签、或签的能力 2 years ago
YunaiV 5f7ccd4e7c BPM:重构流程分配人的实现,通过 BpmTaskCandidateStrategy 策略模式 2 years ago
YunaiV 960f27f6ef BPM:新增 flowable expression 表达式,替代现有 BpmTaskAssignScript,更加灵活 2 years ago
owen aa57d89bea Merge remote-tracking branch 'origin/dev' into dev 2 years ago
owen c5b1ad480f 适配顶部导航 2 years ago
YunaiV feadd022e7 BPM:重构审批人的分配规则实现,移除 bpm_task_assign_rule 表,存储在 bpmn 的 userTask 中 2 years ago
moon69 4c0a5e8c30 修复数据权限无法回显的问题 2 years ago
dhb52 b0d4c87d8e feat: [CRM-客户分析]增加[时间间隔]选项 2 years ago
puhui999 d21c060903 CRM:完善转移 2 years ago
moon69 0230a4af01 修复数据权限无法回显的问题 2 years ago
YunaiV c89941d435 CRM:code review 客户总量统计 2 years ago
芋道源码 55856be1de
!394 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !394 from dhb52/dev
2 years ago
芋道源码 a6e29c5615
!400 fix(LoginForm): update doSocialLogin
Merge pull request !400 from AhJindeg/dev
2 years ago
AhJindeg 2d4ed85e94 fix(LoginForm): 🐞 update doSocialLogin
- 修复手动填写租户名称时,点击取消按钮,登录按钮 loading 状态未取消,并且会继续执行 LoginApi.socialAuthRedirect 方法
2 years ago
dhb52 470c5076a3 fix: 合同摘要信息(客户转化率页面) api 地址错误 2 years ago
dhb52 762b51a5b4 fix: [CRM-客户统计]根据Code-Review 修改 2 years ago
puhui999 13e925e29f CRM:完善数据权限,实现数据权限同时添加、同时转移 2 years ago
moon69 e4e37d0cb4 删除重复的 pagination 事件 2 years ago
puhui999 3660cd26ae CRM: 完善回款合同回款计划编辑合同回显 2 years ago
puhui999 a31c995508 Merge remote-tracking branch 'yudao/dev' into dev-crm 2 years ago
YunaiV ff0566bb7f 2024-02-06 fix: 修复Menu组件缩略菜单弹窗内样式不统一问题 2 years ago
dhb52 d0501ee0a6 feat: CRM/数据统计/员工客户分析 初稿 2 years ago
YunaiV db106834a7 bugfix 修复子菜单选中时,父菜单也高亮的问题 2 years ago
YunaiV 3be088e370 2023-11-29 feat: 持久化缓存 2 years ago
YunaiV 8f14355903 升级 element plus 到 2.5.3! 2 years ago
YunaiV 74a66b7c70 Merge remote-tracking branch 'origin/master' 2 years ago
YunaiV 1bc4eefeab 修复记住密码失效的问题 2 years ago
YunaiV 560a336f8c 修复用户退出登录时,把 LANG、THEME、LAYOUT、IS_DARK 给清空的问题 2 years ago
dhb52 3ddba81e24 Merge remote-tracking branch 'yudao/dev' into dev 2 years ago
芋道源码 9a4d1dcbce
!397 修正校验文本错误
Merge pull request !397 from moon69/N/A
2 years ago
YunaiV f413556c73 2023-08-10:style: 修改TabMenu样式 2 years ago
YunaiV 8d23c38f2f 2023-06-25:style: 移除不必要样式 2 years ago
YunaiV fe61119735 2023-06-25:perf: ImageViewer组件优化 2 years ago
YunaiV d884f71d57 2023-06-25:perf: 优化锁屏组件 2 years ago
YunaiV f8580fdf2a 2023-05-10:feat: 新增锁屏功能 2 years ago
moon69 ca8858a33f
修正校验文本错误
Signed-off-by: moon69 <1016830869@qq.com>
2 years ago
YunaiV 4231a7d133 2023年06月15日:fix: expand clickable area of collapse-icon 2 years ago
YunaiV aebb04a7c2 2023年06月01日:ContentWrap 支持 header 区域 2 years ago
YunaiV 1a5e7902b8 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
芋道源码 8d88f4206b
!395 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子
Merge pull request !395 from puhui999/dev-crm
2 years ago
puhui999 c9d5ec26a2 fix: 主子表 demo03 List props 2 years ago
dhb52 441b91381f feat: CRM/数据统计/客户总量分析 2 years ago
zhanhong 776846febc 修复:回款管理-编辑:不显示合同名称 2 years ago
puhui999 1694827c6c Merge remote-tracking branch 'yudao/dev' into dev-crm 2 years ago
puhui999 32d5892422 重写 el-upload httpRequest 文件上传成功会走成功的钩子,失败走失败的钩子 2 years ago
dhb52 9e86e47c1c !391 perf: utils/formatDate.ts更好的ts类型
* perf: utils/formatDate.ts更好的ts类型
2 years ago
YunaiV c0eaad3a4b 完善 MALL、CRM、ERP 文档说明 2 years ago
YunaiV 249fe126ee 完善 MALL、CRM、ERP 文档说明 2 years ago
YunaiV d220ffae6a CRM:增加回款的待办事项逻辑 2 years ago
YunaiV 154f84a89e CRM:完善合同的待回款金额 2 years ago
YunaiV 25665f548e CRM:完善回款在合同、客户的引入 2 years ago
YunaiV c5e5228e78 CRM:完善回款的详情 2 years ago
YunaiV 5369328b37 CRM:完善回款的新增/修改 2 years ago
YunaiV 70bf234133 CRM:完善回款列表 2 years ago
YunaiV 56d92e5bfb CRM:完善回款 plan 新增/修改 2 years ago
YunaiV fee444d191 CRM:完善回款 plan 详情 2 years ago
YunaiV 5cb86589c6 CRM:完善回款 plan 列表 2 years ago
puhui999 174724da98 CRM:完善回款集成客户详情和合同详情 2 years ago
puhui999 d9e1ffd522 Merge remote-tracking branch 'yudao/dev' into dev-crm 2 years ago
puhui999 41e5cf667e CRM:完善回款 2 years ago
puhui999 6725318f27 CRM:完善回款计划 2 years ago
YunaiV 12972cdf5c CRM:将 bi 调整成 statistics 2 years ago
YunaiV dcfe1abb67 CRM:增加商机关联联系人 2 years ago
YunaiV 6caa94ec47 CRM:待办事项(接入合同) 2 years ago
YunaiV 8f8591fc45 CRM:增加合同配置表 2 years ago
YunaiV 43bdb3cdba CRM:商机接入合同列表 2 years ago
YunaiV 7164ae5d49 CRM:完善 CRM 跟进记录(联系人的展示、添加) 2 years ago
YunaiV 28eb23738c CRM:完善 CRM 跟进记录(商机的展示、添加) 2 years ago
YunaiV a9e4ef9b7b CRM:完善 CRM 相关实现(产品) 2 years ago
YunaiV 56db6bf307 CRM:完善 CRM 相关实现 2 years ago
YunaiV c1f507bcae CRM:完善合同的审批逻辑 2 years ago
YunaiV 9acd01e768 CRM:完善合同的跟进记录实现 2 years ago
YunaiV 3bfdb2df33 CRM:完善合同的新增、修改需求 2 years ago
YunaiV 9d44b9acaa CRM:完善合同的新增、修改需求 2 years ago
YunaiV 11766f5107 CRM:完善合同的列表实现 2 years ago
YunaiV bbf6c16b8d CRM:完成商机状态的变更 2 years ago
YunaiV cf7036d34b CRM:完善商机产品的展示列表 2 years ago
YunaiV 8512fe6b43 CRM:完善商机和联系人之间的关联 2 years ago
YunaiV 01684aa6e8 CRM:完善商机的详情、跟进记录、操作日志、团队成员 2 years ago
YunaiV 29605800b5 CRM:完善商机的新增、修改逻辑 2 years ago
YunaiV 6baeadc87a CRM:完善商机状态的实现 2 years ago
YunaiV a2443e48f7 CRM:完善商机的列表 2 years ago
YunaiV 08bb022cb5 CRM:完善联系人的编辑、详情 2 years ago
YunaiV 094b1925d6 CRM:完善联系人的列表 2 years ago
YunaiV a401fff74c CRM:完成客户的分配接入 2 years ago
YunaiV 4362251b59 CRM:优化客户的详情、更新成交状态 2 years ago
YunaiV ac9a77e6e4 CRM:优化客户的列表、编辑的样式 2 years ago
YunaiV 04a42bc6d4 📖 CRM:线索的跟进逻辑 2 years ago
YunaiV 0ae6139e92 📖 CRM:线索的转化逻辑 2 years ago
YunaiV 1047c5b097 📖 CRM:线索 clue 新增/修改的完善 2 years ago
YunaiV e7bb17dc4e 📖 CRM:线索 clue 列表的完善 2 years ago
芋道源码 c804ec5e7a
!387 feat: CRM/backlog 提醒数量
Merge pull request !387 from dhb52/crm-msg
2 years ago
YunaiV f01bb2dc78 🐛 bugfix:无法打包问题,原因:import clone 从 unocss 导致 2 years ago
YunaiV cd86c08e59 📖 ERP:增加 ERP 首页的统计 2 years ago
dhb52 e067d5073d feat: CRM/backlog 提醒数量 2 years ago
dhb52 42b8df4767 refactor: 清理【待回款提醒】页面代码 2 years ago
YunaiV 71ac59f22e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
芋道源码 a3b21e70dc
!375 修复权限范围默认展开,deptExpand 却默认折叠的问题
Merge pull request !375 from moon69/N/A
2 years ago
芋道源码 1549a57c4b
!385 fix: 用户头像、昵称修改,同步更新Layout/UserInfo
Merge pull request !385 from dhb52/hotfix/dhb52/avatarupdate
2 years ago
YunaiV d3fab9a0fd 📖 CRM:code review 前端直接上传 2 years ago
芋道源码 ffeaa891df
!382 基础设施:前端直连上传文件
Merge pull request !382 from 疯狂的世界/dev
2 years ago
dhb52 a3e95b56ca fix: 用户头像、昵称修改 2 years ago