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

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

@@ -673,9 +673,9 @@ export default {
             })
           }
           break
-              //标准清单更新/发布流程
+        //标准清单更新/发布流程
         case'4' :
-          if (row.taskInfo === '进行会签，填写意见') {
+          if (row.taskInfo === '会签') {
             this.$router.push({
               name: 'bzqdfbStep2',
               query: {
@@ -686,7 +686,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '根据会签意见修订') {
+          } else if (row.taskInfo === '修订') {
             this.$router.push({
               name: 'bzqdfbStep3',
               query: {
@@ -697,7 +697,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '业务经理审批') {
+          }else if (row.taskInfo === '批准') {
             this.$router.push({
               name: 'bzqdfbStep4',
               query: {
@@ -1610,7 +1610,7 @@ export default {
           }
           break
         case '25':
-          if (row.taskInfo === '部门高级经理审批') {
+          if (row.taskInfo === '审核') {
             this.$router.push({
               name: 'qbzxdjhgkStep2',
               query:{
@@ -1621,7 +1621,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if(row.taskInfo === '部门中心主任会签') {
+          } else if(row.taskInfo === '会签') {
             this.$router.push({
               name: 'qbzxdjhgkStep3',
               query:{
@@ -1632,7 +1632,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '标准法规工作组组长审定') {
+          }else if(row.taskInfo === '审定') {
             this.$router.push({
               name: 'qbzxdjhgkStep4',
               query:{
@@ -1643,7 +1643,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '标准法规部部长审批') {
+          }else if(row.taskInfo === '批准') {
             this.$router.push({
               name: 'qbzxdjhgkStep5',
               query:{