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

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

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue

@@ -0,0 +1,16 @@
+<!--  参与外部标准制修订流程-->
+<template>
+<div>
+  参与外部标准制修订流程
+</div>
+</template>
+
+<script>
+export default {
+  name: "cywbbzzxdStep1"
+};
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue

@@ -0,0 +1,16 @@
+<!--加入标准化协会信息备案流程-->
+<template>
+<div>
+  加入标准化协会信息备案流程
+</div>
+</template>
+
+<script>
+export default {
+  name: "jrbzhxhStep1"
+};
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/newProcess/index.vue

@@ -202,6 +202,36 @@
             </div>
           </el-card>
         </el-col>
+        <el-col :span="size ? 6 : 8">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('19')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">加入标准化协会信息提报流程</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="size ? 6 : 8">
+          <el-card shadow="hover">
+            <div class="card-box" @click="handleCreateProcess('20')">
+              <div class="card-top">
+                <div class="card-top-left">
+                  <img :src="getImg(Math.floor(Math.random() * 6))">
+                </div>
+                <div class="card-top-right">
+                  <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
+                  <div class="card-top-right-line"></div>
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
       </div>
     </div>
   </div>
@@ -328,6 +358,18 @@ export default {
             name: 'wbsmStep1'
           })
           break
+        case '19':
+          //加入标准化协会信息提报流程
+          this.$router.push({
+            name: 'jrbzhxhStep1'
+          })
+          break
+        case '20':
+          //参与外部标准制修订信息提报流程
+          this.$router.push({
+            name: 'cywbbzzxdStep1'
+          })
+          break
       }
     },
     checkPermission(permissionIdArray) {

src/router/index.js

@@ -1023,6 +1023,24 @@ const routes = [
           requireAuth: true,
           title: '外部署名推荐审批流程'
         }
+      },
+      {
+        path: '/cywbbzzxdStep1',
+        name: 'cywbbzzxdStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
+      {
+        path: '/jrbzhxhStep1',
+        name: 'jrbzhxhStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
       }
     ]
   },