Commits · ddaa98eaad819e391b254c0bc3d5fbe50a798c5c · wangweidong / patzn-cloud-web-back-soil · GitLab

19 Jun, 2020 27 commits
- 修改了检测数据录入的填写检测值和判定 · ddaa98ea
  lichengming authored Jun 19, 2020
  
  ddaa98ea Browse Files
- 整体优化 · d470ded4
  wangweidong authored Jun 19, 2020
  
  d470ded4 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · faae078c
```
# Conflicts:
#	pages/meter-out/personal-task/MeterPersonItemTaskManage.vue
```
  wangweidong authored Jun 19, 2020
  faae078c Browse Files
- 整体优化 · 279467e5
  wangweidong authored Jun 19, 2020
  
  279467e5 Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 68e04dd4
  lichengming authored Jun 19, 2020
  
  68e04dd4 Browse Files
- 修改了个人检测任务检定条件 · d2394138
  lichengming authored Jun 19, 2020
  
  d2394138 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d2faa442
  wangweidong authored Jun 19, 2020
  
  d2faa442 Browse Files
- 整体优化 · b012a32f
  wangweidong authored Jun 19, 2020
  
  b012a32f Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 7ffb0e04
  lichengming authored Jun 19, 2020
  
  7ffb0e04 Browse Files
- 修改了个人检测任务填写检测值和判定按钮 · 6f19fd5f
  lichengming authored Jun 19, 2020
  
  6f19fd5f Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 9c6ca8ef
  wangweidong authored Jun 19, 2020
  
  9c6ca8ef Browse Files
- 整体优化 · 41f0bfaf
  wangweidong authored Jun 19, 2020
  
  41f0bfaf Browse Files
- 修改了合同评审驳回 · fe707766
  lichengming authored Jun 19, 2020
  
  fe707766 Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 53721587
  lichengming authored Jun 19, 2020
  
  53721587 Browse Files
- 修改了合同评审添加 · e0551c9b
  lichengming authored Jun 19, 2020
  
  e0551c9b Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 6ccb4b71
  wangweidong authored Jun 19, 2020
  
  6ccb4b71 Browse Files
- 整体优化 · 62cde35d
  wangweidong authored Jun 19, 2020
  
  62cde35d Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · a1658c11
  lichengming authored Jun 19, 2020
  
  a1658c11 Browse Files
- 修改了委托评审驳回 · e64c384c
  lichengming authored Jun 19, 2020
  
  e64c384c Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f8ca01be
  wangweidong authored Jun 19, 2020
  
  f8ca01be Browse Files
- 合同评审 · 41ada202
  wangweidong authored Jun 19, 2020
  
  41ada202 Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · 1aa384ca
  lichengming authored Jun 19, 2020
  
  1aa384ca Browse Files
- 合同评审获取到输入的数据 · a9744c27
  lichengming authored Jun 19, 2020
  
  a9744c27 Browse Files
- 省市县选择 · 5a888ebe
  wangweidong authored Jun 19, 2020
  
  5a888ebe Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · bebc920a
  wangweidong authored Jun 19, 2020
  
  bebc920a Browse Files
- 合同管理 · a6219c3a
  wangweidong authored Jun 19, 2020
  
  a6219c3a Browse Files
- 修改了合同评审添加 · 3103e905
  lichengming authored Jun 19, 2020
  
  3103e905 Browse Files
18 Jun, 2020 9 commits
- Merge remote-tracking branch 'origin/dev' into dev · 948d669a
```
# Conflicts:
#	pages/meter-business/MeterSampleQuoteManage.vue
```
  lichengming authored Jun 18, 2020
  948d669a Browse Files
- 报价单退回 · cff4611f
  lichengming authored Jun 18, 2020
  
  cff4611f Browse Files
- 合同管理 · 4bb290c8
  wangweidong authored Jun 18, 2020
  
  4bb290c8 Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · f31fb380
```
 Conflicts:
	pages/meter-business/MeterSampleQuoteManage.vue
	pages/meter-business/accepted/MeterContractAccepted.vue
```
  lichengming authored Jun 18, 2020
  f31fb380 Browse Files
- 修改了报价单驳回按钮 · d4872c51
  lichengming authored Jun 18, 2020
  
  d4872c51 Browse Files
- 合同管理 · da4e46ed
  wangweidong authored Jun 18, 2020
  
  da4e46ed Browse Files
- 修改了弹出提示 · 5d55e456
  lichengming authored Jun 18, 2020
  
  5d55e456 Browse Files
- 修改了控制台报错 · 1ce59822
  lichengming authored Jun 18, 2020
  
  1ce59822 Browse Files
- 修改了v-for · 66aaff9c
  lichengming authored Jun 18, 2020
  
  66aaff9c Browse Files
17 Jun, 2020 4 commits
- 修改了循环 · 64b6385c
  lichengming authored Jun 17, 2020
  
  64b6385c Browse Files
- Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev · e23c9ce5
  lichengming authored Jun 17, 2020
  
  e23c9ce5 Browse Files
- 修改了导入检测项目 · 799ca6b8
  lichengming authored Jun 17, 2020
  
  799ca6b8 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · de33b51b
  wangweidong authored Jun 17, 2020
  
  de33b51b Browse Files