Commits · 3a2c74d66303062dd34dfea3d49cef1f91c8ffc5 · lanbaoming / jiedao-app-operator-master

19 Mar, 2023 1 commit
- 杰哥地址 · 3a2c74d6
  houjn@hikoon.cn authored Mar 19, 2023
  
  3a2c74d6
17 Mar, 2023 2 commits
- 捷哥 · 915d5bc0
  dragondean@qq.com authored Mar 17, 2023
  
  915d5bc0
- 捷哥 · ec4251bd
  dragondean@qq.com authored Mar 17, 2023
  
  ec4251bd
16 Mar, 2023 4 commits
- 完善报价单详情权限 · d216cab7
  dragondean@qq.com authored Mar 16, 2023
  
  d216cab7
- 提货默认时间格式化 · db653475
  houjn@hikoon.cn authored Mar 16, 2023
  
  db653475
- 控货的两个小bug · 44ac9d5a
  dragondean@qq.com authored Mar 16, 2023
  
  44ac9d5a
- Merge remote-tracking branch 'origin/dev' into dev · bfa17f4a
  huyf authored Mar 16, 2023
  
  bfa17f4a
15 Mar, 2023 10 commits
- 提货时间增加默认当前时间 · 9449832e
  huyf authored Mar 15, 2023
  
  9449832e
- commit bug · 3c68b537
  TIAN.DESHENG authored Mar 15, 2023
  
  3c68b537
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 62f54dd1
  zhoutong authored Mar 15, 2023
  
  62f54dd1
- 出货详情按钮权限 · d84824db
  zhoutong authored Mar 15, 2023
  
  d84824db
- Merge remote-tracking branch 'origin/dev' into dev · d603250d
  huyf authored Mar 15, 2023
  
  d603250d
- 提货时间增加时分秒 · 12305cdf
  huyf authored Mar 15, 2023
  
  12305cdf
- 始发地为非全部时没有显示出来，导致禁用会弹出始发地不能为空的拦截bug修复 · 49924742
  wanglianghe authored Mar 15, 2023
  
  49924742
- 出货详情页未做权限控制 · 56c10628
  zhoutong authored Mar 15, 2023
  
  56c10628
- 时间选择器修改 · 8a8e73a2
  邓春圆 authored Mar 15, 2023
  
  8a8e73a2
- 时间选择器修改 · b9fb72c9
  邓春圆 authored Mar 15, 2023
  
  b9fb72c9
14 Mar, 2023 13 commits
- Merge remote-tracking branch 'origin/dev' into dev · f728ed5b
  Marcus authored Mar 14, 2023
  
  f728ed5b
- 入仓补充》添加新品名时，默认只能选择一个品牌 · ce303f9f
  Marcus authored Mar 14, 2023
```
https://zentao.test.jdshangmen.com/bug-view-2484.html
```
  ce303f9f
- Merge remote-tracking branch 'origin/dev' into dev · 1b2a2c8b
  邓春圆 authored Mar 14, 2023
  
  1b2a2c8b
- 页面崩溃优化 · d5db2cc6
  邓春圆 authored Mar 14, 2023
  
  d5db2cc6
- Merge remote-tracking branch 'origin/dev' into dev · 5e058dde
  huyf authored Mar 14, 2023
  
  5e058dde
- 我的业绩总方数优化 · 8053ceb2
  huyf authored Mar 14, 2023
  
  8053ceb2
- 优惠搜索关键词重置无效debug · fb374d80
  dragondean@qq.com authored Mar 14, 2023
  
  fb374d80
- 业务密码导出文件名 · eb1f2275
  houjn@hikoon.cn authored Mar 14, 2023
  
  eb1f2275
- 空运出货安排权限 · b38f814a
  zhoutong authored Mar 14, 2023
  
  b38f814a
- 出货权限修改 · 388e7253
  zhoutong authored Mar 14, 2023
  
  388e7253
- 出货导出权限 · 8f54a4a8
  houjn@hikoon.cn authored Mar 14, 2023
  
  8f54a4a8
- Merge remote-tracking branch 'origin/dev' into dev · 02ae5253
  邓春圆 authored Mar 14, 2023
  
  02ae5253
- 品牌缺少创建人、创建人姓名，更新人姓名添加 · 37777b6a
  邓春圆 authored Mar 14, 2023
  
  37777b6a
13 Mar, 2023 6 commits
- 部分情况下订单列表报错 · bb649c36
  dragondean@qq.com authored Mar 13, 2023
  
  bb649c36
- 短信模板增加编号显示 · 1e1f3ba6
  houjn@hikoon.cn authored Mar 13, 2023
  
  1e1f3ba6
- 商品列表权限按钮修复 · 97977436
  我在何方 authored Mar 11, 2023
  
  97977436
- 订单，价格，优惠，报价单的权限等 · 75fe5004
  dragondean@qq.com authored Mar 12, 2023
  
  75fe5004
- 品牌管理列表 bug修复 · 8ee19b5e
  邓春圆 authored Mar 13, 2023
  
  8ee19b5e
- 品牌列表添加修改时间，修改人，创建人 · a2973da8
  邓春圆 authored Mar 13, 2023
  
  a2973da8
11 Mar, 2023 4 commits
- conflict resolve · be9a993b
  TIAN.DESHENG authored Mar 11, 2023
  
  be9a993b
- Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · b2dcf129
  TIAN.DESHENG authored Mar 11, 2023
  
  b2dcf129
- export merge code · cf85e399
  TIAN.DESHENG authored Mar 11, 2023
  
  cf85e399
- Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev · 57f8374e
  houjn@hikoon.cn authored Mar 11, 2023
```
 Conflicts:
	src/api/ecw/futureBox.js
	src/api/ecw/order.js
	src/views/ecw/box/indexFutureBox.vue
	src/views/ecw/order/cargoControl.vue
	src/views/ecw/order/index.vue
```
  57f8374e