Commits · 73e851602420bac1dbf34103ecce0c1de3b5b1a6 · phsl / admin · GitLab

11 May, 2024 8 commits
- 【代码评审】CRM：优化员工业绩统计的实现 · 73e85160
  YunaiV committed May 11, 2024
  
  73e85160 Browse Files
- Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev · 8ba6095b
```
# 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 May 11, 2024
  8ba6095b Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 43dcefdc
  YunaiV committed May 11, 2024
  
  43dcefdc Browse Files
- !445 解决部门管理页面中，重置按钮失效问题 · 93bee8c8
```
Merge pull request !445 from 刘岩Tony/N/A
```
  芋道源码 committed May 11, 2024
  93bee8c8 Browse Files
- !442 update src/views/Login/SocialLogin.vue. · 0385d4db
```
Merge pull request !442 from 天痕/N/A
```
  芋道源码 committed May 11, 2024
  0385d4db Browse Files
- !443 update src/views/Login/SocialLogin.vue. · aefee521
```
Merge pull request !443 from 天痕/N/A
```
  芋道源码 committed May 11, 2024
  aefee521 Browse Files
- 【新增】AI：API 模型管理（完善） · dd2c4b6b
  YunaiV committed May 11, 2024
  
  dd2c4b6b Browse Files
- 优化代码实现。 · f01dc0a5
  scholar committed May 11, 2024
  
  f01dc0a5 Browse Files
10 May, 2024 6 commits
- 【优化】调整 right 对话头像距离问题 · b19d56ad
  cherishsince committed May 10, 2024
  
  b19d56ad Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 0887c46f
  cherishsince committed May 10, 2024
  
  0887c46f Browse Files
- 【添加】调整ui 增加 chat对话和发送 · 9d322c3a
  cherishsince committed May 10, 2024
  
  9d322c3a Browse Files
- 【新增】AI：API 模型管理 · 1776217f
  YunaiV committed May 10, 2024
  
  1776217f Browse Files
- !444 oa请假，修复列表展示的状态字段取值错误 · f5474840
```
Merge pull request !444 from syubun/master
```
  芋道源码 committed May 10, 2024
  f5474840 Browse Files
- !446 form-create: 优化 select options 解析，增加 el 表达式解析、自定义函数解析 · be13eb1d
```
Merge pull request !446 from puhui999/dev-crm
```
  芋道源码 committed May 10, 2024
  be13eb1d Browse Files
09 May, 2024 6 commits
- 【新增】AI：API 密钥管理 · 02fe7e31
  YunaiV committed May 09, 2024
  
  02fe7e31 Browse Files
- 【优化】优化 ai chat 主框架布局 · 5525bc22
  cherishsince committed May 09, 2024
  
  5525bc22 Browse Files
- Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm · cb82578b
```
# Conflicts:
#	src/components/FormCreate/src/components/useApiSelect.tsx
```
  puhui999 committed May 09, 2024
  cb82578b Browse Files
- form-create: 完善 select 远程搜索 · 24f2c49e
  puhui999 committed May 09, 2024
  
  24f2c49e Browse Files
- form-create: 完善 select 远程搜索 · 9cde4885
  puhui999 committed May 09, 2024
  
  9cde4885 Browse Files
- form-create: 优化 select option 选项解析，增加 el 表达式解析、自定义函数解析 (data: any)=>{ label: string; value: any } · 40fe8792
  puhui999 committed May 09, 2024
  
  40fe8792 Browse Files
08 May, 2024 3 commits
- 修改流程流转类型判断错误的问题 · e8f1b411
  syubun committed May 08, 2024
  
  e8f1b411 Browse Files
- 解决部门管理页面中，重置按钮失效问题 · 742456dd
```
部门名称中的prop属性值写错了，会导致重置按钮不生效，已做相应更改

Signed-off-by: 刘岩Tony <345006662@qq.com>
```
  刘岩Tony committed May 08, 2024
  742456dd Browse Files
- oa请假，修复列表展示的状态字段取值错误 · 657ad506
  syubun committed May 08, 2024
  
  657ad506 Browse Files
07 May, 2024 10 commits
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · 6c179809
  YunaiV committed May 07, 2024
  
  6c179809 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · 8454d1d3
  YunaiV committed May 07, 2024
  
  8454d1d3 Browse Files
- Merge pull request #39 from DevDengChao/fix/local-dev · 9e25686c
```
fix: 修复由于 .env.local-dev 重命名导致的构建指令异常
```
  芋道源码 committed May 07, 2024
  9e25686c Browse Files
- 【修复】全局：id=0导致sqlserver的insert失败 · 760bab7d
  YunaiV committed May 07, 2024
  
  760bab7d Browse Files
- 【新增】AI：新增 chat 对话界面（草稿状态） · 3976e49e
  YunaiV committed May 07, 2024
  
  3976e49e Browse Files
- update src/views/Login/SocialLogin.vue. · 7092e240
```
这里应该取反

Signed-off-by: 天痕 <614891294@qq.com>
```
  天痕 committed May 07, 2024
  7092e240 Browse Files
- update src/views/Login/SocialLogin.vue. · eeae01e6
```
这里已经是布尔值了，不用在判断为布尔值

Signed-off-by: 天痕 <614891294@qq.com>
```
  天痕 committed May 07, 2024
  eeae01e6 Browse Files
- fix: 修复由于 .env.local-dev 重命名导致的构建指令异常 · ccd56f2d
  DevDengChao committed May 07, 2024
  
  ccd56f2d Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 9402b296
  YunaiV committed May 07, 2024
  
  9402b296 Browse Files
- !441 fix: id=0导致sqlserver的insert失败 · e8e1467f
```
Merge pull request !441 from dhb52/dev
```
  芋道源码 committed May 07, 2024
  e8e1467f Browse Files
06 May, 2024 7 commits
- fix: id=0导致sqlserver的insert失败 · 0fb70607
  dhb52 committed May 06, 2024
  
  0fb70607 Browse Files
- !440 fix: id=0导致sqlserver新增菜单失败 · a6082652
```
Merge pull request !440 from dhb52/N/A
```
  芋道源码 committed May 06, 2024
  a6082652 Browse Files
- !439 商品统计计数显示成价格了 update src/views/mall/statistics/product/components/ProductSummary.vue. · 99f8fa82
```
Merge pull request !439 from 山野羡民/N/A
```
  芋道源码 committed May 06, 2024
  99f8fa82 Browse Files
- 【优化】全局：动态表单的注释、error log 打印 · 0222eef6
  YunaiV committed May 06, 2024
  
  0222eef6 Browse Files
- fix: id=0导致sqlserver新增菜单失败 · c350fc46
```
Signed-off-by: dhb52 <dhb52@126.com>
```
  dhb52 committed May 06, 2024
  c350fc46 Browse Files
- !435 form-create：字典选择器分离，重新封装 api 选择器。扩展字体图标。 · 41cbabcf
```
Merge pull request !435 from puhui999/dev-crm
```
  芋道源码 committed May 06, 2024
  41cbabcf Browse Files
- update src/views/mall/statistics/product/components/ProductSummary.vue. · 2101731f
```
商品统计计数显示有问题，数量显示成价格了

Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
```
  山野羡民 committed May 06, 2024
  2101731f Browse Files