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

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -701,7 +701,7 @@ export default {
       if (this.type === 'leaderUser') {
         this.roleForm.leaderUser = data[0].name
         this.roleForm.leaderUserId = data[0].id
-      } else if(this.type === 'ngineerUser'){
+      } else if(this.type === 'engineerUser'){
         this.roleForm.engineerUser = data[0].name
         this.roleForm.engineerUserId = data[0].id
       } else {

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -2,7 +2,7 @@
   <div class="bzchStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会参会流程</template>
-      <template slot="proNode">参会人员确认</template>
+      <template slot="proNode">提名入会代表</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>