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

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

src/router/index.js

@@ -871,6 +871,42 @@ const routes = [
           title: '标准入库流程'
         }
       },
+      {
+        path: '/zcrkStep1',
+        name: 'zcrkStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策入库流程'
+        }
+      },
+      {
+        path: '/zcrkStep2',
+        name: 'zcrkStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策入库流程'
+        }
+      },
+      {
+        path: '/zcrkStep3',
+        name: 'zcrkStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策入库流程'
+        }
+      },
+      {
+        path: '/zcrkStep5',
+        name: 'zcrkStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrk/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策入库流程'
+        }
+      },
       {
         path: '/bzdyStep1',
         name: 'bzdyStep1',
@@ -1150,6 +1186,42 @@ const routes = [
           title: '政策课题入会流程'
         }
       },
+      {
+        path: '/zcrhStep2',
+        name: 'zcrhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题入会流程'
+        }
+      },
+        {
+            path: '/zcrhStep3',
+            name: 'zcrhStep3',
+            component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step3.vue'),
+            meta: {
+                requireAuth: true,
+                title: '政策课题入会流程'
+            }
+        },
+        {
+            path: '/zcrhStep4',
+            name: 'zcrhStep4',
+            component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step4.vue'),
+            meta: {
+                requireAuth: true,
+                title: '政策课题入会流程'
+            }
+        },
+        {
+            path: '/zcrhStep1-1',
+            name: 'zcrhStep1-1',
+            component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue'),
+            meta: {
+                requireAuth: true,
+                title: '政策课题入会流程'
+            }
+        },
       {
         path: '/zcchStep1',
         name: 'zcchStep1',
@@ -1159,6 +1231,33 @@ const routes = [
           title: '政策课题参会流程'
         }
       },
+      {
+        path: '/zcchStep2',
+        name: 'zcchStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题参会流程'
+        }
+      },
+      {
+        path: '/zcchStep3',
+        name: 'zcchStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题参会流程'
+        }
+      },
+      {
+        path: '/zcchStep1-1',
+        name: 'zcchStep1-1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step1-1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题参会流程'
+        }
+      },
       {
         path: '/zchhStep1',
         name: 'zchhStep1',
@@ -1168,6 +1267,15 @@ const routes = [
           title: '政策课题会后流程'
         }
       },
+      {
+        path: '/zchhStep2',
+        name: 'zchhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/zchh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '政策课题会后流程'
+        }
+      },
       {
         path: '/wbsmStep1',
         name: 'wbsmStep1',
@@ -1185,7 +1293,253 @@ const routes = [
           requireAuth: true,
           title: '外部署名推荐审批流程'
         }
-      }
+      },
+      {
+        path: '/wbsmStep3',
+        name: 'wbsmStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部署名推荐审批流程'
+        }
+      },
+      {
+        path: '/wbsmStep4',
+        name: 'wbsmStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部署名推荐审批流程'
+        }
+      },
+      {
+        path: '/wbsmStep5',
+        name: 'wbsmStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部署名推荐审批流程'
+        }
+      },
+      {
+        path: '/cywbbzzxdStep1',
+        name: 'cywbbzzxdStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
+      {
+        path: '/cywbbzzxdStep2',
+        name: 'cywbbzzxdStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
+      {
+        path: '/cywbbzzxdStep3',
+        name: 'cywbbzzxdStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
+      {
+        path: '/cywbbzzxdStep4',
+        name: 'cywbbzzxdStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
+      {
+        path: '/cywbbzzxdStep5',
+        name: 'cywbbzzxdStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
+      {
+        path: '/cywbbzzxdStep6',
+        name: 'cywbbzzxdStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
+      {
+        path: '/jrbzhxhStep1',
+        name: 'jrbzhxhStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
+      },
+      {
+        path: '/jrbzhxhStep3',
+        name: 'jrbzhxhStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
+      },
+      {
+        path: '/jrbzhxhStep4',
+        name: 'jrbzhxhStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
+      },
+      {
+        path: '/jrbzhxhStep2',
+        name: 'jrbzhxhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue'),
+        meta: {
+          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: '外部标准化协会入会流程（修订）'
+        }
+      },
+      {
+        path: '/bzrhStep6',
+        name: 'bzrhStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会入会流程（审批)'
+        }
+      },
+
+      // 外部标准化协会参会流程
+      {
+        path: '/bzchStep1',
+        name: 'bzchStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（流程发起）'
+        }
+      },
+      {
+        path: '/bzchStep2',
+        name: 'bzchStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（选择入会代表）'
+        }
+      },
+      {
+        path: '/bzchStep3',
+        name: 'bzchStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（入会人确认）'
+        }
+      },
+      {
+        path: '/bzchStep4',
+        name: 'bzchStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（审批）'
+        }
+      },
+      {
+        path: '/bzchStep5',
+        name: 'bzchStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（修订）'
+        }
+      },
+      {
+        path: '/bzchStep6',
+        name: 'bzchStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化协会参会流程（审定）'
+        }
+      },
+      {
+        path: '/bzhhStep1',
+        name: 'bzhhStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化会后管理流程（流程发起）'
+        }
+      },
+      {
+        path: '/bzhhStep2',
+        name: 'bzhhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '外部标准化会后管理流程（审批）'
+        }
+      },
     ]
   },
   // 本地工具
@@ -1368,7 +1722,7 @@ const routes = [
           requireAuth: true,
           title: '技术要求清单管理'
         }
-      }
+      },
     ]
   },
   // 标准法规库
@@ -1624,7 +1978,7 @@ const routes = [
         meta: {
           requireAuth: true,
           title: '国内外政策',
-          menuId: '4DB4Y2H3NH'
+          menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
         }
       },
       {
@@ -2150,6 +2504,17 @@ const routes = [
           title: '企标详情'
         }
       },
+      {
+        path: '/otherLawsStandDetails/:id/:pageType',
+        name: 'OtherLawsStandDetails',
+        component: () =>
+          import('@/pages/details/otherLawsStandDetails'),
+        meta: {
+          requireAuth: true,
+          isBoolean: true,
+          title: '政策详情'
+        }
+      },
       {
         path: '/itemsDetails',
         name: 'itemsDetails',
@@ -2209,7 +2574,7 @@ const routes = [
     }
   },
   {
-    path: '/advancedSearch',
+    path: '/advancedSearch/:selectKey?/:searchValue?',
     name: 'AdvancedSearch',
     component: () =>
       import('@/pages/searchCenter/pages/advancedSearch'),
@@ -2219,6 +2584,17 @@ const routes = [
       menuId: 'K9BAYUPZBC'
     }
   },
+  // {
+  //   path: '/advancedSearch',
+  //   name: 'AdvancedSearch',
+  //   component: () =>
+  //     import('@/pages/searchCenter/pages/advancedSearch'),
+  //   meta: {
+  //     requireAuth: true,
+  //     title: '高级检索',
+  //     menuId: 'K9BAYUPZBC'
+  //   }
+  // },
   {
     path: '/customReport',
     name: 'CustomReport',