Commits · 7a3852321a6eb498d616404f51e11c4f95ee8c23 · wangweidong / patzn-cloud-web-back-soil · GitLab

04 Jan, 2021 10 commits
- Merge branch 'dev' · 7a385232
  zhangmengqi authored Jan 04, 2021
  
  7a385232 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 02bc9305
  wangweidong authored Jan 04, 2021
  
  02bc9305 Browse Files
- 土工试验Lims · 743ee89e
  wangweidong authored Jan 04, 2021
  
  743ee89e Browse Files
- 修改了样品管理 · 621ada2d
  lichengming authored Jan 04, 2021
  
  621ada2d Browse Files
- 修改了试样检测 · 834896f7
  lichengming authored Jan 04, 2021
  
  834896f7 Browse Files
- 修改了报告编制 · e561edb6
  lichengming authored Jan 04, 2021
  
  e561edb6 Browse Files
- 修改了样品管理 · dd59d706
  lichengming authored Jan 04, 2021
  
  dd59d706 Browse Files
- 修改了样品管理 · 92e66bbe
  lichengming authored Jan 04, 2021
  
  92e66bbe Browse Files
- Merge branch 'dev' · df25706b
  zhangmengqi authored Jan 04, 2021
  
  df25706b Browse Files
- 土工试验Lims · cafab9f3
  wangweidong authored Jan 04, 2021
  
  cafab9f3 Browse Files
31 Dec, 2020 13 commits
- Merge branch 'dev' · cac6ea83
  zhangmengqi authored Dec 31, 2020
  
  cac6ea83 Browse Files
- 修改了数据复核审核 · d29c408c
  lichengming authored Dec 31, 2020
  
  d29c408c Browse Files
- 修改了数据录入项目原始记录 · 21b0247f
  lichengming authored Dec 31, 2020
  
  21b0247f Browse Files
- 修改了数据复核查看项目报告 · 15559253
  lichengming authored Dec 31, 2020
  
  15559253 Browse Files
- Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev · 6812023c
  lichengming authored Dec 31, 2020
  
  6812023c Browse Files
- 修改了生成项目报告 · 3cf522b6
  lichengming authored Dec 31, 2020
  
  3cf522b6 Browse Files
- Merge branch 'dev' · 5d282ed6
  zhangmengqi authored Dec 31, 2020
  
  5d282ed6 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · a44a1334
  wangweidong authored Dec 31, 2020
  
  a44a1334 Browse Files
- 土工试验Lims · f3d1ca34
  wangweidong authored Dec 31, 2020
  
  f3d1ca34 Browse Files
- Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev · 8be1ecb0
  lichengming authored Dec 31, 2020
  
  8be1ecb0 Browse Files
- 修改了库房样品管理 · 6c596cdd
  lichengming authored Dec 31, 2020
  
  6c596cdd Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · e8e0daf6
```
# Conflicts:
#	pages/soil-statistics/sample-progress/SampleProgressDetail.vue
```
  wangweidong authored Dec 31, 2020
  e8e0daf6 Browse Files
- 土工试验Lims · 27607fb1
  wangweidong authored Dec 31, 2020
  
  27607fb1 Browse Files
30 Dec, 2020 17 commits
- 修改了库房样品管理 · 9e0cd698
  lichengming authored Dec 30, 2020
  
  9e0cd698 Browse Files
- 修改了库房样品管理 · f53e6898
  lichengming authored Dec 30, 2020
  
  f53e6898 Browse Files
- 修改了样品进度查询 · d125f80c
  lichengming authored Dec 30, 2020
  
  d125f80c Browse Files
- 修改了样品管理 · b1104649
  lichengming authored Dec 30, 2020
  
  b1104649 Browse Files
- 修改了样品进度查询 · f6ba9718
  lichengming authored Dec 30, 2020
  
  f6ba9718 Browse Files
- Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev · f3896a7c
  lichengming authored Dec 30, 2020
  
  f3896a7c Browse Files
- 修改了样品进度查询 · 26d3da33
  lichengming authored Dec 30, 2020
  
  26d3da33 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · a801b521
```
# Conflicts:
#	pages/soil-report-manage/report-make/OriginalRecordView.vue
```
  wangweidong authored Dec 30, 2020
  a801b521 Browse Files
- 土工试验Lims · 51ebb430
  wangweidong authored Dec 30, 2020
  
  51ebb430 Browse Files
- 修改了样品进度查询 · 8a900743
  lichengming authored Dec 30, 2020
  
  8a900743 Browse Files
- 修改了报告档案 · 62b5c701
  lichengming authored Dec 30, 2020
  
  62b5c701 Browse Files
- 修改了报告档案 · 5c1b1d5f
  lichengming authored Dec 30, 2020
  
  5c1b1d5f Browse Files
- 修改了查看样品和报告 · 44da5294
  lichengming authored Dec 30, 2020
  
  44da5294 Browse Files
- 修改了报告编制生成报告 · f6af2692
  lichengming authored Dec 30, 2020
  
  f6af2692 Browse Files
- 修改了收样管理附件 · adb411c8
  lichengming authored Dec 30, 2020
  
  adb411c8 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · fdadeaf0
  wangweidong authored Dec 30, 2020
  
  fdadeaf0 Browse Files
- 土工试验Lims · a94938aa
  wangweidong authored Dec 30, 2020
  
  a94938aa Browse Files