Commit Graph

2255 Commits

Author SHA1 Message Date
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
khalidlife
ff14cf90f0 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 2024-04-30 09:30:43 +08:00
puhui999
21483448b9 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-30 00:07:37 +08:00
puhui999
769b63d9ca form-create:移除自带的下拉选择器组件,使用 currencySelectRule 替代 2024-04-30 00:07:25 +08:00
YunaiV
dcf66749af 【移除】stylelint.vscode-stylelint 插件的推荐,避免 vscode 样式红色波浪线 2024-04-29 22:01:59 +08:00
YunaiV
500b8632df 【优化】增加 pnpm-lock 保证大家更好的打包 2024-04-29 21:47:49 +08:00
YunaiV
730da857e1 【恢复】npm run dev 使用 local-dev 配置文件 2024-04-28 12:58:35 +08:00
芋道源码
c96902d622
!433 CRM: 修复客户导入、销售漏斗。上传组件的文件列表给拓展一个下载 。
Merge pull request !433 from puhui999/dev-crm
2024-04-28 04:52:53 +00:00
puhui999
0076236280 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-25 22:34:14 +08:00
puhui999
ae53ca6f4f feat:文件上传组件的文件列表拓展一个下载 2024-04-25 22:33:36 +08:00
puhui999
9a36d9d663 fix: import FunnelChart from echarts 2024-04-24 23:28:09 +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
2d999138ba 依赖升级:element-plus、axios 等依赖 2024-04-24 00:32:10 +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
芋道源码
95a51ce4f3
!432 fix:修复 issues 提到的一些问题
Merge pull request !432 from puhui999/dev-crm
2024-04-22 16:25:14 +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
puhui999
afdee2cd48 fix: 移除 form-crate 自带的富文本组件规则,使用 editorRule 替代 2024-04-22 10:56:16 +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
芋道源码
b1c832d27f
!429 fix: Permissions filled in incorrectly
Merge pull request !429 from AhJindeg/hotfix/hasPermi
2024-04-18 01:08:58 +00:00
芋道源码
5ba6c5ee00
!427 修复第四个导航模式无法点开菜单的问题
Merge pull request !427 from moon69/N/A
2024-04-18 01:04:58 +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
moon69
033462d25f
修复第四个导航模式无法点开菜单的问题
Signed-off-by: moon69 <1016830869@qq.com>
2024-04-15 06:24:32 +00:00
YunaiV
2512253020 crm:code review 销售漏斗 2024-04-14 21:22:55 +08:00
YunaiV
c331a83b74 crm:code review 销售漏斗 2024-04-14 21:21:52 +08:00