Commits · 7386277bb501fe4f1eeedb417be24897f353872c · lanbaoming / jiedao-app-operator-master

18 Sep, 2024 1 commit
- 6 · 7386277b
  332784038@qq.com authored Sep 18, 2024
  
  7386277b
14 Sep, 2024 1 commit
- 6 · 541ade3b
  332784038@qq.com authored Sep 14, 2024
  
  541ade3b
12 Sep, 2024 13 commits
- 异常订单去掉状态筛选 · 79a51e7c
  dragondean@qq.com authored Sep 12, 2024
  
  79a51e7c
- Merge remote-tracking branch 'origin/pre-release' into pre-release · ffbb23d2
  dragondean@qq.com authored Sep 12, 2024
  
  ffbb23d2
- Merge branch 'feature/order_edit' into pre-release · 48a0ba38
  dragondean@qq.com authored Sep 12, 2024
  
  48a0ba38
- 修复几个编辑订单和详情的bug · 1313a511
  dragondean@qq.com authored Sep 12, 2024
  
  1313a511
- 异常订单重置商品类型 · 00937a5b
  余金瑶 authored Sep 12, 2024
  
  00937a5b
- 修改客户信息界面，控货和异常订单搜索 · 39fc4430
  余金瑶 authored Sep 12, 2024
  
  39fc4430
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 41628737
  chenwei authored Sep 12, 2024
```
Hotfix/pre release defect

See merge request !44
```
  41628737
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · fed7e783
  chenwei authored Sep 12, 2024
```
问题修复，面包屑等等等

See merge request !43
```
  fed7e783
- 问题修复，面包屑等等等 · 8c4b47d8
  chenwei authored Sep 12, 2024
  
  8c4b47d8
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · a299f73f
  chenwei authored Sep 12, 2024
```
Hotfix/pre release defect

See merge request !41
```
  a299f73f
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · b5d38eb3
  chenwei authored Sep 12, 2024
```
Feature/099 customer filter

See merge request !40
```
  b5d38eb3
- Merge remote-tracking branch 'origin/pre-release' into pre-release · 59c5853b
  dragondean@qq.com authored Sep 12, 2024
  
  59c5853b
- 几个小bug · 41bf70a6
  dragondean@qq.com authored Sep 12, 2024
  
  41bf70a6
11 Sep, 2024 7 commits
- 客户页面布局 · 12955a48
  yujinyao authored Sep 11, 2024
  
  12955a48
- 客户设置开关参数重置 · e2233622
  yujinyao authored Sep 11, 2024
  
  e2233622
- 客户跟进选择报价单，加客户编号，始发地和渠道 · 1c49f721
  yujinyao authored Sep 11, 2024
  
  1c49f721
- Merge branch 'pre-release' of... · f60671ef
  yujinyao authored Sep 11, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  f60671ef
- 客户设置2 · 8c2c8d43
  yujinyao authored Sep 11, 2024
  
  8c2c8d43
- 客户设置 · 61f0c4bb
  yujinyao authored Sep 11, 2024
  
  61f0c4bb
- 修复部分bug · b8e88441
  dragondean@qq.com authored Sep 11, 2024
  
  b8e88441
10 Sep, 2024 18 commits
- 部分订单列表和待备货列表的bug · 0b716b8c
  dragondean@qq.com authored Sep 10, 2024
  
  0b716b8c
- Merge branch 'feature/order_edit' into pre-release · 0a22d053
  dragondean@qq.com authored Sep 10, 2024
```
# Conflicts:
#	src/views/ecw/order/index.vue
```
  0a22d053
- 订单列表渠道重置异常修复 · f0f9b510
  dragondean@qq.com authored Sep 10, 2024
  
  f0f9b510
- 订单编辑和详情的bug · 18cac1d4
  dragondean@qq.com authored Sep 10, 2024
  
  18cac1d4
- 客户列表操作设置按钮 · 1dec6dce
  余金瑶 authored Sep 10, 2024
  
  1dec6dce
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 65c81e67
  chenwei authored Sep 10, 2024
```
Hotfix/pre release defect

See merge request !37
```
  65c81e67
- Merge branch 'pre-release' of... · d47ab990
  yujinyao authored Sep 10, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  d47ab990
- 订单列表重置，提货状态改用字典 · 46227a32
  yujinyao authored Sep 10, 2024
  
  46227a32
- Merge branch 'feature/order_edit' into pre-release · a3fcad2f
  dragondean@qq.com authored Sep 10, 2024
  
  a3fcad2f
- 修复订单部分的bug · dc20d9b8
  dragondean@qq.com authored Sep 10, 2024
  
  dc20d9b8
- Merge branch 'cherry-pick-1150e645' into 'hotfix/preReleaseDefect' · 2a78f8f3
  chenwei authored Sep 10, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !36
```
  2a78f8f3
- Merge branch 'feature/099_customer_filter' into 'dev' · a4c28076
  chenwei authored Sep 10, 2024
```
问题汇总修改

See merge request !35

(cherry picked from commit 1150e645)

143227ff 问题汇总修改
```
  a4c28076
- Merge branch 'feature/order_edit' into pre-release · 3951aaf5
  dragondean@qq.com authored Sep 10, 2024
  
  3951aaf5
- 修复订单部分的bug · 87d3d90f
  dragondean@qq.com authored Sep 10, 2024
  
  87d3d90f
- 问题汇总修改 · 143227ff
  chenwei authored Sep 10, 2024
  
  143227ff
- 跟进默认选择当前的客户经理，下次跟进时间不能小于当前时间 · 1dffdad4
  yujinyao authored Sep 10, 2024
  
  1dffdad4
- 客户详情订单，报价搜索重置 · 02c24a4c
  yujinyao authored Sep 10, 2024
  
  02c24a4c
- 客户列表去掉文本框空格 · c02aeb50
  yujinyao authored Sep 10, 2024
  
  c02aeb50