Commits · b8e884417e3d0f9127b461d722233e17caff0415 · lanbaoming / jiedao-app-operator-master

11 Sep, 2024 1 commit
- 修复部分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
- 跟进默认选择当前的客户经理，下次跟进时间不能小于当前时间 · 1dffdad4
  yujinyao authored Sep 10, 2024
  
  1dffdad4
- 客户详情订单，报价搜索重置 · 02c24a4c
  yujinyao authored Sep 10, 2024
  
  02c24a4c
- 客户列表去掉文本框空格 · c02aeb50
  yujinyao authored Sep 10, 2024
  
  c02aeb50
- 跟进附件图片文件支持预览 · 12505cbb
  yujinyao authored Sep 10, 2024
  
  12505cbb
09 Sep, 2024 9 commits
- 我的客户加上待分配客户无默认付款，有无收货人，开票按钮 · 18ce98b4
  yujinyao authored Sep 09, 2024
  
  18ce98b4
- Merge branch 'pre-release' of... · 2b1e76bd
  yujinyao authored Sep 09, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  2b1e76bd
- 修改客户bug · ec5c3f89
  yujinyao authored Sep 09, 2024
  
  ec5c3f89
- Merge branch 'feature/order_edit' into pre-release · 4b90399e
  dragondean@qq.com authored Sep 09, 2024
  
  4b90399e
- 切换无收货人后清除收货人必填校验 · 368424cb
  dragondean@qq.com authored Sep 09, 2024
  
  368424cb
- Merge branch 'pre-release' of... · 5744f2e7
  yujinyao authored Sep 09, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  5744f2e7
- 客户BUG · fae04a69
  yujinyao authored Sep 09, 2024
  
  fae04a69
- Merge branch 'fix/price_query' into pre-release · 7b711d7a
  dragondean@qq.com authored Sep 09, 2024
  
  7b711d7a
- 修复单询异常部分订单无法设置价格 · 7f35012e
  dragondean@qq.com authored Sep 09, 2024
  
  7f35012e
08 Sep, 2024 6 commits
- Merge remote-tracking branch 'origin/pre-release' into pre-release · eb9e7f83
  dragondean@qq.com authored Sep 08, 2024
  
  eb9e7f83
- Merge branch 'feature/order_edit' into pre-release · 27d547ac
  dragondean@qq.com authored Sep 08, 2024
  
  27d547ac
- 完善订单编辑 · bd3513e7
  dragondean@qq.com authored Sep 08, 2024
  
  bd3513e7
- 控货订单加提货状态和提货率 · eda6d1a7
  余金瑶 authored Sep 08, 2024
  
  eda6d1a7
- 订单列表收货人、发货人编号支持穿越 · 5a03c55e
  余金瑶 authored Sep 08, 2024
  
  5a03c55e
- 客户列表字段 · 93820aca
  余金瑶 authored Sep 08, 2024
  
  93820aca
07 Sep, 2024 4 commits
- Merge branch 'feature/order_edit' into pre-release · 5dc83634
  dragondean@qq.com authored Sep 07, 2024
  
  5dc83634
- 完善订单详情 · 0f24ef21
  dragondean@qq.com authored Sep 07, 2024
  
  0f24ef21
- 订单详情重构暂存 · e25386f4
  dragondean@qq.com authored Aug 27, 2024
  
  e25386f4
- 订单列表海外仓标记错误 · 8f8f7893
  dragondean@qq.com authored Sep 07, 2024
  
  8f8f7893
06 Sep, 2024 2 commits
- Merge branch 'pre-release' of... · dc62bd98
  yujinyao authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  dc62bd98
- Merge branch 'feature/order_edit' into pre-release · 6f0114a9
  dragondean@qq.com authored Sep 06, 2024
```
# Conflicts:
#	src/views/ecw/order/index.vue
```
  6f0114a9