Commits · 0f3a9acda66859f44bb5d1af759e0968164c3ddb · lanbaoming / jiedao-app-operator-master · GitLab

21 Apr, 2023 3 commits
- Merge branch 'predev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 0f3a9acd
  houjn@hikoon.cn authored Apr 21, 2023
```
 Conflicts:
	src/views/ecw/financial/receivable.vue
	src/views/ecw/financial/voucher.vue
```
  0f3a9acd
- Merge remote-tracking branch 'origin/predev' into predev · 0d949c2c
  邓春圆 authored Apr 21, 2023
  
  0d949c2c
- 调拨到仓确认到仓，确认按钮没反应bug修复 · 5dfae10d
  邓春圆 authored Apr 21, 2023
  
  5dfae10d
20 Apr, 2023 9 commits
- 供应商的bug · 7e8ce9b1
  zhoutong authored Apr 20, 2023
  
  7e8ce9b1
- 入仓时间规则调整 · dba07713
  houjn@hikoon.cn authored Apr 20, 2023
  
  dba07713
- 入仓时间规则调整 · 95ef119e
  houjn@hikoon.cn authored Apr 20, 2023
  
  95ef119e
- 提货时间和送货时间去掉默认值 · 08ca3e24
  邓春圆 authored Apr 20, 2023
  
  08ca3e24
- 打印订单入仓时间修改 · fa7e461b
  邓春圆 authored Apr 20, 2023
  
  fa7e461b
- 入仓时间规则调整 · 5fc3c8b4
  houjn@hikoon.cn authored Apr 20, 2023
  
  5fc3c8b4
- 放货时间修改 · 5153c691
  邓春圆 authored Apr 20, 2023
  
  5153c691
- Merge remote-tracking branch 'origin/predev' into predev · 6ce19e71
  邓春圆 authored Apr 20, 2023
  
  6ce19e71
- 时间空间不能修改bug修复 · 52fa60a5
  邓春圆 authored Apr 20, 2023
  
  52fa60a5
19 Apr, 2023 12 commits
- 控货列表切换回来保留页码 · 6d96854c
  dragondean@qq.com authored Apr 19, 2023
  
  6d96854c
- 控货列表切换回来保留页码 · 43fd9dba
  dragondean@qq.com authored Apr 19, 2023
  
  43fd9dba
- Merge remote-tracking branch 'origin/predev' into predev · ff27fb0f
  邓春圆 authored Apr 19, 2023
  
  ff27fb0f
- 修改时间控件 · 6e083675
  邓春圆 authored Apr 19, 2023
  
  6e083675
- Merge remote-tracking branch 'origin/predev' into predev · 6a115cfe
  黄卓 authored Apr 19, 2023
  
  6a115cfe
- 入仓体积计算toFixed精度丢失问题 · 83cdaee8
  黄卓 authored Apr 19, 2023
  
  83cdaee8
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 70e0423e
  dragondean@qq.com authored Apr 19, 2023
  
  70e0423e
- 控货状态筛选 · 1182cca0
  dragondean@qq.com authored Apr 19, 2023
  
  1182cca0
- 控货状态筛选 · a8428ff7
  dragondean@qq.com authored Apr 19, 2023
  
  a8428ff7
- Merge branch 'master' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · fc56b2a8
  houjn@hikoon.cn authored Apr 19, 2023
  
  fc56b2a8
- 控货小bug · 0cb49b75
  dragondean@qq.com authored Apr 19, 2023
  
  0cb49b75
- 控货小bug · ac599c66
  dragondean@qq.com authored Apr 19, 2023
  
  ac599c66
18 Apr, 2023 13 commits
- 修改订单特价的清关费字段 · 81cdc0af
  dragondean@qq.com authored Apr 18, 2023
  
  81cdc0af
- 去掉控货的订单状态筛选 · bb2f1948
  dragondean@qq.com authored Apr 18, 2023
  
  bb2f1948
- Merge branch 'predev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into predev · c49895f0
  dragondean@qq.com authored Apr 18, 2023
  
  c49895f0
- 修改订单特价的清关费字段 · aa4735ad
  dragondean@qq.com authored Apr 18, 2023
  
  aa4735ad
- 去掉控货的订单状态筛选 · a2829b57
  dragondean@qq.com authored Apr 18, 2023
  
  a2829b57
- 调仓转异优化 · 2de82d37
  邓春圆 authored Apr 18, 2023
  
  2de82d37
- Merge remote-tracking branch 'origin/predev' into predev · 7ea0ee19
  邓春圆 authored Apr 18, 2023
  
  7ea0ee19
- app版本分页bug修改 · 5abf43cd
  邓春圆 authored Apr 18, 2023
  
  5abf43cd
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · 997d44f1
  houjn@hikoon.cn authored Apr 18, 2023
  
  997d44f1
- 后台订单转异，类型不填，可以提交，但异常未生产成功 · 01cd914d
  黄卓 authored Apr 18, 2023
```
https://zentao.test.jdshangmen.com/bug-view-3074.html
```
  01cd914d
- 后台订单转异，类型不填，可以提交，但异常未生产成功 · d17a8f5d
  黄卓 authored Apr 18, 2023
```
https://zentao.test.jdshangmen.com/bug-view-3074.html
```
  d17a8f5d
- 后台订单转异，类型不填，可以提交，但异常未生产成功 · 359fd3cb
  黄卓 authored Apr 18, 2023
```
https://zentao.test.jdshangmen.com/bug-view-3074.html
```
  359fd3cb
- 后台订单转异，类型不填，可以提交，但异常未生产成功 · 0e7fbddf
  黄卓 authored Apr 18, 2023
```
https://zentao.test.jdshangmen.com/bug-view-3074.html
```
  0e7fbddf
17 Apr, 2023 3 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator · 403c5e7b
  houjn@hikoon.cn authored Apr 17, 2023
  
  403c5e7b
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · cfb3ca43
  dragondean@qq.com authored Apr 17, 2023
  
  cfb3ca43
- 路线价格批量拉黑和批量下架后保留当前页码 · ef96f7a8
  dragondean@qq.com authored Apr 17, 2023
  
  ef96f7a8