Commits · 8f4ce90f01076c7054d232bba8738828fc922160 · lanbaoming / jiedao-app-operator-master

31 Aug, 2024 4 commits
- Merge branch 'feature/cargo_control' into dev · 8f4ce90f
  dragondean@qq.com authored Aug 31, 2024
  
  8f4ce90f
- 完善修改放货审批 · 4ef0d522
  dragondean@qq.com authored Aug 31, 2024
  
  4ef0d522
- Merge branch 'feature/order_edit' into dev · 2fbeef94
  dragondean@qq.com authored Aug 31, 2024
  
  2fbeef94
- 修复订单无收货人编辑异常 · fde2515b
  dragondean@qq.com authored Aug 31, 2024
  
  fde2515b
30 Aug, 2024 7 commits
- 完善修复修改放货限制申请及审批组件 · 36296c73
  dragondean@qq.com authored Aug 30, 2024
  
  36296c73
- Merge branch 'feature/099_customer_filter' into 'dev' · 09128363
  chenwei authored Aug 30, 2024
```
兑换记录

See merge request !19
```
  09128363
- 修复修改放货限制申请审批组件 - 暂存 · b511b650
  dragondean@qq.com authored Aug 30, 2024
  
  b511b650
- 兑换记录 · 89a81c87
  chenwei authored Aug 30, 2024
  
  89a81c87
- 修改客户详情订单tag搜索字段名称 · 0c73ae7b
  yujinyao authored Aug 30, 2024
  
  0c73ae7b
- src/views/ecw/order/cargoControl.vue文件冲突 · 347271dd
  yujinyao authored Aug 30, 2024
  
  347271dd
- 订单下拉多选搜索 · 673af735
  yujinyao authored Aug 30, 2024
  
  673af735
29 Aug, 2024 14 commits
- Merge branch 'feature/cargo_control' into dev · 5386a888
  dragondean@qq.com authored Aug 29, 2024
```
# Conflicts:
#	src/components/FileUpload/index.vue
#	src/views/ecw/order/cargoControl.vue
```
  5386a888
- 修复修改放货限制申请成功了没关闭弹层 · 6a1c3792
  dragondean@qq.com authored Aug 29, 2024
  
  6a1c3792
- 收货人限制修改申请 · 79d76aa6
  dragondean@qq.com authored Aug 29, 2024
  
  79d76aa6
- 完善订单转异 · 1d816b9e
  dragondean@qq.com authored Aug 29, 2024
  
  1d816b9e
- Merge remote-tracking branch 'origin/dev' into dev · ee8648e6
  dragondean@qq.com authored Aug 29, 2024
  
  ee8648e6
- Merge branch 'feature/phone_desensitization' into dev · 60fc51b2
  dragondean@qq.com authored Aug 29, 2024
  
  60fc51b2
- 入仓单电话脱敏 · d4b05256
  dragondean@qq.com authored Aug 29, 2024
  
  d4b05256
- Merge branch 'dev' of... · f79cee34
  yujinyao authored Aug 29, 2024
```
Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  f79cee34
- 全部订单多选查询 · 12eeb9de
  yujinyao authored Aug 29, 2024
  
  12eeb9de
- Merge branch 'feature/099_customer_filter' into 'dev' · 4cf8f700
  chenwei authored Aug 29, 2024
```
兑换记录导入 导出

See merge request !18
```
  4cf8f700
- 兑换记录导入导出 · e6d1db92
  chenwei authored Aug 29, 2024
  
  e6d1db92
- 客户详情订单tag搜索目的国+目的地+目的仓下拉多选 · 4daaff38
  yujinyao authored Aug 29, 2024
  
  4daaff38
- 线路价格搜索文本框字段去除中间和前后左右空格 · cba937ec
  yujinyao authored Aug 29, 2024
  
  cba937ec
- 线路价格筛选加目的国和目的仓 · 61fa029c
  yujinyao authored Aug 29, 2024
  
  61fa029c
28 Aug, 2024 5 commits
- Merge branch 'feature/099_customer_filter' into 'dev' · f0ef8f19
  chenwei authored Aug 28, 2024
```
status

See merge request !17
```
  f0ef8f19
- status · 0964f273
  chenwei authored Aug 28, 2024
  
  0964f273
- Merge branch 'feature/099_customer_filter' into 'dev' · 20d7095c
  chenwei authored Aug 28, 2024
```
member system status control

See merge request !16
```
  20d7095c
- member system status control · 21d16e8f
  chenwei authored Aug 28, 2024
  
  21d16e8f
- 开通线路价格组件 · 2770d74e
  yujinyao authored Aug 28, 2024
  
  2770d74e
27 Aug, 2024 10 commits
- 订单列表转异入口及弹层组件,待对接接口 · d63c0790
  dragondean@qq.com authored Aug 27, 2024
  
  d63c0790
- Merge branch 'dev' of... · 9337fa34
  yujinyao authored Aug 27, 2024
```
Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  9337fa34
- 客户详情订单tag查询条件 · ada79867
  yujinyao authored Aug 27, 2024
  
  ada79867
- 放货页面显示到仓日期和防护或锁定收货人到期时间 · 56419e74
  dragondean@qq.com authored Aug 27, 2024
  
  56419e74
- 控货列表新增锁定到期时间和限制修改收货人字段机器筛选条件 · 3f49e418
  dragondean@qq.com authored Aug 27, 2024
  
  3f49e418
- 客户详情订单tag优化 · 919c7174
  yujinyao authored Aug 27, 2024
  
  919c7174
- 控货列表新增已卸柜到仓时间 · 49464031
  dragondean@qq.com authored Aug 27, 2024
  
  49464031
- 无收货人的发货人默认控货 · c0f187f8
  dragondean@qq.com authored Aug 27, 2024
  
  c0f187f8
- 完善创建订单页面重构 · aef45d70
  dragondean@qq.com authored Aug 23, 2024
  
  aef45d70
- 创建订单页面更新 · 68e15307
  dragondean@qq.com authored Aug 23, 2024
  
  68e15307