Commits · 717855c95279087fdb9358406581afee156653a3 · wangweidong / patzn-cloud-web-back-soil · GitLab

14 Jun, 2020 9 commits
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 717855c9
  lichengming authored Jun 14, 2020
  
  717855c9 Browse Files
- 修改了证书编制生成按钮 · cd54af58
  lichengming authored Jun 14, 2020
  
  cd54af58 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 54f834a8
  wangweidong authored Jun 14, 2020
  
  54f834a8 Browse Files
- 仪器领用 · 102e6600
  wangweidong authored Jun 14, 2020
  
  102e6600 Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 84aa257c
  lichengming authored Jun 14, 2020
  
  84aa257c Browse Files
- 修改了分包样品管理分包信息登记 · bd5e313c
  lichengming authored Jun 14, 2020
  
  bd5e313c Browse Files
- 个人检测任务 · 350fc405
  wangweidong authored Jun 14, 2020
  
  350fc405 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 95cfb7e2
```
# Conflicts:
#	api/meter/meter-sample.js
#	pages/meter-out/personal-task/MeterOutPersonalTask.vue
```
  wangweidong authored Jun 14, 2020
  95cfb7e2 Browse Files
- 个人检测任务证书编制 · 9f279cbe
  wangweidong authored Jun 14, 2020
  
  9f279cbe Browse Files
13 Jun, 2020 25 commits
- 修改了仪器领用和车辆管理 · fc6730f3
  lichengming authored Jun 13, 2020
  
  fc6730f3 Browse Files
- 个人检测任务 · ada0b339
  wangweidong authored Jun 13, 2020
  
  ada0b339 Browse Files
- 个人检测任务 · 0438de4e
  wangweidong authored Jun 13, 2020
  
  0438de4e Browse Files
- 个人检测任务 · 03cfb590
  wangweidong authored Jun 13, 2020
  
  03cfb590 Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 4ad64c12
```
 Conflicts:
	api/meter/meter-sample.js
```
  lichengming authored Jun 13, 2020
  4ad64c12 Browse Files
- 修改了个人任务 · a6b3bea2
  lichengming authored Jun 13, 2020
  
  a6b3bea2 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 3efe605b
  wangweidong authored Jun 13, 2020
  
  3efe605b Browse Files
- 个人检测任务 · e4d3f902
  wangweidong authored Jun 13, 2020
  
  e4d3f902 Browse Files
- 修改了个人检测任务编辑按钮 · 37172e62
  lichengming authored Jun 13, 2020
  
  37172e62 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · b281c115
  wangweidong authored Jun 13, 2020
  
  b281c115 Browse Files
- 委托单优化 · d366e8bb
  wangweidong authored Jun 13, 2020
  
  d366e8bb Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · ee15559c
  lichengming authored Jun 13, 2020
  
  ee15559c Browse Files
- 修改了分包任务管理的分包样品管理按钮 · c2d99a04
  lichengming authored Jun 13, 2020
  
  c2d99a04 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 9748869e
  wangweidong authored Jun 13, 2020
  
  9748869e Browse Files
- 委托单优化 · fde986f9
  wangweidong authored Jun 13, 2020
  
  fde986f9 Browse Files
- 修改了出检任务分配 · 2e879e99
  lichengming authored Jun 13, 2020
  
  2e879e99 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 01fece2f
  wangweidong authored Jun 13, 2020
  
  01fece2f Browse Files
- 委托单优化 · fe0cb0cb
  wangweidong authored Jun 13, 2020
  
  fe0cb0cb Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 90ac1a62
  lichengming authored Jun 13, 2020
  
  90ac1a62 Browse Files
- 修改了出检任务分配 · b8e54a89
  lichengming authored Jun 13, 2020
  
  b8e54a89 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d502a55c
  wangweidong authored Jun 13, 2020
  
  d502a55c Browse Files
- 委托单优化 · 74b9f725
  wangweidong authored Jun 13, 2020
  
  74b9f725 Browse Files
- 修改了出检任务分配 · 0c028b19
  lichengming authored Jun 13, 2020
  
  0c028b19 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 3533ec65
  wangweidong authored Jun 13, 2020
  
  3533ec65 Browse Files
- 委托单优化 · cb986f33
  wangweidong authored Jun 13, 2020
  
  cb986f33 Browse Files
12 Jun, 2020 6 commits
- 修改了委托评审查看详情 · 66570cc1
  lichengming authored Jun 12, 2020
  
  66570cc1 Browse Files
- 修改了送检委托单 · 3f2b44f0
  lichengming authored Jun 12, 2020
  
  3f2b44f0 Browse Files
- 委托单优化 · 605394a9
  wangweidong authored Jun 12, 2020
  
  605394a9 Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 6b9e0f84
  lichengming authored Jun 12, 2020
  
  6b9e0f84 Browse Files
- 修改了出检委托 · 8fa653bd
  lichengming authored Jun 12, 2020
  
  8fa653bd Browse Files
- 委托评审优化 · a66bc016
  wangweidong authored Jun 12, 2020
  
  a66bc016 Browse Files