解决代码合并冲突

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

@@ -989,6 +989,7 @@ export default {
               prcType: row.prcType
             }
           })
+            window.open(routeUrl.href, "_blank");
         } else if (row.taskInfo === '会签') {
            let routeUrl =this.$router.resolve({
               name: 'bzzqyjStep6',
@@ -2597,7 +2598,7 @@ export default {
         }
           break
         case '33':
-          const routeUrl = this.$router.resolve({
+          routeUrl = this.$router.resolve({
             path: 'policyConsultation',
             query: {
               taskIds: row.taskIds,
@@ -2611,7 +2612,7 @@ export default {
           window.open(routeUrl.href, "_blank");
           break
         case '34':
-          let routeUrl = this.$router.resolve({
+          routeUrl = this.$router.resolve({
             path: 'policyComplianceReview',
             query: {
               taskIds: row.taskIds,

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

@@ -885,7 +885,7 @@ export default {
           break
               // 政策入库、
         case 'laws1':
-          let routeUrl = this.$router.resolve({
+          routeUrl = this.$router.resolve({
             name: 'policyWarehousing1',
             query: {
               type: 'laws1',
@@ -1014,7 +1014,7 @@ export default {
           break
         //企标制修订立项计划
         case '26':
-           let routeUrlf =this.$router.resolve({
+          routeUrlf =this.$router.resolve({
             name: 'qbzxdlxStep1',
             query: {
               type: '26',
@@ -1026,7 +1026,7 @@ export default {
           break
         // 内外部会议入库流程
         case '29':
-          let routeUrlf = this.$router.resolve({
+          routeUrlf = this.$router.resolve({
             name: 'policyMeetings1',
             query: {
               prcType: '29',
@@ -1038,7 +1038,7 @@ export default {
           break
         // 政策课题入会流程
         case '30':
-          let routeUrlf = this.$router.resolve({
+          routeUrlf = this.$router.resolve({
             name: 'policyTopicEnrollment',
             query: {
               prcType: '30',
@@ -1053,7 +1053,7 @@ export default {
           break
         // 政策课题参会流程
         case '31':
-          let routeUrlf = this.$router.resolve({
+          routeUrlf = this.$router.resolve({
             name: 'policyTopicParticipation',
             query: {
               prcType: '31',
@@ -1068,7 +1068,7 @@ export default {
           break
         // 政策法规资料入库流程
         case '32':
-          let routeUrlf = this.$router.resolve({
+          routeUrlf = this.$router.resolve({
             name: 'policyRegulatoryMaterials',
             query: {
               prcType: '32',
@@ -1083,7 +1083,7 @@ export default {
           break
 
         case '33':
-          let routeUrlf = this.$router.resolve({
+          routeUrlf = this.$router.resolve({
                 path: 'policyConsultation',
                 query: {
                     bpnId: id