Commits · 46227a3275adbaae8a9ab4d7ab17111d48f23f02 · lanbaoming / jiedao-app-operator-master

10 Sep, 2024 5 commits
- 订单列表重置，提货状态改用字典 · 46227a32
  yujinyao authored Sep 10, 2024
  
  46227a32
- 跟进默认选择当前的客户经理，下次跟进时间不能小于当前时间 · 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 16 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
- 订单复制和查看异常，列调整 · 240853aa
  dragondean@qq.com authored Sep 06, 2024
  
  240853aa
- Merge branch 'pre-release' of... · 99740436
  yujinyao authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  99740436
- 订单列表加提货率和提货状态搜索 · e3b47daf
  yujinyao authored Sep 06, 2024
  
  e3b47daf
- Merge branch 'pre-release' of... · 8b866576
  dragondean@qq.com authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into pre-release
```
  8b866576
- 客户列表搜索部门 · 70855877
  yujinyao authored Sep 06, 2024
  
  70855877
- Merge branch 'pre-release' of... · a4082526
  yujinyao authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  a4082526
- 客户列表搜索 · c0474454
  yujinyao authored Sep 06, 2024
  
  c0474454
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 1603d701
  chenwei authored Sep 06, 2024
```
Hotfix/pre release defect

See merge request !34
```
  1603d701
- Merge branch 'cherry-pick-3d196b22' into 'hotfix/preReleaseDefect' · cb4f8c55
  chenwei authored Sep 06, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !33
```
  cb4f8c55
- Merge branch 'feature/099_customer_filter' into 'dev' · 9158702a
  chenwei authored Sep 06, 2024
```
兑换记录筛选新增兑换记录ID

See merge request !32

(cherry picked from commit 3d196b22)

7dbfdb1d 兑换记录筛选新增兑换记录ID
```
  9158702a
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 9540f96c
  chenwei authored Sep 06, 2024
```
Hotfix/pre release defect

See merge request !31
```
  9540f96c
- Merge branch 'cherry-pick-08db7893' into 'pre-release' · 715aee08
  chenwei authored Sep 06, 2024
```
Merge branch 'cherry-pick-761bb895' into 'hotfix/preReleaseDefect'

See merge request !30
```
  715aee08
- Merge branch 'cherry-pick-761bb895' into 'hotfix/preReleaseDefect' · 5c732dec
  chenwei authored Sep 06, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !29

(cherry picked from commit 08db7893)

fb6caff3 Merge branch 'feature/099_customer_filter' into 'dev'
```
  5c732dec
- Merge branch 'cherry-pick-761bb895' into 'hotfix/preReleaseDefect' · 08db7893
  chenwei authored Sep 06, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !29
```
  08db7893