Commits · 51e6887bdeb9a3a3a2129c0fb85e484c45922e97 · phsl / admin

01 May, 2024 1 commit
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · 51e6887b
  puhui999 committed May 01, 2024
  
  51e6887b Browse Files
30 Apr, 2024 3 commits
- 【优化】结合 vite 机制，将 .env.local-dev 修改成 .env.local · bde55974
  YunaiV committed Apr 30, 2024
  
  bde55974 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 9527b41b
  YunaiV committed Apr 30, 2024
  
  9527b41b Browse Files
- 使用 tsx 封装 form-create 通用选择组件 · 1f1ac1f2
  puhui999 committed Apr 30, 2024
  
  1f1ac1f2 Browse Files
29 Apr, 2024 4 commits
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · 21483448
  puhui999 committed Apr 30, 2024
  
  21483448 Browse Files
- form-create：移除自带的下拉选择器组件，使用 currencySelectRule 替代 · 769b63d9
  puhui999 committed Apr 30, 2024
  
  769b63d9 Browse Files
- 【移除】stylelint.vscode-stylelint 插件的推荐，避免 vscode 样式红色波浪线 · dcf66749
  YunaiV committed Apr 29, 2024
  
  dcf66749 Browse Files
- 【优化】增加 pnpm-lock 保证大家更好的打包 · 500b8632
  YunaiV committed Apr 29, 2024
  
  500b8632 Browse Files
28 Apr, 2024 2 commits
- 【恢复】npm run dev 使用 local-dev 配置文件 · 730da857
  YunaiV committed Apr 28, 2024
  
  730da857 Browse Files
- !433 CRM: 修复客户导入、销售漏斗。上传组件的文件列表给拓展一个下载。 · c96902d6
```
Merge pull request !433 from puhui999/dev-crm
```
  芋道源码 committed Apr 28, 2024
  c96902d6 Browse Files
25 Apr, 2024 2 commits
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · 00762362
  puhui999 committed Apr 25, 2024
  
  00762362 Browse Files
- feat：文件上传组件的文件列表拓展一个下载 · ae53ca6f
  puhui999 committed Apr 25, 2024
  
  ae53ca6f Browse Files
24 Apr, 2024 5 commits
- fix: import FunnelChart from echarts · 9a36d9d6
  puhui999 committed Apr 24, 2024
  
  9a36d9d6 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · f55c9b72
  YunaiV committed Apr 24, 2024
  
  f55c9b72 Browse Files
- CRM: 修复客户导入 · 6ff31b90
  puhui999 committed Apr 24, 2024
  
  6ff31b90 Browse Files
- 【优化】移除 env 多余的 VITE_API_BASEPATH 配置项 · a0996bd0
  YunaiV committed Apr 24, 2024
  
  a0996bd0 Browse Files
- 【优化】新增 sslEnable 字段，支持 outlook 邮箱 · f405ac32
  YunaiV committed Apr 24, 2024
  
  f405ac32 Browse Files
23 Apr, 2024 5 commits
- 依赖升级：element-plus、axios 等依赖 · 2d999138
  YunaiV committed Apr 24, 2024
  
  2d999138 Browse Files
- crm：bugfix FunnelBusiness.vue 导致打包失败的问题 · 1d533e49
  YunaiV committed Apr 24, 2024
  
  1d533e49 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · dee479ce
  YunaiV committed Apr 23, 2024
  
  dee479ce Browse Files
- crm：code review 员工业绩统计 · 715f37eb
  YunaiV committed Apr 23, 2024
  
  715f37eb Browse Files
- Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev · 56543b8d
```
# 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
```
  YunaiV committed Apr 23, 2024
  56543b8d Browse Files
22 Apr, 2024 9 commits
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · 7f395001
```
# Conflicts:
#	src/api/infra/codegen/index.ts
#	src/views/system/sensitiveWord/index.vue
```
  YunaiV committed Apr 23, 2024
  7f395001 Browse Files
- !430 bugfix：修复角色管理页面-角色类型字段没有被字典翻译问题 · d26e0976
```
Merge pull request !430 from limz/bugfix-pull
```
  芋道源码 committed Apr 22, 2024
  d26e0976 Browse Files
- !432 fix：修复 issues 提到的一些问题 · 95a51ce4
```
Merge pull request !432 from puhui999/dev-crm
```
  芋道源码 committed Apr 22, 2024
  95a51ce4 Browse Files
- 【移除】敏感词的管理，简化项目的复杂度 · 0925253a
  YunaiV committed Apr 22, 2024
  
  0925253a Browse Files
- 【移除】错误码的管理，简化项目的复杂度 · 98bf5a10
  YunaiV committed Apr 22, 2024
  
  98bf5a10 Browse Files
- 【移除】数据库文档，简化项目的复杂度 · ff0c12c5
  YunaiV committed Apr 22, 2024
  
  ff0c12c5 Browse Files
- fix: 调整价格弹窗不出来问题 · 243da124
  puhui999 committed Apr 22, 2024
  
  243da124 Browse Files
- fix: 适配 echarts map 的地名 · deb4585d
  puhui999 committed Apr 22, 2024
  
  deb4585d Browse Files
- fix: 移除 form-crate 自带的富文本组件规则，使用 editorRule 替代 · afdee2cd
  puhui999 committed Apr 22, 2024
  
  afdee2cd Browse Files
19 Apr, 2024 1 commit

2， 修改时间选择，后端按照年实现的，前端同样按照年份选择实现；
3，修改环比同比计算；
4，回款金额统计bug修复。

committed Apr 19, 2024

f4dd1bed Browse Files

18 Apr, 2024 5 commits
- bugfix：修复角色管理页面-角色类型字段没有被字典翻译问题 · d96f9511
  limingz committed Apr 18, 2024
  
  d96f9511 Browse Files
- crm：code review 销售漏斗 · f5d01318
  YunaiV committed Apr 18, 2024
  
  f5d01318 Browse Files
- !428 CRM: 新增商机赢单转化率分析 · 50ab8646
```
Merge pull request !428 from puhui999/dev-crm
```
  芋道源码 committed Apr 18, 2024
  50ab8646 Browse Files
- !429 fix: Permissions filled in incorrectly · b1c832d2
```
Merge pull request !429 from AhJindeg/hotfix/hasPermi
```
  芋道源码 committed Apr 18, 2024
  b1c832d2 Browse Files
- !427 修复第四个导航模式无法点开菜单的问题 · 5ba6c5ee
```
Merge pull request !427 from moon69/N/A
```
  芋道源码 committed Apr 18, 2024
  5ba6c5ee Browse Files
16 Apr, 2024 3 commits
- fix: 🐞 fix sensitiveWord hasPermi value · ac6618a9
  AhJindeg committed Apr 16, 2024
  
  ac6618a9 Browse Files
- fix: 🐞 fix post hasPermi value · decdd1b2
  AhJindeg committed Apr 16, 2024
  
  decdd1b2 Browse Files
- fix: 🐞 fix operatelog hasPermi value · 97c8cefb
  AhJindeg committed Apr 16, 2024
  
  97c8cefb Browse Files