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

# Conflicts:
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

src/router/index.js

@@ -1042,6 +1042,15 @@ const routes = [
           title: '参与外部标准制修订信息提报流程'
         }
       },
+      {
+        path: '/cywbbzzxdStep2',
+        name: 'cywbbzzxdStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
       {
         path: '/jrbzhxhStep1',
         name: 'jrbzhxhStep1',
@@ -1050,7 +1059,16 @@ const routes = [
           requireAuth: true,
           title: '加入标准化协会信息提报流程'
         }
-      }
+      },
+      {
+        path: '/jrbzhxhStep2',
+        name: 'jrbzhxhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
+      },
     ]
   },
   // 本地工具
@@ -1233,7 +1251,53 @@ const routes = [
           requireAuth: true,
           title: '技术要求清单管理'
         }
-      }
+      },
+      // 外部标准化协会入会流程
+      {
+        path: '/bzrhStep1',
+        name: 'bzrhStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（流程发起）'
+        }
+      },
+      {
+        path: '/bzrhStep2',
+        name: 'bzrhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（选择代表）'
+        }
+      },
+      {
+        path: '/bzrhStep3',
+        name: 'bzrhStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（入选代表填写信息）'
+        }
+      },
+      {
+        path: '/bzrhStep4',
+        name: 'bzrhStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（责任负责人审批）'
+        }
+      },
+      {
+        path: '/bzrhStep5',
+        name: 'bzrhStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（修订）'
+        }
+      },
     ]
   },
   // 标准法规库