Merge remote-tracking branch 'origin/dev' into dev

router/meter-routes.js

@@ -9,6 +9,7 @@ import workbench from '../pages/workbench/workbench'
  */
 import MeterAptitudeManage from '../pages/meter-aptitude/manage/MeterAptitudeManage'
 import MeterAptitudeStandard from '../pages/meter-aptitude/standard/MeterAptitudeStandard'
+import MeterSubcontractor from '../pages/meter-subcontract/subcontractor/MeterSubcontractor'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -31,5 +32,16 @@ export default [
         meta: { title: '检测依据管理' }
       }
     ]
+  },
+  {
+    path: 'subcontract',
+    component: Blank,
+    children: [
+      {
+        path: 'subcontractor',
+        component: MeterSubcontractor,
+        meta: { title: '分包方管理' }
+      }
+    ]
   }
 ]