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

01 Apr, 2023 6 commits
- 恢复合并前代码 · adf8c792
  houjn@hikoon.cn authored Apr 01, 2023
  
  adf8c792
- 入仓中显示入仓修改 · 30439487
  dragondean@qq.com authored Apr 01, 2023
  
  30439487
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · c4a74a13
  邓春圆 authored Apr 01, 2023
  
  c4a74a13
- 客户日志，页面修改 · 62dd98d1
  邓春圆 authored Apr 01, 2023
  
  62dd98d1
- 优惠活动bug修复 · a2d15146
  邓春圆 authored Apr 01, 2023
  
  a2d15146
- 【入仓操作】【sit环境】入仓品牌选择已备案的品牌，是否备案显示“无备案” · 27ca8d80
  Marcus authored Apr 01, 2023
```
 https://zentao.test.jdshangmen.com/bug-view-2696.html
```
  27ca8d80
31 Mar, 2023 16 commits
- 新增佣金请款单，不能下拉选择客户，只能手动输入选择 bug修复 · 56175e72
  邓春圆 authored Mar 31, 2023
  
  56175e72
- 调拨出仓显示仓位 · 895e392d
  邓春圆 authored Mar 31, 2023
  
  895e392d
- 调拨出仓时间修改 · 62dfbcba
  邓春圆 authored Mar 31, 2023
  
  62dfbcba
- https://zentao.test.jdshangmen.com/bug-view-2696.html · 1604d820
  Marcus authored Mar 31, 2023
  
  1604d820
- 收款单详情银行明细删除修复 · 370db396
  我在何方 authored Mar 31, 2023
  
  370db396
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · e940bbfe
  我在何方 authored Mar 31, 2023
  
  e940bbfe
- 泡货异常修复 · 147017e7
  我在何方 authored Mar 31, 2023
  
  147017e7
- 理货页面只显示一条品名了，实际上有4条 · 262dd98d
  zhoutong authored Mar 31, 2023
  
  262dd98d
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 99038f77
  邓春圆 authored Mar 31, 2023
  
  99038f77
- 创建时间修改 · 517421b1
  邓春圆 authored Mar 31, 2023
  
  517421b1
- 修改箱数 · a7bae8fc
  huhaiqing authored Mar 31, 2023
  
  a7bae8fc
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 763012cb
  邓春圆 authored Mar 31, 2023
  
  763012cb
- 付款单，佣金付款单，审核详情添加申请理由 · 2c3dced0
  邓春圆 authored Mar 31, 2023
  
  2c3dced0
- 付款单，佣金付款bug修改 · 87da9eeb
  邓春圆 authored Mar 31, 2023
  
  87da9eeb
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 993ae63a
  我在何方 authored Mar 31, 2023
  
  993ae63a
- 订单预付异常新增收款单修复 · 7c414704
  我在何方 authored Mar 31, 2023
  
  7c414704
30 Mar, 2023 18 commits
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 2eea4815
  houjn@hikoon.cn authored Mar 30, 2023
```
 Conflicts:
	src/views/ecw/order/detail.vue
```
  2eea4815
- 1.打开入仓补充页面 · f9e114ca
  Marcus authored Mar 30, 2023
```
https://adm.sit.jdshangmen.com/#/order/warehousing?id=516

2.添加2条入仓记录，两条都选择储位后提交

3.再次点击追加，第一行没有显示储位，第二行随时显示了，但也显示不全
```
  f9e114ca
- 储位重复初始化问题 · e46d7cdf
  Marcus authored Mar 30, 2023
  
  e46d7cdf
- sit入仓操作，无法添加新入仓记录 · 4b3f297f
  Marcus authored Mar 30, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2669.html
```
  4b3f297f
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 2b1995f4
  Marcus authored Mar 30, 2023
  
  2b1995f4
- 【订单入仓】入仓已选择储位，货物详情未显示储位，快递单号也未显示 · eacff418
  Marcus authored Mar 30, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2693.html
```
  eacff418
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 3a9c49dc
  邓春圆 authored Mar 30, 2023
  
  3a9c49dc
- 时间选择器添加时分秒 · 3019cd57
  邓春圆 authored Mar 30, 2023
  
  3019cd57
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · af4f09d9
  zhoutong authored Mar 30, 2023
  
  af4f09d9
- 【出货管理】提单补料下载提单确认件无内容显示 · c2b61bdc
  zhoutong authored Mar 30, 2023
  
  c2b61bdc
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · b1859e0b
  邓春圆 authored Mar 30, 2023
  
  b1859e0b
- 权限判断修改 · bb69edc1
  邓春圆 authored Mar 30, 2023
  
  bb69edc1
- 添加备注 · 5afe224e
  邓春圆 authored Mar 30, 2023
  
  5afe224e
- 文案修改 · 65a94bfc
  邓春圆 authored Mar 30, 2023
  
  65a94bfc
- 添加驳回原因 · b7487527
  邓春圆 authored Mar 30, 2023
  
  b7487527
- 隐藏完成入仓时的选择订单储位 · 2c5ae1c9
  Marcus authored Mar 30, 2023
  
  2c5ae1c9
- 直接修改储位的判断条件更正 · f1b07007
  Marcus authored Mar 30, 2023
  
  f1b07007
- 入仓操作，缺少整板、箱号的计算规则 · 5a2b80be
  Marcus authored Mar 30, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2667.html
```
  5a2b80be