Commits · 32002d5a41c0651e3a6494f03aaae51242a579bc · lanbaoming / jiedao-app-operator-master · GitLab

28 Mar, 2023 8 commits
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 32002d5a
  dragondean@qq.com authored Mar 28, 2023
  
  32002d5a
- 订单详情储位的bug · 5b84e217
  dragondean@qq.com authored Mar 28, 2023
  
  5b84e217
- 日志详情添加备注，搜索添加操作类型 · 7fd2f52f
  邓春圆 authored Mar 28, 2023
  
  7fd2f52f
- 付款单核销审核中，显示审核详情按钮 · 558bb524
  邓春圆 authored Mar 28, 2023
  
  558bb524
- 请求方式修改 · 76f88d39
  邓春圆 authored Mar 28, 2023
  
  76f88d39
- 点击取消清空申请理由 · e1351914
  邓春圆 authored Mar 28, 2023
  
  e1351914
- 点击取消清空申请理由 · 24b72e12
  邓春圆 authored Mar 28, 2023
  
  24b72e12
- 弹窗样式修改 · 6091802d
  邓春圆 authored Mar 28, 2023
  
  6091802d
27 Mar, 2023 25 commits
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 4e109239
  邓春圆 authored Mar 27, 2023
  
  4e109239
- 按钮大小调整 · 435dad56
  邓春圆 authored Mar 27, 2023
  
  435dad56
- 审核组件调用接口修改 · 431e7288
  邓春圆 authored Mar 27, 2023
  
  431e7288
- 文案修改 · 9c82e980
  邓春圆 authored Mar 27, 2023
  
  9c82e980
- 重货异常入仓品牌取值错误 · 7f7d8de7
  dragondean@qq.com authored Mar 27, 2023
  
  7f7d8de7
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 6434f362
  Marcus authored Mar 27, 2023
  
  6434f362
- 入仓操作页面优化 · 7fb40043
  Marcus authored Mar 27, 2023
```
 https://zentao.test.jdshangmen.com/bug-view-2578.html
```
  7fb40043
- 按钮大小修改 · 1aa1a38e
  邓春圆 authored Mar 27, 2023
  
  1aa1a38e
- 文案修改 · fe08666f
  邓春圆 authored Mar 27, 2023
  
  fe08666f
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 7a9c365a
  邓春圆 authored Mar 27, 2023
  
  7a9c365a
- title 修改 · 3f37835d
  邓春圆 authored Mar 27, 2023
  
  3f37835d
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 0e9a4f83
  zhoutong authored Mar 27, 2023
  
  0e9a4f83
- 订单箱数点击后弹窗入仓记录的页面加上储位 · 4f539c0f
  zhoutong authored Mar 27, 2023
  
  4f539c0f
- 入仓修改，储位错误 · 0c3e50d3
  Marcus authored Mar 27, 2023
```
 https://zentao.test.jdshangmen.com/bug-view-2584.html
```
  0c3e50d3
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 36afcb29
  邓春圆 authored Mar 27, 2023
  
  36afcb29
- 国际化翻译添加 · f35c3f06
  邓春圆 authored Mar 27, 2023
  
  f35c3f06
- 银行卡账户修改 · a2f4cdf7
  邓春圆 authored Mar 27, 2023
  
  a2f4cdf7
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · ad0994cb
  我在何方 authored Mar 27, 2023
  
  ad0994cb
- 新建收款单开票bug · e98b2dfc
  我在何方 authored Mar 27, 2023
  
  e98b2dfc
- Merge remote-tracking branch 'origin/dev1.6' into dev1.6 · 2f570fc0
  邓春圆 authored Mar 27, 2023
  
  2f570fc0
- 打印添加权限，添加状态判断 · 8980f8c0
  邓春圆 authored Mar 27, 2023
  
  8980f8c0
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · a27f27e2
  我在何方 authored Mar 27, 2023
  
  a27f27e2
- 新建收款单开票bug · 0c057654
  我在何方 authored Mar 27, 2023
  
  0c057654
- 付款单佣金打印修改，添加跳转 · d7d6921c
  邓春圆 authored Mar 27, 2023
  
  d7d6921c
- 权限修改 · afaa1a90
  邓春圆 authored Mar 27, 2023
  
  afaa1a90
26 Mar, 2023 7 commits
- 合并冲突修改 · 66b759a1
  邓春圆 authored Mar 26, 2023
  
  66b759a1
- Merge branch 'dev-financial' into dev1.6 · f5d52a6c
  邓春圆 authored Mar 26, 2023
```
# Conflicts:
#	src/views/ecw/customer/query.vue
```
  f5d52a6c
- 重新追加无法提交，即使重新输入长宽高也无法提交 · 14eb87b7
  Marcus authored Mar 26, 2023
  
  14eb87b7
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · e94e2994
  dragondean@qq.com authored Mar 26, 2023
  
  e94e2994
- 部分阶梯价格修改保存异常 · 01b7b634
  dragondean@qq.com authored Mar 26, 2023
  
  01b7b634
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · b44291dd
  zhoutong authored Mar 26, 2023
  
  b44291dd
- 出货操作-1.根据供应商信息自动填充提单补料信息 · 2cc8fc4e
  zhoutong authored Mar 26, 2023
  
  2cc8fc4e