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

src/pages/home2/components/todoList/index.vue

@@ -1206,7 +1206,7 @@ export default {
           }
           else if(row.taskInfo === '责任人反馈情况'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep5-1',
+              name: 'zdrzbzORzchgxxmscStep5',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
@@ -1230,7 +1230,7 @@ export default {
           }
           else if(row.taskInfo === '法规管理员审核'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep7-1',
+              name: 'zdrzbzORzchgxxmscStep7',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="zdrzbzORzchgxxmsc-step5-1">
+  <div class="zdrzbzORzchgxxmsc-step5">
     <ProcessHeader toggle>
       <template slot="proName">重点认证标准/政策合规性项目审查流程</template>
       <template slot="proNode">责任人反馈{{ feedbackDept==='1'?'事业部':'产品规划部' }}情况</template>
@@ -297,7 +297,7 @@ import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssignee
 import axios from "axios";
 
 export default {
-  name: "zdrzbzORzchgxxmscStep5-1",
+  name: "zdrzbzORzchgxxmscStep5",
   data() {
     return {
       //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
@@ -512,7 +512,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.zdrzbzORzchgxxmsc-step5-1 {
+.zdrzbzORzchgxxmsc-step5 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="zdrzbzORzchgxxmsc-step7-1">
+  <div class="zdrzbzORzchgxxmsc-step7">
     <ProcessHeader toggle>
       <template slot="proName">重点认证标准/政策合规性项目审查流程</template>
       <template slot="proNode">法规管理员审核</template>
@@ -298,7 +298,7 @@ import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssignee
 import axios from "axios";
 
 export default {
-  name: "zdrzbzORzchgxxmscStep7-1",
+  name: "zdrzbzORzchgxxmscStep7",
   data() {
     return {
       //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
@@ -499,7 +499,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
-.zdrzbzORzchgxxmsc-step7-1 {
+.zdrzbzORzchgxxmsc-step7 {
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -1029,7 +1029,7 @@ export default {
           }
           else if(row.taskInfo === '责任人反馈情况'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep5-1',
+              name: 'zdrzbzORzchgxxmscStep5',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
@@ -1053,7 +1053,7 @@ export default {
           }
           else if(row.taskInfo === '法规管理员审核'){
             this.$router.push({
-              name: 'zdrzbzORzchgxxmscStep7-1',
+              name: 'zdrzbzORzchgxxmscStep7',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,

src/router/index.js

@@ -447,10 +447,10 @@ const routes = [
         }
       },
       {
-        path: '/zdrzbzORzchgxxmscStep5-1',
-        name: 'zdrzbzORzchgxxmscStep5-1',
+        path: '/zdrzbzORzchgxxmscStep5',
+        name: 'zdrzbzORzchgxxmscStep5',
         //1代表各事业部，2代表产品规划部
-        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step5-1.vue'),
+        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step5.vue'),
         meta: {
           requireAuth: true,
           title: '重点认证标准/政策合规性项目审查流程'
@@ -466,9 +466,9 @@ const routes = [
         }
       },
       {
-        path: '/zdrzbzORzchgxxmscStep7-1',
-        name: 'zdrzbzORzchgxxmscStep7-1',
-        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step7-1.vue'),
+        path: '/zdrzbzORzchgxxmscStep7',
+        name: 'zdrzbzORzchgxxmscStep7',
+        component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step7.vue'),
         meta: {
           requireAuth: true,
           title: '重点认证标准/政策合规性项目审查流程'