851 Commits (d838891667956391870894ed9c7a4ac81729c166)

Author SHA1 Message Date
chenshuichuan 09c8a305b2 fix plan 2 years ago
chenshuichuan 620979b84b fix bugs 2 years ago
chenshuichuan e6a88d23d3 fix bugs 2 years ago
chenshuichuan 20cac1cbf8 fix task plan 2 years ago
chenshuichuan 42760dff79 add energy device 2 years ago
chenshuichuan 0e3db55c03 fix report 2 years ago
chenshuichuan 4246955cc2 add produce report 2 years ago
chenshuichuan 78dd856558 add daily report 2 years ago
chenshuichuan 14afad7cd4 fix work report 2 years ago
chenshuichuan 1a7cefbad9 fix mes bug 2 years ago
chenshuichuan 37fd069908 FIX some bug 2 years ago
chenshuichuan 6aa15b1829 fix work report 2 years ago
chenshuichuan 03ee877f9b fix 生产流程 2 years ago
chenshuichuan 15ed1efaf8 add report to plan 2 years ago
chenshuichuan 101f800e1e fix produce report 2 years ago
chenshuichuan 5c9fa846bb fix orgWorker 2 years ago
chenshuichuan cbf3816814 fix worker org 2 years ago
chenshuichuan 1115fab85c add org worker 2 years ago
chenshuichuan fb89b36055 fix task 2 years ago
chenshuichuan 77292d5c88 add error record and stockin detail 2 years ago
chenshuichuan 7c4ab845b1 fix mes stock in and out type 2 years ago
chenshuichuan 7623da29e0 add feedback 2 years ago
chenshuichuan d13a7083b4 fix workteam 2 years ago
chenshuichuan 93ee24b7ce fix bug 2 years ago
chenshuichuan c707ebafa8 fix feeding 2 years ago
chenshuichuan 7d72b51689 fix some thing 2 years ago
chenshuichuan 49312f12a7 add feeding record 2 years ago
chenshuichuan f8395e245d add feeding record 2 years ago
chenshuichuan 70c0bbca6e fix mes stock workshop 2 years ago
chenshuichuan 3e799c4535 fix item requisition 2 years ago
chenshuichuan 70ed143d1c handle batch plan 2 years ago
chenshuichuan 9db47424dd fix order task 2 years ago
chenshuichuan e15cfec38b add item nedd 2 years ago
chenshuichuan 73153ffad9 add task and plan 2 years ago
chenshuichuan e30bac4cde fix prod env and push device 2 years ago
chenshuichuan 15512e8203 add iot and stock workshop 2 years ago
chenshuichuan bd7c44ffbf add fix filed 2 years ago
chenshuichuan 898d0f1e98 fix mqtt record 2 years ago
chenshuichuan 405c327944 add iot record 2 years ago
chenshuichuan cd891c15a6 fix show 2 years ago
chenshuichuan 6aabd2586f add iot and machine 2 years ago
chenshuichuan ee7ea361f3 fix task 2 years ago
chenshuichuan b73f1e7b0c add report 2 years ago
chenyuan 62a483141d add records 2 years ago
chenyuan c0e0076e71 add record 2 years ago
chenyuan 28e9815f11 add task plan 2 years ago
chenyuan a2b463794e add bom 2 years ago
chenyuan ac5cbf75a1 add autoCode 2 years ago
chenyuan ca62648a5a add mold 2 years ago
YunaiV 760bab7d29 【修复】全局:id=0导致sqlserver的insert失败 2 years ago
YunaiV 9402b29684 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2 years ago
dhb52 0fb70607d9 fix: id=0导致sqlserver的insert失败 2 years ago
YunaiV 66c6463f44 【修复】商城:seckill 导致打包失败的问题 2 years ago
YunaiV 20a9780654 【修复】商城:秒杀时段点击编辑报错 2 years ago
YunaiV f405ac3293 【优化】新增 sslEnable 字段,支持 outlook 邮箱 2 years ago
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
2 years ago
YunaiV 0925253a9d 【移除】敏感词的管理,简化项目的复杂度 2 years ago
YunaiV 98bf5a102e 【移除】错误码的管理,简化项目的复杂度 2 years ago
YunaiV ff0c12c551 【移除】数据库文档,简化项目的复杂度 2 years ago
puhui999 014d1f8cd2 CRM: 新增商机赢单转化率分析 2 years ago
puhui999 6acfc77d08 CRM: 完善销售漏斗 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
puhui999 bc95dc2959 CRM: 完善新增商机分析 2 years ago
puhui999 3c49ed570a CRM: 完善销售漏斗分析 2 years ago
byeJuly 1f517c3faf 修复 Infra 模块:
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因:
调整策略:删除-> autoIncrement <-字段
2 years ago
dhb52 0e15d6c9d2 feat: 客户成交周期分析(按区域、按产品) 2 years ago
芋道源码 091ce90359
!417 feat: 增加[客户公海分析]tab
Merge pull request !417 from dhb52/dev
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
芋道源码 8926dd1173
!415 CRM: 完善用户画像数据统计
Merge pull request !415 from puhui999/dev-crm
2 years ago
芋道源码 f17dfb9a31
!416 CRM员工业绩统计分析v2.0
Merge pull request !416 from scholarli/dev
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
YunaiV ffc81621d7 REPORT:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差 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 b51397fe19 CRM:优化【客户统计】的代码实现 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
puhui999 cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2 years ago
YunaiV cc14963bc8 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
YunaiV d16194b794 BPM:优化 task 审批详情界面,增加开始时间、结束时间的展示 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 03b8bd5e22 BPM:调整抄送逻辑的实现,改成审批通过、不通过时,可选择抄送 2 years ago
YunaiV de29528165 BPM:简化 task 接口的 VO,做一些合并。虽然字段上有冗余,但是读代码难度降低 2 years ago
YunaiV feadd022e7 BPM:重构审批人的分配规则实现,移除 bpm_task_assign_rule 表,存储在 bpmn 的 userTask 中 2 years ago
dhb52 b0d4c87d8e feat: [CRM-客户分析]增加[时间间隔]选项 2 years ago
puhui999 d21c060903 CRM:完善转移 2 years ago
芋道源码 55856be1de
!394 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !394 from dhb52/dev
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
puhui999 3660cd26ae CRM: 完善回款合同回款计划编辑合同回显 2 years ago
dhb52 d0501ee0a6 feat: CRM/数据统计/员工客户分析 初稿 2 years ago
dhb52 3ddba81e24 Merge remote-tracking branch 'yudao/dev' into dev 2 years ago
dhb52 441b91381f feat: CRM/数据统计/客户总量分析 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
YunaiV d220ffae6a CRM:增加回款的待办事项逻辑 2 years ago
YunaiV 154f84a89e CRM:完善合同的待回款金额 2 years ago
YunaiV c5e5228e78 CRM:完善回款的详情 2 years ago
YunaiV 5369328b37 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 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 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 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 cd86c08e59 📖 ERP:增加 ERP 首页的统计 2 years ago
dhb52 e067d5073d feat: CRM/backlog 提醒数量 2 years ago
YunaiV d3fab9a0fd 📖 CRM:code review 前端直接上传 2 years ago
芋道源码 ffeaa891df
!382 基础设施:前端直连上传文件
Merge pull request !382 from 疯狂的世界/dev
2 years ago
芋道源码 b603515855
!383 新增:CRM 商业智能,其他排名接口
Merge pull request !383 from 安浩浩/dev
2 years ago
芋道源码 a0497a6485
!384 feat: 待回款提醒,即将到期的合同,待审核回款
Merge pull request !384 from dhb52/crm-msg
2 years ago
YunaiV c18b24e611 ERP:初始化 receipt 收款单的逻辑 100% 2 years ago
YunaiV aa964e17d6 ERP:付款单 30%(列表) 2 years ago
YunaiV ee35056767 ERP:采购退货 50%(列表) 2 years ago
YunaiV 3d4feeff6b ERP:采购入库 50% 2 years ago
YunaiV 600892b112 ERP:初始化采购订单 50% 2 years ago
YunaiV 949096f776 ERP:初始化销售退货逻辑 50% 2 years ago
YunaiV 00a386dd7c ERP:增加 ERP 销售出库的编辑界面 2 years ago
YunaiV e535384f45 ERP:增加 ERP 销售出库的实现 30%(列表) 2 years ago
YunaiV f7c5266015 ERP:增加 ERP 销售订单的实现 90% 2 years ago
YunaiV b25d9c0f09 ERP:增加结算账户 100% 2 years ago
YunaiV ab63660bf8 ERP:增加 ERP 销售订单的实现 50%(详情)
新年快乐~
2 years ago
YunaiV 2615054fb2 ERP:增加 ERP 销售订单的实现 40%(列表) 2 years ago
YunaiV b55c8417fb ERP:增加 ERP 销售订单的实现 30% 2 years ago
YunaiV 0319056e4b ERP:增加 ERP 盘点单的实现 50% 2 years ago
dhb52 ae3d44d8bd feat: 待回款提醒,即将到期的合同,待审核回款 2 years ago
YunaiV 3c4932bc77 ERP:增加 ERP 调拨单的实现 100% 2 years ago
YunaiV 896f9758ed ERP:增加 ERP 客户的实现 2 years ago
YunaiV 616fd3f7ba ERP:初始化其它出库的实现 2 years ago
YunaiV 115c30ea40 ERP:增加入库单的审批功能 2 years ago
YunaiV 5bdf0fc0ff ERP:增加供应商的实现 2 years ago
YunaiV 9cbdfe0ecb ERP:初始化其它入库的表单 50% 2 years ago
YunaiV 53c94af027 ERP:初始化其它入库的表单 40% 2 years ago
YunaiV d92404f351 ERP:初始化其它入库的表单 20% 2 years ago
YunaiV 26343635e4 ERP:完成 stock 产品库存、库存明细的实现 2 years ago
YunaiV 6d9ca290b3 ERP:完成 stock 仓库信息的实现 2 years ago
YunaiV 36a0330277 ERP:完成 product 信息、分类、单位的实现 2 years ago
安浩浩 3cdcd67a6a 新增:CRM 商业智能,其他排名接口 2 years ago
owen 89fdb5ced9 基础设施:前端直连上传,优先使用自定义域名 2 years ago
YunaiV ce9317e3d0 ERP:初始化 product 信息、分类、单位的实现 2 years ago
owen dd08fbcb46 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
owen 490bb901e1 基础设施:增加前端直连上传文件到S3服务的功能 2 years ago
YunaiV cac39ae126 CRM:优化合同列的新增/修改界面 2 years ago
puhui999 fe91c5ec5c CRM:transfer 2 years ago
puhui999 6d0e242387 CRM-合同:完善 TODO 2 years ago
YunaiV 4549f8ed3c CRM:优化合同金额排行、回款金额排行 2 years ago
芋道源码 d6438943b8
!380 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改
Merge pull request !380 from 安浩浩/dev
2 years ago
YunaiV 956f19d9d0 CRM:合同的 code review 2 years ago
安浩浩 34a796de89 修改:商业智能-排行榜,合同金额排行和回款金额排行时间条件和接口修改 2 years ago
芋道源码 a5f8c3d79c
!376 完善客户导入,统一日志获取接口
Merge pull request !376 from puhui999/dev-crm
2 years ago
芋道源码 4271788a83
!377 feat: CRM-backlog-待进入公海的客户
Merge pull request !377 from dhb52/crm-msg
2 years ago
anhaohao 770e551900 新增:商业智能-排行榜,合同金额排行和回款金额排行 2 years ago
puhui999 41195d5b4a CRM-合同:新增合同预览审批流程和提交审核 2 years ago
puhui999 668da2fa86 CRM-合同:新增合同详情 2 years ago
puhui999 90e0baf5bc CRM-合同:完善合同表单 2 years ago
dhb52 4a2349ecf5 feat: CRM-backlog-待进入公海的客户 2 years ago
puhui999 331b6c5611 CRM-合同:完善合同表单 2 years ago
puhui999 ed94205fa7 CRM-合同:完善合同表单 2 years ago
puhui999 a64d4240a3 CRM-联系人:完善联系人转移、数据权限 2 years ago
puhui999 5adf75d15b CRM:统一日志获取接口 2 years ago
puhui999 26daa3a1ff CRM-客户:完善客户导入 2 years ago
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
2 years ago
YunaiV 66ff10d00c CRM:code review 跟进记录, 2 years ago