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

04 Apr, 2023 2 commits
- 国际化翻译 · bb655992
  邓春圆 authored Apr 04, 2023
  
  bb655992
- 国际化修改 · 25ba3ca1
  邓春圆 authored Apr 04, 2023
  
  25ba3ca1
02 Apr, 2023 20 commits
- 客户日志页面国际化 · a957e1bf
  邓春圆 authored Apr 02, 2023
  
  a957e1bf
- 添加操作时间，去掉客户编号、客户名称 · e74b394c
  邓春圆 authored Apr 02, 2023
  
  e74b394c
- 已加入的商品为默认选择活动 bug修复 · 1756f4d8
  邓春圆 authored Apr 02, 2023
  
  1756f4d8
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · f6ea794b
  邓春圆 authored Apr 02, 2023
  
  f6ea794b
- 已加入的商品为默认选择活动 bug修复 · baacb789
  邓春圆 authored Apr 02, 2023
  
  baacb789
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · ff906390
  dragondean@qq.com authored Apr 02, 2023
  
  ff906390
- 订单详情显示填单快递单号 · 36cecb35
  dragondean@qq.com authored Apr 02, 2023
  
  36cecb35
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 7e17a235
  邓春圆 authored Apr 02, 2023
  
  7e17a235
- 客户日志列表，客户的旧入公海时间显示为0-0-0 0:0:0（新建的客户没有旧入公海时间，应显示为空或/） bug修复 · 6f14044f
  邓春圆 authored Apr 02, 2023
  
  6f14044f
- 订单详情品牌和未入仓无法显示货物详情 · 7a155d6e
  dragondean@qq.com authored Apr 02, 2023
  
  7a155d6e
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 417acaf0
  Marcus authored Apr 02, 2023
  
  417acaf0
- 入仓补充、入仓修改功能完善入仓追加不可修改 · e6de5678
  Marcus authored Apr 02, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2710.html
```
  e6de5678
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · c65f8fe6
  我在何方 authored Apr 02, 2023
  
  c65f8fe6
- 收款单审核详情显示申请原因 · 4fa9d11f
  我在何方 authored Apr 02, 2023
  
  4fa9d11f
- 入仓补充、入仓修改功能完善 · 206319da
  Marcus authored Apr 02, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2710.html
```
  206319da
- 修改追加分开 · 0e65e2d0
  Marcus authored Apr 02, 2023
  
  0e65e2d0
- 完成按钮显示的条件 · 9ae1420f
  Marcus authored Apr 02, 2023
  
  9ae1420f
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · fd663705
  Marcus authored Apr 02, 2023
  
  fd663705
- 入仓操作，没有商品入仓，显示了修改按钮 · 29b6ba6f
  Marcus authored Apr 02, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2723.html
```
  29b6ba6f
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 1384aa77
  houjn@hikoon.cn authored Apr 02, 2023
  
  1384aa77
01 Apr, 2023 18 commits
- 入仓修改功能完善 · de2b5593
  Marcus authored Apr 01, 2023
  
  de2b5593
- 修改商品报错，bug修复 · ffd0db89
  邓春圆 authored Apr 01, 2023
  
  ffd0db89
- 修改商品报错，bug修复2 · 232d624c
  邓春圆 authored Apr 01, 2023
  
  232d624c
- 修改已放入的无法选择 · e9c717fe
  huhaiqing authored Apr 01, 2023
  
  e9c717fe
- 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