Commits · 355c762b3a18203105551d88989d290f73f7aa1e · zhujilai / 后台订单管理 · GitLab

25 Dec, 2018 5 commits
- $PRY5YKGJ82EZEPX\Administrator's avatar$
  
  Merge branch 'hcy_pcb_20181221-r' into development · 355c762b
  PRY5YKGJ82EZEPX\Administrator committed Dec 25, 2018
  
  355c762b Browse Files
- $PRY5YKGJ82EZEPX\Administrator's avatar$
  
  更新pcb后台 · 824cf469
  PRY5YKGJ82EZEPX\Administrator committed Dec 25, 2018
  
  824cf469
- $PRY5YKGJ82EZEPX\Administrator's avatar$
  
  Merge branch 'hcy_pcb_20181221-r' into development · 7b1e1fe4
  PRY5YKGJ82EZEPX\Administrator committed Dec 25, 2018
  
  7b1e1fe4 Browse Files
- $PRY5YKGJ82EZEPX\Administrator's avatar$
  
  更新pcb后台 · 17995b8b
  PRY5YKGJ82EZEPX\Administrator committed Dec 25, 2018
  
  17995b8b Browse Files
- $PRY5YKGJ82EZEPX\Administrator's avatar$
  
  更新pcb后台 · 0a66d671
  PRY5YKGJ82EZEPX\Administrator committed Dec 25, 2018
  
  0a66d671 Browse Files
24 Dec, 2018 1 commit
- $PRY5YKGJ82EZEPX\Administrator's avatar$
  
  更新pcb · 1a720583
  PRY5YKGJ82EZEPX\Administrator committed Dec 24, 2018
  
  1a720583
21 Dec, 2018 2 commits
- Merge branch 'zjl_exception_20181221' into development · 2e03f039
  朱继来 committed Dec 21, 2018
  
  2e03f039 Browse Files
- 自营导出 · 515cd2cd
  朱继来 committed Dec 21, 2018
  
  515cd2cd
20 Dec, 2018 5 commits
- Merge branch 'zjl_iteration_20181127' into development · 2a37fd93
  朱继来 committed Dec 20, 2018
  
  2a37fd93 Browse Files
- 调整自营列表筛选、导出JS · 6c5c6b47
  朱继来 committed Dec 20, 2018
  
  6c5c6b47 Browse Files
- Merge branch 'zjl_iteration_20181127' into development · 1221eba1
  朱继来 committed Dec 20, 2018
  
  1221eba1 Browse Files
- 详情页添加订单类型和付款地址 · 5b353495
  朱继来 committed Dec 20, 2018
  
  5b353495 Browse Files
- 审核时只显示未锁库存 · 1232cbe5
  朱继来 committed Dec 20, 2018
  
  1232cbe5
19 Dec, 2018 4 commits
- Merge branch 'zjl_iteration_20181127' into development · 3d758b1a
  朱继来 committed Dec 19, 2018
  
  3d758b1a Browse Files
- 添加财务跳转，调整财务对账金额对比 · 623eb564
  朱继来 committed Dec 19, 2018
  
  623eb564 Browse Files
- fix · 4147a144
  朱继来 committed Dec 19, 2018
  
  4147a144 Browse Files
- 1. 财务对账弹窗; · 58a9a6f0
```
2.调整列表筛选、样式;
```
  朱继来 committed Dec 19, 2018
  58a9a6f0
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 3 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