Commits · b8ed8be84e96109fb8f5f880b89109773aea9fed · lanbaoming / jiedao-app-operator-master · GitLab

12 Apr, 2023 19 commits
- Merge remote-tracking branch 'origin/predev' into predev · b8ed8be8
  Marcus authored Apr 12, 2023
  
  b8ed8be8
- 2988 · 1862d16f
  Marcus authored Apr 12, 2023
  
  1862d16f
- Merge remote-tracking branch 'origin/predev' into predev · 02ea8d14
  邓春圆 authored Apr 12, 2023
  
  02ea8d14
- 四舍五入 · 8725e3cf
  邓春圆 authored Apr 12, 2023
  
  8725e3cf
- 调仓下单统计样式调整 · a6936cba
  邓春圆 authored Apr 12, 2023
  
  a6936cba
- 2988 · 978e9eb5
  Marcus authored Apr 12, 2023
  
  978e9eb5
- Merge remote-tracking branch 'origin/predev' into predev · ca68d602
  Marcus authored Apr 12, 2023
  
  ca68d602
- 【订单详情】货物信息快递单号显示“,,,,” · 6e9a2d06
  Marcus authored Apr 12, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2999.html
```
  6e9a2d06
- Merge branch 'predev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into predev · 44bc0a7e
  zhoutong authored Apr 12, 2023
  
  44bc0a7e
- 修改归信息，理货储位显示去重 · c3d623f4
  zhoutong authored Apr 12, 2023
  
  c3d623f4
- Merge branch 'predev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into predev · 7871ae3a
  dragondean@qq.com authored Apr 12, 2023
  
  7871ae3a
- 控货调货箱数和调仓状态的操作入口 · 42839a1b
  dragondean@qq.com authored Apr 12, 2023
  
  42839a1b
- 汇率参数错误 · 63f5d6dc
  houjn@hikoon.cn authored Apr 12, 2023
  
  63f5d6dc
- 调仓申请中，调仓待出仓不能入仓补充，入仓修改，合单申请，拆单申请 https://zentao.test.jdshangmen.com/bug-view-2993.html · 97172ee2
  dragondean@qq.com authored Apr 12, 2023
  
  97172ee2
- 当未指定重泡货优惠时关闭指定线路，同是将指定线路的值置空。 · 5cf409e6
  Marcus authored Apr 12, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2988.html
```
  5cf409e6
- 订舱供应商信息取值错误 · a8579832
  zhoutong authored Apr 12, 2023
  
  a8579832
- 理货页-点击箱号查看入仓信息，只有一个规格，也会显示为多规格；入仓储位也没有回显 · 8f49c782
  黄卓 authored Apr 12, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2870.html
```
  8f49c782
- 修复出货的一些bug · 04c9fb33
  zhoutong authored Apr 12, 2023
  
  04c9fb33
- 控货订单导出 · 64e5d638
  houjn@hikoon.cn authored Apr 12, 2023
  
  64e5d638
11 Apr, 2023 8 commits
- Merge remote-tracking branch 'origin/predev' into predev · eeffce73
  邓春圆 authored Apr 11, 2023
  
  eeffce73
- 重货没值就传空 · 2d5c3a6e
  邓春圆 authored Apr 11, 2023
  
  2d5c3a6e
- 修复提单补料报错 · c4fc0cdb
  zhoutong authored Apr 11, 2023
  
  c4fc0cdb
- 全部业绩搜索重置失效 · 6ce0fe32
  huyf authored Apr 11, 2023
  
  6ce0fe32
- 订单异常处理页面未分配客户经理不显示填单参数 · eadc9072
  我在何方 authored Apr 11, 2023
  
  eadc9072
- 订单异常处理页面未分配客户经理不显示填单参数 · 358cead1
  我在何方 authored Apr 11, 2023
  
  358cead1
- 异常订单搜索修复 · 900b1e26
  我在何方 authored Apr 11, 2023
  
  900b1e26
- 业绩 · 37a68403
  huyf authored Apr 11, 2023
  
  37a68403
10 Apr, 2023 13 commits
- Merge remote-tracking branch 'origin/predev' into predev · d5b0e700
  邓春圆 authored Apr 10, 2023
  
  d5b0e700
- 账单分页修改 · 0f9dc193
  邓春圆 authored Apr 10, 2023
  
  0f9dc193
- Merge branch 'predev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into predev · 10eb2b34
  zhoutong authored Apr 10, 2023
  
  10eb2b34
- 修复供应商和出货的一些bug · fcb3dd5e
  zhoutong authored Apr 10, 2023
  
  fcb3dd5e
- 订单调仓到仓后，入仓补充选择储位还是调仓前的仓库 · e8734cbb
  Marcus authored Apr 10, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2926.html
```
  e8734cbb
- 客户详情-账单，实收日期显示不正确 bug修复 · 1ce12ae6
  邓春圆 authored Apr 10, 2023
  
  1ce12ae6
- 应用日志为回显bug修复 · 7e3658e0
  邓春圆 authored Apr 10, 2023
  
  7e3658e0
- 订单调仓到仓后，入仓补充选择储位还是调仓前的仓库 · b2894eb2
  Marcus authored Apr 10, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2926.html
```
  b2894eb2
- 编辑佣金付款单费用信息为回显bug修复 · b335e553
  邓春圆 authored Apr 10, 2023
  
  b335e553
- Merge branch 'dev1.6' into predev · 10765717
  dragondean@qq.com authored Apr 10, 2023
```
# Conflicts:
#	src/api/ecw/orderException.js
#	src/i18n/languages/en_US.json
#	src/views/ecw/order/detail.vue
```
  10765717
- 报价单导出，订单等的bug · afc994ad
  dragondean@qq.com authored Apr 10, 2023
  
  afc994ad
- 提货入口显示异常 · 677e3269
  dragondean@qq.com authored Apr 10, 2023
  
  677e3269
- 提货入口显示异常 · b8d1dc71
  dragondean@qq.com authored Apr 10, 2023
  
  b8d1dc71