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

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -1504,8 +1504,8 @@
         getAction(this.url.AndUserId, query).then((res) => {
           if (res.success) {
             // this.isDisplay = true
-            if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){
-              this.formInlineRoleSwitching.roleSwitchingCode = '1'
+            if (this.$route.query.roleOpen){
+              this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen
             }else{
               this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
             }

jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue

@@ -267,7 +267,7 @@
               targetMarket: row.targetMarket,
               studioEngineer: row.studioEngineer,
               type: '102',
-              roleOpen:'fggcs',
+              roleOpen:'1',
             }
           })
           window.open(newUrl.href, '_blank')