Commits · 5312306ee63a69b4673f677618dda6efd7ad1462 · zhujilai / 后台订单管理 · GitLab

12 Dec, 2018 10 commits
- Merge branch 'zjl_iteration_20181127' into development · 5312306e
  朱继来 committed Dec 12, 2018
  
  5312306e Browse Files
- 调整变量 · 9abecb92
  朱继来 committed Dec 12, 2018
  
  9abecb92 Browse Files
- Merge branch 'zjl_iteration_20181127' into development · a2019111
  朱继来 committed Dec 12, 2018
  
  a2019111 Browse Files
- 调整后台添加商品 · 28fa30cf
  朱继来 committed Dec 12, 2018
  
  28fa30cf
- Merge branch 'zjl_iteration_20181127' into development · e2106720
  朱继来 committed Dec 12, 2018
  
  e2106720 Browse Files
- 自营内部采购下单折扣提示信息 · 7fbd503d
  朱继来 committed Dec 12, 2018
  
  7fbd503d Browse Files
- Merge branch 'zjl_iteration_20181127' into development · 7738dc51
  朱继来 committed Dec 12, 2018
  
  7738dc51 Browse Files
- 调整其他输入框 · 57bc6caa
  朱继来 committed Dec 12, 2018
  
  57bc6caa Browse Files
- Merge branch 'zjl_iteration_20181127' into development · 26d1a26b
  朱继来 committed Dec 12, 2018
  
  26d1a26b Browse Files
- 取消弹框高度 · d8629c4b
  朱继来 committed Dec 12, 2018
  
  d8629c4b Browse Files
11 Dec, 2018 4 commits
- Merge branch 'zjl_iteration_20181127' into development · 5aa1abad
  朱继来 committed Dec 11, 2018
  
  5aa1abad Browse Files
- 调整js · 60c7426d
  朱继来 committed Dec 11, 2018
  
  60c7426d Browse Files
- fix · d3d47b3f
  朱继来 committed Dec 11, 2018
  
  d3d47b3f
- 1. 订单后台交互微调; · 4d30f0fc
```
2. 调整取消原因弹框;
```
  朱继来 committed Dec 11, 2018
  4d30f0fc
10 Dec, 2018 3 commits
- Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_iteration_20181127 · 1ad91e2c
  朱继来 committed Dec 10, 2018
  
  1ad91e2c Browse Files
- temp · 7ddcc0c8
  朱继来 committed Dec 10, 2018
  
  7ddcc0c8 Browse Files
- temp · a4d2db41
  朱继来 committed Dec 10, 2018
  
  a4d2db41 Browse Files
06 Dec, 2018 3 commits
- Merge branch 'zjl_batch_goods_20181129' into development · 6b70cbe7
  朱继来 committed Dec 06, 2018
  
  6b70cbe7 Browse Files
- fix · 4fa4773c
  朱继来 committed Dec 06, 2018
  
  4fa4773c Browse Files
- 批量添加物料 · 698861e8
  朱继来 committed Dec 06, 2018
  
  698861e8 Browse Files
05 Dec, 2018 9 commits
- Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_batch_goods_20181129 · 45cce3dc
  朱继来 committed Dec 05, 2018
  
  45cce3dc Browse Files
- Merge branch 'master' into development · 1377e346
  朱继来 committed Dec 05, 2018
  
  1377e346 Browse Files
- 调整自营列表 · 1d16214e
  朱继来 committed Dec 05, 2018
  
  1d16214e Browse Files
- Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_batch_goods_20181129 · fcd4d2ca
  朱继来 committed Dec 05, 2018
  
  fcd4d2ca Browse Files
- Merge branch 'master' into development · 7c7f99ec
  朱继来 committed Dec 05, 2018
  
  7c7f99ec Browse Files
- 调整审核按钮 · c97ed66e
  朱继来 committed Dec 05, 2018
  
  c97ed66e Browse Files
- fix · 72613237
  朱继来 committed Dec 05, 2018
  
  72613237 Browse Files
- 调整自营JS · 8037b692
  朱继来 committed Dec 05, 2018
  
  8037b692 Browse Files
- temp2 · 6eaed4b6
  朱继来 committed Dec 05, 2018
  
  6eaed4b6 Browse Files
03 Dec, 2018 11 commits
- Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_batch_goods_20181129 · d3b28a3e
  朱继来 committed Dec 03, 2018
  
  d3b28a3e Browse Files
- Merge branch 'zjl_iteration_20181127' · 9b53e312
  朱继来 committed Dec 03, 2018
  
  9b53e312 Browse Files
- Merge branch 'zjl_iteration_20181127' into development · a0c28445
  朱继来 committed Dec 03, 2018
  
  a0c28445 Browse Files
- 调整自营列表-尽调 · 50c0314e
  朱继来 committed Dec 03, 2018
  
  50c0314e Browse Files
- Merge branch 'zjl_iteration_20181127' · 98e4faa4
  朱继来 committed Dec 03, 2018
  
  98e4faa4 Browse Files
- Merge branch 'zjl_iteration_20181127' into development · d5ff5d5a
  朱继来 committed Dec 03, 2018
  
  d5ff5d5a Browse Files
- 添加发票抬头导出 · 72370760
  朱继来 committed Dec 03, 2018
  
  72370760 Browse Files
- Merge branch 'zjl_iteration_20181127' · f462dc1e
  朱继来 committed Dec 03, 2018
  
  f462dc1e Browse Files
- Merge branch 'zjl_iteration_20181127' into development · 089fdaf6
  朱继来 committed Dec 03, 2018
  
  089fdaf6 Browse Files
- 调整erp订单 · 87a3ecab
  朱继来 committed Dec 03, 2018
  
  87a3ecab Browse Files
- temp1 · f6580a64
  朱继来 committed Dec 03, 2018
  
  f6580a64 Browse Files