Commit Graph

2366 Commits

Author SHA1 Message Date
715f37eb0b crm:code review 员工业绩统计 2024-04-23 23:31:52 +08:00
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
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
0925253a9d 【移除】敏感词的管理,简化项目的复杂度 2024-04-22 19:52:05 +08:00
98bf5a102e 【移除】错误码的管理,简化项目的复杂度 2024-04-22 19:42:56 +08:00
ff0c12c551 【移除】数据库文档,简化项目的复杂度 2024-04-22 19:13:57 +08:00
243da124a8 fix: 调整价格弹窗不出来问题 2024-04-22 11:35:28 +08:00
deb4585d4b fix: 适配 echarts map 的地名 2024-04-22 11:04:53 +08:00
afdee2cd48 fix: 移除 form-crate 自带的富文本组件规则,使用 editorRule 替代 2024-04-22 10:56:16 +08:00
f4dd1bed63 1, 修改数据列表无法刷新的问题;
2, 修改时间选择,后端按照年实现的,前端同样按照年份选择实现;
3,修改环比同比计算;
4,回款金额统计bug修复。
2024-04-19 17:46:09 +08:00
d96f951113 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题 2024-04-18 14:45:43 +08:00
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
ac6618a943 fix: 🐞 fix sensitiveWord hasPermi value 2024-04-16 18:24:56 +08:00
decdd1b25d fix: 🐞 fix post hasPermi value 2024-04-16 18:24:36 +08:00
97c8cefb7d fix: 🐞 fix operatelog hasPermi value 2024-04-16 18:24:16 +08:00
bfb69ccccd fix: 🐞 fix template hasPermi value 2024-04-16 18:23:57 +08:00
958ec41f4e fix: 🐞 fix loginlog hasPermi value 2024-04-16 18:23:39 +08:00
dc5bede084 fix: 🐞 fix fileConfig hasPermi value 2024-04-16 18:23:24 +08:00
755526834e fix: 🐞 fix file hasPermi value 2024-04-16 18:23:08 +08:00
221f78aa9a fix: 🐞 fix apiAccessLog hasPermi value 2024-04-16 18:22:46 +08:00
4e640bae88 CRM: 新增商机赢单转化率分析 2024-04-15 16:38:24 +08:00
014d1f8cd2 CRM: 新增商机赢单转化率分析 2024-04-15 16:32:48 +08:00
6acfc77d08 CRM: 完善销售漏斗 2024-04-15 15:37:37 +08:00
033462d25f 修复第四个导航模式无法点开菜单的问题
Signed-off-by: moon69 <1016830869@qq.com>
2024-04-15 06:24:32 +00:00
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
1c469300f5 !422 Infra模块>代码生成器>适配达梦数据库
Merge pull request !422 from 再见七月/infraBug-by-dm
2024-04-14 10:21:53 +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
bc95dc2959 CRM: 完善新增商机分析 2024-04-14 16:31:43 +08:00
3c49ed570a CRM: 完善销售漏斗分析 2024-04-14 00:34:33 +08:00
2f0fdd1d36 fix:移除多余的代码 2024-04-13 12:39:41 +08:00
2d7bab8adb CRM: 完善用户画像数据统计 2024-04-13 11:04:56 +08:00
64af029c86 CRM: 完善用户画像数据统计 2024-04-11 15:25:48 +08:00
4793897511 fix(UserImportForm): 🐞 add update formLoading and dialogVisible to submitFormSuccess 2024-04-11 11:03:06 +08:00
786468f437 fix(UserImportForm): 🐞 add init updateSupport to open 2024-04-11 11:00:24 +08:00
1f517c3faf 修复 Infra 模块:
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因:
调整策略:删除-> autoIncrement <-字段
2024-04-10 19:33:01 +08:00
4c15e6675a fix(UserImportForm): 🐞 add nextTick to resetForm 2024-04-10 18:09:43 +08:00
5358863fc6 refactor: 统一处理null数据为'未知' 2024-04-09 18:47:31 +08:00
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
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
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
8f8edc9565 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-06 19:39:14 +08:00
3c54f5f565 feat: 增加[客户公海分析]tab 2024-04-06 15:38:50 +08:00
13cf1feefb refactor: 使用try finally停止loading 2024-04-06 15:38:04 +08:00
6772568a58 crm:code review 客户画像 2024-04-05 14:43:55 +08:00