Commits · 6d9de9f59505fcd967991ae9ef38d20d59260b9d · lanbaoming / jiedao-app-operator-master · GitLab

01 Apr, 2023 17 commits
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 6d9de9f5
  邓春圆 authored Apr 01, 2023
  
  6d9de9f5
- 修改商品报错，bug修复 · 53a83095
  邓春圆 authored Apr 01, 2023
  
  53a83095
- 货物入仓成功后，货物行应该变成追加和退仓 · 9f380f9f
  Marcus authored Apr 01, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2712.html
```
  9f380f9f
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 00df4323
  Marcus authored Apr 01, 2023
  
  00df4323
- 1.第三行选择了储位X，保存后再次打开X不见了 · 881ea074
  Marcus authored Apr 01, 2023
```
 https://zentao.test.jdshangmen.com/bug-view-2694.html
```
  881ea074
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 74c57922
  邓春圆 authored Apr 01, 2023
  
  74c57922
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 5f108ca7
  houjn@hikoon.cn authored Apr 01, 2023
  
  5f108ca7
- 操作日志没有旧值不显示 · 52d03edf
  dragondean@qq.com authored Apr 01, 2023
  
  52d03edf
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · b2cea61c
  houjn@hikoon.cn authored Apr 01, 2023
```
 Conflicts:
	src/views/ecw/messageLeave/index.vue
```
  b2cea61c
- 恢复合并前代码 · adf8c792
  houjn@hikoon.cn authored Apr 01, 2023
  
  adf8c792
- 调拨出仓成功后入仓记录未显示仓储信息bug修复 · 2a8c21b0
  邓春圆 authored Apr 01, 2023
  
  2a8c21b0
- 修改拆单放入数量 · b35eb5d9
  huhaiqing authored Apr 01, 2023
  
  b35eb5d9
- 入仓中显示入仓修改 · 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 18 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
- 客户投诉创建时间修改 · c0e8ca35
  邓春圆 authored Mar 31, 2023
  
  c0e8ca35
- 收款单详情银行明细删除修复 · 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
- 修改箱数 · c969743f
  huhaiqing authored Mar 31, 2023
  
  c969743f
30 Mar, 2023 5 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