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

29 Apr, 2023 4 commits
- Merge remote-tracking branch 'origin/dev' into dev · bd296531
  dragondean@qq.com authored Apr 29, 2023
  
  bd296531
- 拆单没搞完，提交备份一下 · a8017b08
  dragondean@qq.com authored Apr 29, 2023
  
  a8017b08
- 入仓补充、入仓修改针对单行入仓记录增加一个删除 · 73fd9bee
  Marcus authored Apr 29, 2023
```
https://zentao.test.jdshangmen.com/bug-view-3147.html
```
  73fd9bee
- 后台入仓时添加商品 / 后台入仓时添加商品-前端追加的时候不能添加新品名 · d3e6cb36
  Marcus authored Apr 29, 2023
```
https://zentao.test.jdshangmen.com/task-view-1921.html
```
  d3e6cb36
28 Apr, 2023 9 commits
- 后台入仓时添加商品 / 后台入仓时添加商品-前端审核中 · 34d4c71d
  Marcus authored Apr 28, 2023
```
https://zentao.test.jdshangmen.com/task-view-1921.html
```
  34d4c71d
- 后台入仓时添加商品 / 后台入仓时添加商品-前端添加新品名 · a0f5a445
  Marcus authored Apr 28, 2023
```
https://zentao.test.jdshangmen.com/task-view-1921.html
```
  a0f5a445
- Merge remote-tracking branch 'origin/dev' into dev · c63e5f0a
  Marcus authored Apr 28, 2023
  
  c63e5f0a
- 后台入仓时添加商品 / 后台入仓时添加商品-前端 · c536abb6
  Marcus authored Apr 28, 2023
```
https://zentao.test.jdshangmen.com/task-view-1921.html
```
  c536abb6
- 撤销拆单审核详情组件 · 08831f99
  dragondean@qq.com authored Apr 28, 2023
  
  08831f99
- Merge remote-tracking branch 'origin/dev' into dev · b8ebf3c6
  dragondean@qq.com authored Apr 28, 2023
  
  b8ebf3c6
- 完善订单列表撤销拆单申请，审核中查看，取消 · 86f4dbf5
  dragondean@qq.com authored Apr 28, 2023
  
  86f4dbf5
- 删除老版入仓 · bacdddc7
  Marcus authored Apr 28, 2023
  
  bacdddc7
- 删除老版入仓 · bad6aec6
  Marcus authored Apr 28, 2023
  
  bad6aec6
27 Apr, 2023 3 commits
- v1.7新增功能 · 2f733409
  我在何方 authored Apr 27, 2023
  
  2f733409
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 86c69880
  我在何方 authored Apr 27, 2023
  
  86c69880
- 订单详请页面优化 · b662aa67
  我在何方 authored Apr 27, 2023
  
  b662aa67
26 Apr, 2023 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · c67ae120
  dragondean@qq.com authored Apr 26, 2023
  
  c67ae120
- 订单列表拆单申请，但是接口异常没调通 · c8ad0322
  dragondean@qq.com authored Apr 26, 2023
  
  c8ad0322
25 Apr, 2023 2 commits
- 文案修正 · 942b2fc8
  houjn@hikoon.cn authored Apr 25, 2023
  
  942b2fc8
- 出货下载相关增加超时时间 · 613499c9
  huyf authored Apr 25, 2023
  
  613499c9
24 Apr, 2023 1 commit
- 清关文件出单方式显示修复 · aec4b6ec
  zhoutong authored Apr 24, 2023
  
  aec4b6ec
23 Apr, 2023 7 commits
- Merge branch 'master' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into predev · 58a23c76
  houjn@hikoon.cn authored Apr 23, 2023
  
  58a23c76
- Merge remote-tracking branch 'origin/predev' into predev · 4027f035
  邓春圆 authored Apr 23, 2023
  
  4027f035
- 操作日志权限修改 · d0184f2c
  邓春圆 authored Apr 23, 2023
  
  d0184f2c
- 订单列表运输方式传值不对 · 40ba2ca3
  dragondean@qq.com authored Apr 23, 2023
  
  40ba2ca3
- 操作日志权限修改 · d7ea7ec8
  邓春圆 authored Apr 23, 2023
  
  d7ea7ec8
- 已装柜文案修正 · e9736fec
  houjn@hikoon.cn authored Apr 23, 2023
  
  e9736fec
- Merge branch 'predev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · fcfeabcb
  houjn@hikoon.cn authored Apr 23, 2023
  
  fcfeabcb
22 Apr, 2023 4 commits
- Merge remote-tracking branch 'origin/predev' into predev · 578a4711
  邓春圆 authored Apr 22, 2023
  
  578a4711
- 调拔出仓填写物流单号和联系电话bug修复 · 358618fa
  邓春圆 authored Apr 22, 2023
  
  358618fa
- 出货提单的一些bug · 1270eb96
  zhoutong authored Apr 22, 2023
  
  1270eb96
- Merge remote-tracking branch 'origin/dev' into dev · 26774114
  houjn@hikoon.cn authored Apr 22, 2023
  
  26774114
21 Apr, 2023 4 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
- 修改3099缺陷 · d065d273
  huhaiqing authored Apr 21, 2023
  
  d065d273
20 Apr, 2023 4 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