Commits · 9c82e980d90bebb9cd61d370f845bc95466be93e · lanbaoming / jiedao-app-operator-master

27 Mar, 2023 19 commits
- 文案修改 · 9c82e980
  邓春圆 authored Mar 27, 2023
  
  9c82e980
- 按钮大小修改 · 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 21 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
- 新增请款单跳转，账单号搜索 · 74138e8a
  邓春圆 authored Mar 26, 2023
  
  74138e8a
- 添加时间 · 3aaa71d5
  邓春圆 authored Mar 26, 2023
  
  3aaa71d5
- 类型修改 · 5d5dcf03
  邓春圆 authored Mar 26, 2023
  
  5d5dcf03
- 手动添加名字 · 43ea4517
  邓春圆 authored Mar 26, 2023
  
  43ea4517
- 付款单权限修改 · 497156ea
  邓春圆 authored Mar 26, 2023
  
  497156ea
- 付款单佣金修改 · 08d347c4
  邓春圆 authored Mar 26, 2023
  
  08d347c4
- 收款单bug修复 · 13783e1f
  我在何方 authored Mar 26, 2023
  
  13783e1f
- 客户详情修改 · 91c6ee21
  邓春圆 authored Mar 26, 2023
  
  91c6ee21
- 佣金付款单修改 · ded6fb59
  邓春圆 authored Mar 26, 2023
  
  ded6fb59
- 佣金付款单打印 · 2ab9ba3a
  邓春圆 authored Mar 26, 2023
  
  2ab9ba3a
- 添加银行卡 · 65d67d98
  邓春圆 authored Mar 26, 2023
  
  65d67d98
- 客户操作日志 · eec7eac2
  邓春圆 authored Mar 26, 2023
  
  eec7eac2
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6 · 9bed04d8
  我在何方 authored Mar 26, 2023
  
  9bed04d8
- 收款单bug修复 · 493fb359
  我在何方 authored Mar 26, 2023
  
  493fb359